about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2017-09-02Don't unconditionally call `preventDefault` and `stopPropagation` on all ↵Surinna Curtis
keyup events (#4777) * UploadArea should only preventDefault for Escape This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default. * Remove workaround for fixed bug in SettingToggle SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
2017-09-02i18n: Update Polish translation (#4775)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02Adjust settings pages (#4765)Lynx Kotoura
* views: Adjust heading positions * Adjust settings pages Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast. * Remove trailing whitespace
2017-09-02Add Japanese translate for #4561 (#4771)Yamagishi Kazutoshi
2017-09-02Add text color style for noscript link (#4772)Yamagishi Kazutoshi
2017-09-02Fix profile page when use system's font (#4774)Yamagishi Kazutoshi
2017-09-02Disable embed modal when private status (#4773)Yamagishi Kazutoshi
* Disable embed modal when private status * Remove `reblogDisabled`
2017-09-02Define missing JSON-LD properties (#4767)Eugen Rochko
Using _: property names is discouraged, as in the future, canonicalization may throw an error when encountering that instead of discarding it silently like it does now. We are defining some ActivityStreams properties which we expect to land in ActivityStreams eventually, to ensure that future versions of Mastodon will remain compatible with this even once that happens. Those would be `locked`, `sensitive` and `Hashtag` We are defining a custom context inline for some properties which we do not expect to land in any other context. `atomUri`, `inReplyToAtomUri` and `conversation` are part of the custom defined OStatus context.
2017-09-02Use updated ActivityStreams context (added: sharedInbox) (#4764)Eugen Rochko
2017-09-02Add japanese translations for embed modal feature. (#4770)mayaeh
2017-09-02Add RoutingHelper (#4769)Yamagishi Kazutoshi
2017-09-02Add link to 'noscript' message (#4561)m4sk1n
* Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent
2017-09-01Add ActivityPub handler for Delete->Actor activities (#4761)Eugen Rochko
2017-09-01Finish up embed modal feature (#4759)Eugen Rochko
* Add embed button to dropdowns of in-timeline statuses * yarn run manage:translations
2017-09-01Avoid sending some ActivityPub payloads if the receiver will get them ↵Eugen Rochko
through distribution (#4739)
2017-09-01Do not rely on activity arriving exactly once after delete arrived (#4754)Eugen Rochko
2017-09-01 Adjust padding on the public profile page (#4757)Cygnan
* Fix a style issue on the public profile page for some mobile browsers Signed-off-by: Cygnan <email@cygnan.com> * Set padding-bottom to 20px Signed-off-by: Cygnan <email@cygnan.com>
2017-09-01Deduplicate with local status on Create activity (#4763)unarist