about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-09-08Fetch statuses/following/followers numbers from ActivityPub collections (#4840)Eugen Rochko
2017-09-08i18n: Update Polish translation (#4845)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-07i10n OC / FR update Pinned toots (#4842)Quent-in
* Added column.pins New strings * Added column.pins * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update password_change.oc.html.erb * Update password_change.oc.text.erb * Update reset_password_instructions.oc.html.erb * Update reset_password_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb
2017-09-07Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)Eugen Rochko
2017-09-07Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)abcang
2017-09-07Use <button> instead of <div role="button"> (#4835)PFM
2017-09-07Add Pinned toot column (#4817)voidSatisfaction
* Add Pinned_toot_section * Fix add frozen_string_literal * Fix delete no need controller and tests * Fix replace query strings to axios params * Fix change value to accountId and disabling more button
2017-09-07Feat add validation for report comment: characters under 1000 valid (#4833)voidSatisfaction
2017-09-07Use casecmp() instead of casecmp?() for now (#4832)Joseph Mingrone
* Use casecmp() instead of casecmp?() for now casecmp?() is only available in ruby 2.4.0. Users running earlier ruby versions would see errors, e.g., running RAILS_ENV=production rails mastodon:maintenance:remove_deprecated_preview_cards. * Correctly check whether casecmp() returns 0
2017-09-07i10n update OC and FR files (#4824)Quent-in
* Onboarding: corrections Some missing letters and spaces or better wording * Embed Translated as Intégrer in FR / Embarcar in OC
2017-09-06Update fr.json (#4830)Olivier Humbert
typo
2017-09-06Fix locking migration on statuses table. Nullable column and NO default ↵Eugen Rochko
value (#4825)
2017-09-06Bump version to 1.6.0rc2Eugen Rochko
2017-09-06Switch to static URIs, new URI format in both protocols for new statuses (#4815)Eugen Rochko
* Decouple Status#local? from uri being nil * Replace on-the-fly URI generation with stored URIs - Generate URI in after_save hook for local statuses - Use static value in TagManager when available, fallback to tag format - Make TagManager use ActivityPub::TagManager to understand new format - Adjust tests * Use other heuristic for locality of old statuses, do not perform long query * Exclude tombstone stream entries from Atom feed * Prevent nil statuses from landing in Pubsubhubbub::DistributionWorker * Fix URI not being saved (#4818) * Add more specs for Status * Save generated uri immediately and also fix method order to minimize diff. * Fix alternate HTML URL in Atom * Fix tests * Remove not-null constraint from statuses migration to speed it up
2017-09-06Add Smartphone screen favourite back button and adjust styles (#4813)voidSatisfaction
* Feat add get-back button on favourite columnHeader * Style adjust nice looking get-back button * Fix delete media query and add padding right * fix: restore padding and add lastchild style for back-button
2017-09-06i18n: update Persian translation (#4822)Masoud Abkenar
2017-09-06fix scroll position (#4821)Clworld
2017-09-06Update react-intl to version 2.4.0 (#4820)Yamagishi Kazutoshi
2017-09-06fix text position of NSFW for video file (#4819)PFM
2017-09-06Add environment sample for OpenStack Swift (#4816)Yamagishi Kazutoshi
2017-09-05swift-enable the paperclip! :paperclip: (#2322)Adam Thurlow
2017-09-05Do not execute the job with the same arguments as the retry job (#4814)abcang
2017-09-05Fix mentions in direct statuses not being delivered via AP (#4806)Eugen Rochko
2017-09-05Fix #4794 - Fake instant follow in API response when account is believed ↵Eugen Rochko
unlocked (#4799)
2017-09-05Adjust status embeds (#4808)Lynx Kotoura
* Adjust status embeds Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal. * Remove trailing whitespace * Using width from the variable
2017-09-05add index_notifications_on_id_and_account_id_and_activity_type on ↵takayamaki
notifications table (#4750)
2017-09-05comment correction (#4812)Treyssat-Vincent Nino
2017-09-04Translation korean added (#4802)voidSatisfaction
2017-09-04Update ar.yml (#4810)ButterflyOfFire
Some little changes to "ar" locale
2017-09-04Fix some ActivityPub JSON bugs (#4796)Eugen Rochko
- Fix assumption that `url` is always a string. Handle it if it's an array of strings, array of objects, object, or string, both for accounts and for objects - `sharedInbox` is actually supposed to be under `endpoints`, handle both cases and adjust the serializer
2017-09-04Show pinned statuses only in the top of the profile page (#4803)nullkal
* Show pinned statuses only in the top of the profile page * Refactor AccountsController#show_pinned_statuses?
2017-09-04Fix streaming url to lowercase (#4804)voidSatisfaction
2017-09-04Fix #4551 - Use correct syntax for content preloading (#4798)Eugen Rochko
2017-09-03Fix a problem that notification column goes to top (#4792)abcang
2017-09-03Fix short number locales (#4790)Eugen Rochko
Overwrite values from rails-i18n by manually overwriting in every locale. We want numbers like 1.5K in every language
2017-09-03Make german translation more gender neutral #4755 (#4789)Andreas Drop
2017-09-03Use next instead of return in task (#4787)Akihiko Odaki
2017-09-03Croatian translation - updated (#4183)May Kittens Devour Your Soul
* Update hr.json * Update hr.json
2017-09-03l10n Occitan update for Embed, cancel follow request, ... (#4788)Quent-in
* Update: some missing strings * Updates missing strings * New string * Update oc.json * Update oc.yml * Update oc.json
2017-09-03Explicitly define attached file of DeprecatedPreviewCard (#4786)Akihiko Odaki
The path template of the attached files must explicitly be defined because it is contradicting to the name of the class.
2017-09-03Bump version to 1.6.0rc1 (#4768)Eugen Rochko
2017-09-03Instantly upgrade account to ActivityPub if we receive ActivityPub payload ↵Eugen Rochko
(#4766)
2017-09-02Improve client-side German i18n (#4785)Eugen Rochko
2017-09-02Rename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779)Eugen Rochko
See: <https://www.w3.org/wiki/Activity_Streams_extensions#as:manuallyApprovesFollowers>
2017-09-02Validate data of Imports (#4782)abcang
2017-09-02i18n: Improve Polish translation (#4783)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02Make "unfollow" undo pending outgoing follow request too (#4781)Eugen Rochko
* Make "unfollow" undo pending outgoing follow request too * Add cancel button to web UI when awaiting follow request approval * Make the hourglass button do the cancelling
2017-09-02fix text position of NSFW in Safari (Mac/iPhone) (#4570)PFM
2017-09-02Raise an error for remote url in StatusFinder (#4776)unarist
* Raise an error for remote url in StatusFinder Previous implementation had allowed remote url with status id which also exists on local. Then that bug leads /api/web/embed to return wrong embed url. * Fix oembed_controller_spec
2017-09-02Fix WebPush (regression from #4524) (#4778)unarist
* Fix NoMethodError in Web::PushSubscription ``` undefined method `site_contact_email' for #<Class:0x00005976d13c40> /usr/local/bundle/gems/activerecord-5.1.3/lib/active_record/dynamic_matchers.rb:22:in `method_missing' /usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted.rb:295:in `method_missing' /usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted/adapters/active_record.rb:129:in `method_missing_with_attr_encrypted' /mastodon/app/models/web/push_subscription.rb:53:in `push_payload' ``` * Specify serializer in Web::NotificationSerializer