]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years agooptimize direct timeline (#7614)
tateisu [Mon, 28 May 2018 09:04:06 +0000 (18:04 +0900)]
optimize direct timeline (#7614)

* optimize direct timeline

* fix typo in class name

* change filter condition for direct timeline

* fix codestyle issue

* revoke index_accounts_not_silenced because direct timeline does not use it.

* revoke index_accounts_not_silenced because direct timeline does not use it.

* fix rspec test condition.

* fix rspec test condition.

* fix rspec test condition.

* revoke adding column and partial index

* (direct timeline) move merging logic to model

* fix pagination parameter

* add method arguments that switches return array of status or cache_ids

* fix order by

* returns ActiveRecord.Relation in default behavor

* fix codestyle issue

7 years agoRecord trending tags from ActivityPub, too (#7647)
Eugen Rochko [Mon, 28 May 2018 03:21:04 +0000 (05:21 +0200)]
Record trending tags from ActivityPub, too (#7647)

7 years agoReplace recursion in status mapStateToProps (#7645)
Eugen Rochko [Mon, 28 May 2018 00:42:06 +0000 (02:42 +0200)]
Replace recursion in status mapStateToProps (#7645)

7 years agoTrack trending tags (#7638)
Eugen Rochko [Sun, 27 May 2018 19:45:30 +0000 (21:45 +0200)]
Track trending tags (#7638)

* Track trending tags

- Half-life of 1 day
- Historical usage in daily buckets (last 7 days stored)
- GET /api/v1/trends

Fix #271

* Add trends to web UI

* Don't render compose form on search route, adjust search results header

* Disqualify tag from trends if it's in disallowed hashtags setting

* Count distinct accounts using tag, ignore silenced accounts

7 years agoValidate that e-mail resolves with MX and it's not blacklisted (#7631)
Eugen Rochko [Sun, 27 May 2018 02:58:08 +0000 (04:58 +0200)]
Validate that e-mail resolves with MX and it's not blacklisted (#7631)

Original patch by @j-a4

7 years agoDon't use Object.assign with Notification, only display actions for mentions (#7632)
Eugen Rochko [Sun, 27 May 2018 02:55:19 +0000 (04:55 +0200)]
Don't use Object.assign with Notification, only display actions for mentions (#7632)

Fix #7627

7 years agoFix lock icon position in account card (#7630)
bsky [Sat, 26 May 2018 13:29:32 +0000 (22:29 +0900)]
Fix lock icon position in account card (#7630)

7 years agoAdd right margin of notification message (#7628)
Lynx Kotoura [Sat, 26 May 2018 08:53:53 +0000 (17:53 +0900)]
Add right margin of notification message (#7628)

7 years agoFix color mistakes in mastodon-light theme (#7626)
Lynx Kotoura [Sat, 26 May 2018 08:53:44 +0000 (17:53 +0900)]
Fix color mistakes in mastodon-light theme (#7626)

* Fix colors of mastodon-light theme

Fix colors of modals and focused toots in light theme
Fix colors of compose-form items and more
Fix colors of status__content__spoiler-link:hover and $valid-value-color
Change success green color in light theme

* Fix some sass codes

* Add !default for explicit color valiables in default theme

for overwriting colors easier in the other themes

7 years agoWeblate translations (2018-05-26) (#7624)
Yamagishi Kazutoshi [Sat, 26 May 2018 02:45:58 +0000 (11:45 +0900)]
Weblate translations (2018-05-26) (#7624)

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/

* Translated using Weblate (Occitan)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* Translated using Weblate (Galician)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Occitan)

Currently translated at 98.0% (609 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Occitan)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* Translated using Weblate (Italian)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/

* Translated using Weblate (Italian)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Italian)

Currently translated at 98.4% (65 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/

* Translated using Weblate (Italian)

Currently translated at 84.0% (522 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Esperanto)

Currently translated at 99.8% (620 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/

* Translated using Weblate (Japanese)

Currently translated at 99.6% (619 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Occitan)

Currently translated at 98.0% (609 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (French)

Currently translated at 99.6% (619 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Italian)

Currently translated at 84.0% (522 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Persian)

Currently translated at 99.6% (298 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Persian)

Currently translated at 99.5% (618 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Persian)

Currently translated at 99.6% (619 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Occitan)

Currently translated at 98.0% (609 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Dutch)

Currently translated at 99.8% (620 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Persian)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Slovak)

Currently translated at 95.0% (590 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 98.4% (65 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Galician)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (French)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 99.6% (619 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Japanese)

Currently translated at 99.3% (617 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.9% (62 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

Ορθογραφικό λάθος

* Translated using Weblate (Greek)

Currently translated at 44.4% (276 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 99.1% (616 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/

* Translated using Weblate (Swedish)

Currently translated at 99.3% (617 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/

* Translated using Weblate (Arabic)

Currently translated at 90.8% (564 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovak)

Currently translated at 95.0% (590 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (German)

Currently translated at 99.0% (615 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (619 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Arabic)

Currently translated at 93.9% (62 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 98.6% (75 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/

* Translated using Weblate (Arabic)

Currently translated at 90.8% (564 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (299 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 44.6% (277 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Slovak)

Currently translated at 95.1% (591 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovak)

Currently translated at 95.1% (591 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Japanese)

Currently translated at 99.5% (618 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Basque)

Currently translated at 89.6% (268 of 299 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/

* Translated using Weblate (Basque)

Currently translated at 40.9% (27 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/

* Translated using Weblate (Basque)

Currently translated at 1.2% (8 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/

* i18n-tasks normalize && yarn manage:translations

7 years agoCatch ActionController::UnknownFormat and return HTTP 406 (#7621)
Eugen Rochko [Fri, 25 May 2018 23:09:30 +0000 (01:09 +0200)]
Catch ActionController::UnknownFormat and return HTTP 406 (#7621)

An error like that should not appear in production error log.

7 years agoDisable AMS logging (#7623)
Eugen Rochko [Fri, 25 May 2018 23:08:31 +0000 (01:08 +0200)]
Disable AMS logging (#7623)

Especially in production it's just noise and doesn't mix well with the log format

7 years agoRemove Puma pidfile before boot if container receives SIGTERM (#7052)
Isatis [Fri, 25 May 2018 16:50:31 +0000 (09:50 -0700)]
Remove Puma pidfile before boot if container receives SIGTERM (#7052)

7 years agoIntroduce flat layout to contexts reducer (#7150)
Akihiko Odaki [Fri, 25 May 2018 16:46:28 +0000 (01:46 +0900)]
Introduce flat layout to contexts reducer (#7150)

This allows to filter out replies in threads even if contexts of those
replies are not fetched.

7 years agoEnable media timeline (#7598)
Yamagishi Kazutoshi [Fri, 25 May 2018 16:36:46 +0000 (01:36 +0900)]
Enable media timeline (#7598)

7 years agoMore polished light theme (#7620)
Lynx Kotoura [Fri, 25 May 2018 16:36:26 +0000 (01:36 +0900)]
More polished light theme (#7620)

* Revert "Remove pointer to light theme until it is more polished (#7594)"

This reverts commit f8cf85db3b3a4541a0add4b985a9bf0fbe8f2aa0.

* True up the hierarchical structure of mastodon-light theme

* Fix mastodon-light theme

7 years agoFix color of /about/more link anchors (#7618)
Lynx Kotoura [Fri, 25 May 2018 14:48:17 +0000 (23:48 +0900)]
Fix color of /about/more link anchors (#7618)

7 years agoAdded the law requirements for the EU/EEA (#7605)
Jeroen [Fri, 25 May 2018 12:27:14 +0000 (14:27 +0200)]
Added the law requirements for the EU/EEA (#7605)

* Added the law requirements for the EU/EEA

See article 8 of the GDPR

* fix

* i18n-tasks normalize

7 years agoIgnore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)
ThibG [Fri, 25 May 2018 12:26:45 +0000 (14:26 +0200)]
Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)

7 years agoUse .star-icon instead of hardcoding color in detailed statuses (fixes #7610) (#7613)
ThibG [Fri, 25 May 2018 01:03:22 +0000 (03:03 +0200)]
Use .star-icon instead of hardcoding color in detailed statuses (fixes #7610) (#7613)

7 years agoFix caret position after selected suggestion and media upload (#7595)
ThibG [Wed, 23 May 2018 13:20:15 +0000 (15:20 +0200)]
Fix caret position after selected suggestion and media upload (#7595)

* Fix media upload reseting caret position to last inserted emoji

* Fix caret position after inserting suggestions (fixes #6089)

7 years agoFix tests for invites controller (regression from 4d81809f36fcbfe787e23d490f2cb0ad943...
Yamagishi Kazutoshi [Wed, 23 May 2018 04:32:10 +0000 (13:32 +0900)]
Fix tests for invites controller (regression from 4d81809f36fcbfe787e23d490f2cb0ad943ab32c) (#7597)

7 years agoYeah, it was supposed to be #create?
Eugen Rochko [Tue, 22 May 2018 18:05:24 +0000 (20:05 +0200)]
Yeah, it was supposed to be #create?

7 years agoBump version to 2.4.0
Eugen Rochko [Tue, 22 May 2018 17:39:35 +0000 (19:39 +0200)]
Bump version to 2.4.0

7 years agoRemove pointer to light theme until it is more polished (#7594)
Eugen Rochko [Tue, 22 May 2018 17:38:37 +0000 (19:38 +0200)]
Remove pointer to light theme until it is more polished (#7594)

7 years agoRemove unneeded code now that attachment URL isn't appended to toots (#7593)
ThibG [Tue, 22 May 2018 17:32:02 +0000 (19:32 +0200)]
Remove unneeded code now that attachment URL isn't appended to toots (#7593)

7 years agoDo not encode HTML entities in initial Web Push payload body (#7592)
Eugen Rochko [Tue, 22 May 2018 16:12:45 +0000 (18:12 +0200)]
Do not encode HTML entities in initial Web Push payload body (#7592)

7 years ago[WIP] i18n: Update Simplified Chinese translations (#7576)
SerCom_KC [Tue, 22 May 2018 13:26:42 +0000 (21:26 +0800)]
[WIP] i18n: Update Simplified Chinese translations (#7576)

* i18n: (zh-CN) #7027

* Rewording
This placeholder is also seen on single user page at Moderation > Accounts, where "this report" doesn't make sense.

* i18n: (zh-CN) #6425

* i18n: (zh-CN) #6497

* i18n: (zh-CN) #6246

* i18n: (zh-CN) Improvements

7 years agoAdd tests for report notes controller (#7589)
Shuhei Kitagawa [Tue, 22 May 2018 12:45:10 +0000 (21:45 +0900)]
Add tests for report notes controller (#7589)

7 years agoEnforce order on authorized applications page (#7587)
Eugen Rochko [Tue, 22 May 2018 12:44:53 +0000 (14:44 +0200)]
Enforce order on authorized applications page (#7587)

Fix #7586

7 years agoHide section headline for timelines in production (#7590)
Yamagishi Kazutoshi [Tue, 22 May 2018 12:44:32 +0000 (21:44 +0900)]
Hide section headline for timelines in production (#7590)

* Hide section headline for timelines in production

* comment out

7 years agoChange column params on pinned timeline (#7581)
Yamagishi Kazutoshi [Tue, 22 May 2018 11:26:06 +0000 (20:26 +0900)]
Change column params on pinned timeline (#7581)

7 years agoRemove outline (#7582)
bsky [Tue, 22 May 2018 11:24:54 +0000 (20:24 +0900)]
Remove outline (#7582)

7 years ago[RU] Added mastodon-light string (#7583)
Evgeny Petrov [Tue, 22 May 2018 09:06:53 +0000 (12:06 +0300)]
[RU] Added mastodon-light string (#7583)

7 years ago🌍: 🇵🇱⬆️ (#7580)
Marcin Mikołajczak [Mon, 21 May 2018 21:12:35 +0000 (23:12 +0200)]
🌍: 🇵🇱⬆️ (#7580)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoSave onlyMedia prop when pinning column (#7575)
Eugen Rochko [Mon, 21 May 2018 15:49:10 +0000 (17:49 +0200)]
Save onlyMedia prop when pinning column (#7575)

7 years agoDisplay only domain of report account if remote under comment (#7574)
Eugen Rochko [Mon, 21 May 2018 15:33:20 +0000 (17:33 +0200)]
Display only domain of report account if remote under comment (#7574)

7 years agoAdd exact attribute to WrappedRoute for community timeline (#7572)
Yamagishi Kazutoshi [Mon, 21 May 2018 14:26:00 +0000 (23:26 +0900)]
Add exact attribute to WrappedRoute for community timeline (#7572)

* Add extra attribute to WrappedRoute for community timeline

* fix

7 years agoBump version to 2.4.0rc5
Eugen Rochko [Mon, 21 May 2018 14:05:31 +0000 (16:05 +0200)]
Bump version to 2.4.0rc5

7 years agoUse real container width in MediaGallery srcSet (#7571)
Eugen Rochko [Mon, 21 May 2018 14:04:01 +0000 (16:04 +0200)]
Use real container width in MediaGallery srcSet (#7571)

Fix #7568

7 years agoUse #any? instead of #exists? when checking media attachments (#7570)
Eugen Rochko [Mon, 21 May 2018 14:01:16 +0000 (16:01 +0200)]
Use #any? instead of #exists? when checking media attachments (#7570)

If media_attachments are not loaded, SQL query is the same, but
the #exists? method performs SQL query even if preloaded

7 years agoUnescape HTML entities in rich web push notifications in web UI (#7569)
Eugen Rochko [Mon, 21 May 2018 14:00:56 +0000 (16:00 +0200)]
Unescape HTML entities in rich web push notifications in web UI (#7569)

7 years agoi18n: Update Simplified Chinese translations (#7565)
SerCom_KC [Mon, 21 May 2018 11:40:48 +0000 (19:40 +0800)]
i18n: Update Simplified Chinese translations (#7565)

* i18n: (zh-CN) #7532

* i18n: (zh-CN) #6984

* i18n: (zh-CN) #7391, #7507

* i18n: (zh-CN) #6998

* i18n: (zh-CN) #7074

* i18n: (zh-CN) #7000, #7032, #7131 (#7032, #7040)

* i18n: (zh-CN) #7130, #7188

* i18n: (zh-CN) #6486

* i18n: (zh-CN) #6292

* i18n: (zh-CN) #7347

* i18n: (zh-CN) #6661

* i18n: (zh-CN) #6425

* i18n: (zh-CN) #6597

* i18n: (zh-CN) #6695

* i18n: (zh-CN) #6325

* i18n: (zh-CN) #6460, #7375

* i18n: (zh-CN) #6872

* i18n: (zh-CN) #6818

* i18n: (zh-CN) #7452

* i18n: (zh-CN) #7176

* i18n: (zh-CN) #6460

* i18n: (zh-CN) #7213

* i18n: (zh-CN) #7376

* i18n: (zh-CN) #6556

* i18n: (zh-CN) #6645

* i18n: (zh-CN) #6448

* i18n: (zh-CN) #5303

* i18n: (zh-CN) #7445

* i18n: (zh-CN) Normalization and improvements

* i18n: (zh-CN) #7391

* i18n: (zh-CN) #6627

* i18n: (zh-CN) #6956, #7546

* i18n: (zh-CN) #6636

* i18n: (zh-CN) #6610, #6875

* i18n: (zh-CN) #6887

* i18n: (zh-CN) #4514

* i18n: (zh-CN) #6628

* i18n: (zh-CN) #6771

* i18n: (zh-CN) #6772

* i18n: (zh-CN) #7178

* i18n: (zh-CN) #7521

* i18n: (zh-CN) #6570

* i18n: (zh-CN) #6593

* i18n: (zh-CN) #6423

* i18n: (zh-CN) #6157

* i18n: (zh-CN) #7089

* i18n: (zh-CN) #6733

* i18n: (zh-CN) #7072

* i18n: (zh-CN) #6520

* i18n: (zh-CN) Improvment

* i18n: (zh-CN) #6631

7 years agoAdd a light theme (#7027)
Sylvhem [Mon, 21 May 2018 11:40:31 +0000 (13:40 +0200)]
Add a light theme (#7027)

* Add a light theme to Mastodon

This add a second default theme to Mastodon. This new theme is supposed to be a light version of the dark original one.

* Update locales

Update the English and French locales.

* Change capitalization of hexadecimal triplets

Change capitalization of hexadecimal color codes to match Code Climate's recomandation.

* Add variable

Add a new variable to use instead of hardcoding a color. Change made to match Code Climate's recomandation.

* Use Mastodon branding palette

Replace the colors previously used by the ones found in Mastodon branding palette.
The resulting theme is lighter than the previous version.

* Make the overlay background white

Make the overly background used on on sensitive medias white instead of black

* Change the color used on the envelop icon

Change the color used on the envelop icon for a darker one. The same color is now used on both the envelop icon and the padlock icon.

* Add contrast

Add contrast to various places inside the main interface and the profile pages.

* Change the text color used in the compose form

Change the text color used in the compose form for a darker one.

* Make the code easier to read

Add some blank lines to make the code easier to parse for a human eye.

* Change columns' background default colors

Change columns' background default colors, making the composition column the darker one.

* Change the color of the log in button

Change the log in button's text color to make it more readable.

* Fix the color of the boost buttons on the landing page

The disabled boost buttons on the landing page are now of the same color that the other disabled buttons.

* Change the colors used in the dropdown menu

Make the dropdown menu light instead of dark.

7 years agoAdd media timeline (#6631)
Yamagishi Kazutoshi [Mon, 21 May 2018 10:43:38 +0000 (19:43 +0900)]
Add media timeline (#6631)

7 years agoRemove small pagination limit from context API (#7564)
Eugen Rochko [Mon, 21 May 2018 10:43:05 +0000 (12:43 +0200)]
Remove small pagination limit from context API (#7564)

Fix #7557

7 years agoConvert rich push notifications to plaintext in webapp (#7563)
Eugen Rochko [Mon, 21 May 2018 01:35:37 +0000 (03:35 +0200)]
Convert rich push notifications to plaintext in webapp (#7563)

* Convert rich push notifications to plaintext in webapp

* Fix code style issues

7 years ago[i18n] Update for Occitan (#7558)
Quentí [Sun, 20 May 2018 18:26:32 +0000 (20:26 +0200)]
[i18n] Update for Occitan (#7558)

* Update oc.json

* Update oc.yml

* Update simple_form.oc.yml

7 years agoImprove default background of public profile header (#7556)
Eugen Rochko [Sun, 20 May 2018 11:09:28 +0000 (13:09 +0200)]
Improve default background of public profile header (#7556)

Looks better when no header image is set

7 years ago[RU] Updated strings for 2.4.0 (#7555)
Evgeny Petrov [Sat, 19 May 2018 23:03:24 +0000 (02:03 +0300)]
[RU] Updated strings for 2.4.0 (#7555)

7 years ago🌍: 🇵🇱⬆️ (#7554)
Marcin Mikołajczak [Sat, 19 May 2018 22:55:56 +0000 (00:55 +0200)]
🌍: 🇵🇱⬆️ (#7554)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoWeblate translations (2018-05-20) (#7552)
Yamagishi Kazutoshi [Sat, 19 May 2018 19:42:21 +0000 (04:42 +0900)]
Weblate translations (2018-05-20) (#7552)

* Translated using Weblate (French)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/

* Translated using Weblate (Italian)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/

* Translated using Weblate (French)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (628 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Galician)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (625 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Italian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Italian)

Currently translated at 83.7% (525 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/

* Translated using Weblate (Galician)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (627 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (628 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Galician)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (French)

Currently translated at 99.5% (624 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/

* Translated using Weblate (French)

Currently translated at 99.6% (625 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/

* Translated using Weblate (Galician)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Japanese)

Currently translated at 93.9% (62 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (627 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (626 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (French)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (628 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (French)

Currently translated at 99.6% (626 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Swedish)

Currently translated at 99.5% (625 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/

* Translated using Weblate (Slovak)

Currently translated at 98.4% (65 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Swedish)

Currently translated at 95.4% (63 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (627 of 628 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Persian)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/

* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations

7 years agoEnsure push subscription is immediately removed when application is revoked (#7548)
Eugen Rochko [Sat, 19 May 2018 19:05:08 +0000 (21:05 +0200)]
Ensure push subscription is immediately removed when application is revoked (#7548)

* Ensure push subscription is immediately removed when application is revoked

* When token is revoked from app, unsubscribe too

7 years agoAdd :few keys for sk lang plurals (#7551)
Peter [Sat, 19 May 2018 18:46:18 +0000 (19:46 +0100)]
Add :few keys for sk lang plurals (#7551)

* Add :few keys for sk lang plurals

* i18n-tasks normalize

7 years agoDisables autocorrect/autocapitalize on remote username field. (#7549)
Ash Furrow [Sat, 19 May 2018 17:36:23 +0000 (13:36 -0400)]
Disables autocorrect/autocapitalize on remote username field. (#7549)

7 years agoCache media only when storage can be freed (#7547)
Akihiko Odaki [Sat, 19 May 2018 17:22:11 +0000 (02:22 +0900)]
Cache media only when storage can be freed (#7547)

7 years agoBump version to 2.4.0rc4
Eugen Rochko [Sat, 19 May 2018 16:38:10 +0000 (18:38 +0200)]
Bump version to 2.4.0rc4

7 years agoImprove direct message warning again (#7546)
Eugen Rochko [Sat, 19 May 2018 16:37:33 +0000 (18:37 +0200)]
Improve direct message warning again (#7546)

7 years agoIn footer, replace text "Mastodon" with logo (#7545)
Eugen Rochko [Sat, 19 May 2018 14:10:55 +0000 (16:10 +0200)]
In footer, replace text "Mastodon" with logo (#7545)

7 years agochecking http status code with range (#7544)
takayamaki [Sat, 19 May 2018 12:47:44 +0000 (21:47 +0900)]
checking http status code with range (#7544)

7 years agoImprove payload format of Web Push API now that it's open (#7521)
Eugen Rochko [Sat, 19 May 2018 12:46:47 +0000 (14:46 +0200)]
Improve payload format of Web Push API now that it's open (#7521)

> Good lord what is happening in there

Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload:

```json
{
  "access_token": "...",
  "preferred_locale": "en",
  "notification_id": "12345",
  "notification_type": "follow",
  "title": "So and so followed you",
  "body": "This is my bio",
  "icon": "https://example.com/avatar.png"
}
```

The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data.

7 years agoDo not override the default push notification settings (#6037)
Akihiko Odaki [Sat, 19 May 2018 12:45:58 +0000 (21:45 +0900)]
Do not override the default push notification settings (#6037)

7 years agoRemove outline (#7543)
bsky [Sat, 19 May 2018 10:16:52 +0000 (19:16 +0900)]
Remove outline (#7543)

7 years agoSkip pagination logic for pinned account timelines in reducer (#7540)
Eugen Rochko [Sat, 19 May 2018 00:51:29 +0000 (02:51 +0200)]
Skip pagination logic for pinned account timelines in reducer (#7540)

Fix #7516

7 years agoUpgrade posix-spawn to master (#7542)
MIYAGI Hikaru [Sat, 19 May 2018 00:20:43 +0000 (09:20 +0900)]
Upgrade posix-spawn to master (#7542)

7 years agoDo not raise delivery failure on 4xx errors, increase stoplight threshold (#7541)
Eugen Rochko [Fri, 18 May 2018 22:23:19 +0000 (00:23 +0200)]
Do not raise delivery failure on 4xx errors, increase stoplight threshold (#7541)

* Do not raise delivery failure on 4xx errors, increase stoplight threshold

Stoplight failure threshold from 3 to 10
Status code 429 will raise a failure/get retried

* Oops

7 years agoFix double-encoding of display name in title and e-mails (#7534)
Eugen Rochko [Fri, 18 May 2018 13:56:57 +0000 (15:56 +0200)]
Fix double-encoding of display name in title and e-mails (#7534)

7 years agoChange Japanese translation for privacy.private.short (#7535)
Akihiko Odaki [Fri, 18 May 2018 13:30:45 +0000 (22:30 +0900)]
Change Japanese translation for privacy.private.short (#7535)

The old translation means "hidden," but it is vague in terms that it does
not specify the scope status is hidden. The new translation is a literal
translation of "Followers-only," without such ambiguity.

7 years agoResolve unknown status from Add activity, skip Remove if unknown (#7526)
Eugen Rochko [Fri, 18 May 2018 09:33:56 +0000 (11:33 +0200)]
Resolve unknown status from Add activity, skip Remove if unknown (#7526)

Fix #7518

7 years agoUse randomized setTimeout when fallback-polling and re-add since_id (#7522)
Eugen Rochko [Fri, 18 May 2018 00:32:35 +0000 (02:32 +0200)]
Use randomized setTimeout when fallback-polling and re-add since_id (#7522)

7 years agoAdd preference to hide following/followers lists (#7532)
Eugen Rochko [Fri, 18 May 2018 00:26:51 +0000 (02:26 +0200)]
Add preference to hide following/followers lists (#7532)

* Add preference to hide following/followers lists

- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)

Fix #6901

* Add preference

* Add delegation

* Fix issue

* Fix issue

7 years agoUser agent for WebFinger (#7531)
MIYAGI Hikaru [Thu, 17 May 2018 23:47:22 +0000 (08:47 +0900)]
User agent for WebFinger (#7531)

* User agent for WebFinger

* local_domain → web_domain

* 'http' is away accidentally...

7 years agoEnsure unfilled fields are shown when errors are shown (#7523)
Eugen Rochko [Thu, 17 May 2018 11:00:56 +0000 (13:00 +0200)]
Ensure unfilled fields are shown when errors are shown (#7523)

Fix #7486

7 years agoAdd tests for account_moderation_notes_controller (#7524)
Shuhei Kitagawa [Thu, 17 May 2018 02:26:51 +0000 (11:26 +0900)]
Add tests for account_moderation_notes_controller (#7524)

7 years agoHTTP signatures spec no longer requires algorithms field (#7525)
Eugen Rochko [Thu, 17 May 2018 02:03:28 +0000 (04:03 +0200)]
HTTP signatures spec no longer requires algorithms field (#7525)

Fix #7520

7 years agoFix posix-spawn to version 0.3.12 (#7517)
MIYAGI Hikaru [Wed, 16 May 2018 14:52:19 +0000 (23:52 +0900)]
Fix posix-spawn to version 0.3.12 (#7517)

Because 0.3.13 causes build error in x86 or other ILP32 environments.
closes #7453

7 years agoRussian language for 2.4.0 (#7512)
Evgeny Petrov [Wed, 16 May 2018 14:25:11 +0000 (17:25 +0300)]
Russian language for 2.4.0 (#7512)

* Russian language for 2.4.0

* Russian language for 2.4.0

* bundle exec i18n-tasks normalize

* RU: Updated some strings after new commits appeared

7 years agoFix images resized in browser getting cropped (#7514)
Eugen Rochko [Wed, 16 May 2018 14:24:16 +0000 (16:24 +0200)]
Fix images resized in browser getting cropped (#7514)

Fix #7487

7 years agoFrench translation tweaks (#7513)
Technowix [Wed, 16 May 2018 14:21:48 +0000 (16:21 +0200)]
French translation tweaks (#7513)

- Use more neutral terminology for readability.
- Maintains the use of "Personne" instead of "Utilisateur⋅ice" to emphasis on the "You're not the product".
- Some fixes for accounts.

7 years ago[l10n] Occitan update (#7505)
Quentí [Wed, 16 May 2018 14:18:32 +0000 (16:18 +0200)]
[l10n] Occitan update (#7505)

* Update oc.json

* Update doorkeeper.oc.yml

* Update oc.yml

* Update simple_form.oc.yml

* Update oc.json

Accept is the opp. of reject, I think it's better like this.

* bundle exec i18n-tasks normalize

7 years agoUpdate bot preference text (#7507)
nightpool [Wed, 16 May 2018 12:47:29 +0000 (08:47 -0400)]
Update bot preference text (#7507)

* Update simple_form.en.yml

* fix #2

7 years agoReword the direct message warning (#7420)
Sylvhem [Wed, 16 May 2018 12:47:11 +0000 (14:47 +0200)]
Reword the direct message warning (#7420)

* Change direct message warning

Reword the direct message warning to set proper privacy expectations.

* Update the French translation

Update the French translation to reflect the changes made to the direct message warning.

* Wording update

Update the message's wording according to the feedback.

7 years agoDo not use permitted_for scope when querying pinned statuses (#7510)
Akihiko Odaki [Wed, 16 May 2018 10:30:14 +0000 (19:30 +0900)]
Do not use permitted_for scope when querying pinned statuses (#7510)

permitted_for scope is slow when combined with pinned status scope.
Fortunately permitted_for scope can safely be removed because a pinned
status is always public.

7 years agoRaise Mastodon::RaceConditionError if Redis lock failed (#7511)
Akihiko Odaki [Wed, 16 May 2018 10:29:45 +0000 (19:29 +0900)]
Raise Mastodon::RaceConditionError if Redis lock failed (#7511)

An explicit error allows user agents to know the error and Sidekiq to
retry.

7 years agoLet navigator follow redirect instead that handling redirect in fetch (#7500)
Akihiko Odaki [Wed, 16 May 2018 02:59:44 +0000 (11:59 +0900)]
Let navigator follow redirect instead that handling redirect in fetch (#7500)

* Let navigator follow redirect instead that handling redirect in fetch

* Do not use cache when fetched resource is to redirect

7 years agoConsider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser (#7506)
Akihiko Odaki [Tue, 15 May 2018 19:42:31 +0000 (04:42 +0900)]
Consider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser (#7506)

7 years agoTest if navigator.storage.estimate exists before using it (#7504)
Akihiko Odaki [Tue, 15 May 2018 18:15:08 +0000 (03:15 +0900)]
Test if navigator.storage.estimate exists before using it (#7504)

7 years agoIgnore only-if-cached cache mode on Mozilla Firefox prior to version 60 (#7503)
Akihiko Odaki [Tue, 15 May 2018 18:14:30 +0000 (03:14 +0900)]
Ignore only-if-cached cache mode on Mozilla Firefox prior to version 60 (#7503)

7 years ago🌍: 🇵🇱⬆️ (#7494)
Marcin Mikołajczak [Tue, 15 May 2018 16:20:40 +0000 (18:20 +0200)]
🌍: 🇵🇱⬆️ (#7494)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoFix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501)
unarist [Tue, 15 May 2018 14:03:34 +0000 (23:03 +0900)]
Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501)

This patch fixes NoMethodError and others in RemoteProfileUpdateWorker.

7 years agoWeblate translations 20180515 (#7496)
Renato "Lond" Cerqueira [Tue, 15 May 2018 12:25:07 +0000 (14:25 +0200)]
Weblate translations 20180515 (#7496)

* Translated using Weblate (Catalan)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Italian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Korean)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (627 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (627 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (French)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* Translated using Weblate (Slovak)

Currently translated at 95.3% (597 of 626 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Korean)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/

* Translated using Weblate (Korean)

Currently translated at 99.8% (625 of 626 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* Added translation using Weblate (Slovenian)

* Added translation using Weblate (Slovenian)

* Added translation using Weblate (Slovenian)

* Added translation using Weblate (Slovenian)

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 99.3% (623 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 98.4% (63 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/

* Translated using Weblate (Arabic)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 99.6% (294 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/

* Translated using Weblate (Italian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Galician)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (627 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* Translated using Weblate (Slovenian)

Currently translated at 7.8% (5 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* Translated using Weblate (Slovenian)

Currently translated at 12.5% (8 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (295 of 295 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Slovenian)

Currently translated at 11.9% (75 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/

* Translated using Weblate (Slovenian)

Currently translated at 14.1% (89 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/

* Translated using Weblate (Japanese)

Currently translated at 99.5% (624 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.6% (625 of 627 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused

* Remove translations causing issues in arabic

Related to #6673

7 years agoClone response before using when caching web page (#7498)
Akihiko Odaki [Tue, 15 May 2018 12:24:50 +0000 (21:24 +0900)]
Clone response before using when caching web page (#7498)

7 years agoFix account URI when updating ActivityPub account (#7488)
Wiktor [Mon, 14 May 2018 20:56:45 +0000 (22:56 +0200)]
Fix account URI when updating ActivityPub account (#7488)

Updates account `uri` field on each call to `update_account` instead of
only once during `create_account` to mirror the same behavior in OStatus
`ResolveAccountService` class [0].

ActivityPub accounts are identified using `@username` and `@domain` pair
instead of URI since #6842.

This fixes #7479: a bug when the account identified by `@username` and
`@domain` changes its URI.

[0]:
https://github.com/tootsuite/mastodon/blob/03b69ebc450efc07246bd64204276941b7ede3fc/app/services/resolve_account_service.rb#L121

7 years agoDisallow async function in service worker (#7482)
Akihiko Odaki [Mon, 14 May 2018 17:58:11 +0000 (02:58 +0900)]
Disallow async function in service worker (#7482)

offline-plugin depends on webpack.optimize.UglifyJsPlugin, which is an
alias of uglifyjs-webpack-plugin v0.4.6. uglifyjs-webpack-plugin v0.4.6
uses uglify-js 2.8.29, which is not compatible with async function.

7 years agoRevert index change on statuses for api/v1/accounts account_id statuses (#7484)
Akihiko Odaki [Mon, 14 May 2018 17:56:17 +0000 (02:56 +0900)]
Revert index change on statuses for api/v1/accounts account_id statuses (#7484)

7 years agoBump version to 2.4.0rc3
Eugen Rochko [Mon, 14 May 2018 15:46:44 +0000 (17:46 +0200)]
Bump version to 2.4.0rc3

7 years agoLimit environment variables to expose to webpack (#7480)
Akihiko Odaki [Mon, 14 May 2018 15:45:37 +0000 (00:45 +0900)]
Limit environment variables to expose to webpack (#7480)

7 years agoBump version to 2.4.0rc2
Eugen Rochko [Mon, 14 May 2018 12:49:38 +0000 (14:49 +0200)]
Bump version to 2.4.0rc2

7 years agoAdd Slovene language (#7475)
Yamagishi Kazutoshi [Mon, 14 May 2018 10:52:25 +0000 (19:52 +0900)]
Add Slovene language (#7475)

7 years agoCall media.present? because media may be nil (#7474)
abcang [Mon, 14 May 2018 10:51:53 +0000 (19:51 +0900)]
Call media.present? because media may be nil (#7474)