]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years ago[Glitch] Make animated header resoect `auto_play_gif`
Thibaut Girka [Sun, 16 Dec 2018 12:34:01 +0000 (13:34 +0100)]
[Glitch] Make animated header resoect `auto_play_gif`

Port part of 7c48688d85d0ab64501cea6b8a516867a786bb4c to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 15 Dec 2018 09:38:54 +0000 (10:38 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

 Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

7 years agoI18n: Correct pluralization of Czech (#9527)
Aditoo17 [Sat, 15 Dec 2018 08:08:54 +0000 (09:08 +0100)]
I18n: Correct pluralization of Czech (#9527)

* I18n: Correct pluralization of Czech

* I18n: Correct pluralization of Czech

7 years agoOn mobile, go back in browser history upon posting, unless threaded mode is enabled
Thibaut Girka [Thu, 13 Dec 2018 15:50:37 +0000 (16:50 +0100)]
On mobile, go back in browser history upon posting, unless threaded mode is enabled

7 years agoBump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429)
dependabot[bot] [Fri, 14 Dec 2018 19:37:29 +0000 (20:37 +0100)]
Bump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.27.0 to 1.30.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoAdd spec for Admin::ActionLogsController#index (#9522)
ysksn [Fri, 14 Dec 2018 19:37:01 +0000 (04:37 +0900)]
Add spec for Admin::ActionLogsController#index (#9522)

7 years agoAdd specs for RemoteInteractionController (#9524)
ysksn [Fri, 14 Dec 2018 19:36:40 +0000 (04:36 +0900)]
Add specs for RemoteInteractionController (#9524)

7 years agoAdd spec for Admin::DashboardController#index (#9523)
ysksn [Fri, 14 Dec 2018 19:36:18 +0000 (04:36 +0900)]
Add spec for Admin::DashboardController#index (#9523)

7 years agoWhen posting in mobile mode, go back to previous history location (#9502)
ThibG [Fri, 14 Dec 2018 19:35:26 +0000 (20:35 +0100)]
When posting in mobile mode, go back to previous history location (#9502)

Fixes #7112

7 years agoMake avatar and headers respect `auto_play_gif` (#9515)
ThibG [Fri, 14 Dec 2018 19:34:18 +0000 (20:34 +0100)]
Make avatar and headers respect `auto_play_gif` (#9515)

* Do not animate account header art if user's GIF autoplay setting is off

Fixes #9472

* Honour currently logged-in user's GIF autoplay setting for account avatars

Fixes #9467

* Fix avatar display on some public pages when data is stored on a different host

* Use ternary operator instead of if/else for avatar/header URL

7 years agoRemove form_action from CSP
Rey Tucker [Thu, 13 Dec 2018 00:58:57 +0000 (19:58 -0500)]
Remove form_action from CSP

This trips an issue when trying to authenticate through to
third-party sites, e.g. bridge.joinmastodon.org:

    Refused to send form data to 'https://bridge.joinmastodon.org/'
    because it violates the following Content Security Policy
    directive: "form-action 'self'".

Thread: https://vulpine.club/@digifox/101230933751352042

7 years agoBump redis from 4.0.3 to 4.1.0 (#9520)
dependabot[bot] [Fri, 14 Dec 2018 05:52:06 +0000 (06:52 +0100)]
Bump redis from 4.0.3 to 4.1.0 (#9520)

Bumps [redis](https://github.com/redis/redis-rb) from 4.0.3 to 4.1.0.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.0.3...v4.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoError message for avatar image that's too large. #9204 (#9518)
Sumit Khanna [Fri, 14 Dec 2018 04:07:21 +0000 (22:07 -0600)]
Error message for avatar image that's too large. #9204 (#9518)

* Error message for avatar image that's too large. #9204

* Code climate/formatting

* Removed avatar error message

* Moved valid image dimentions check to update service

* removed unnescessary begin block

* code climate formatting

* code climate indent fix

7 years agoRestore profile links in /admin/accounts (#9494)
ThibG [Fri, 14 Dec 2018 00:47:50 +0000 (01:47 +0100)]
Restore profile links in /admin/accounts (#9494)

Fixes #9431

7 years agoFix padding on select elements in preferences (#9517)
ThibG [Fri, 14 Dec 2018 00:44:39 +0000 (01:44 +0100)]
Fix padding on select elements in preferences (#9517)

Add right-padding to select elements to take the up/down arrows into
account.

Thanks Tixie for finding the issue!

7 years agoFix timeline pagination in the WebUI (#9516)
ThibG [Fri, 14 Dec 2018 00:41:38 +0000 (01:41 +0100)]
Fix timeline pagination in the WebUI (#9516)

The `hasMore` property of timelines in redux store was set whenever an API
request returned only one page of results, *even* if the query only requested
newer statuses (using `since_id`), causing `hasMore` to be incorrectly set to
false whenever fetching new toots in a timeline, which happens each time
an account's timeline or media gallery is visited.

7 years ago[Glitch] Fix timeline pagination in the WebUI
Thibaut Girka [Thu, 13 Dec 2018 20:08:22 +0000 (21:08 +0100)]
[Glitch] Fix timeline pagination in the WebUI

The `hasMore` property of timelines in redux store was set whenever an API
request returned only one page of results, *even* if the query only requested
newer statuses (using `since_id`), causing `hasMore` to be incorrectly set to
false whenever fetching new toots in a timeline, which happens each time
an account's timeline or media gallery is visited.

7 years ago[Glitch] Fix hasMore in notifications
Thibaut Girka [Thu, 13 Dec 2018 20:11:18 +0000 (21:11 +0100)]
[Glitch] Fix hasMore in notifications

7 years agoWeblate translations (2018-12-13) (#9513)
Renato "Lond" Cerqueira [Thu, 13 Dec 2018 15:59:51 +0000 (16:59 +0100)]
Weblate translations (2018-12-13) (#9513)

* Translated using Weblate (Czech)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (697 of 698 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 99.7% (348 of 349 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 98.9% (88 of 89 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100,0% (349 of 349 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 98.0% (684 of 698 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100,0% (349 of 349 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100,0% (349 of 349 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Greek)

Currently translated at 99.6% (695 of 698 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (349 of 349 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 98.0% (684 of 698 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (698 of 698 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (89 of 89 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 98.6% (345 of 350 strings)

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

* Translated using Weblate (French)

Currently translated at 99.7% (349 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Italian)

Currently translated at 99.7% (349 of 350 strings)

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

* Translated using Weblate (Serbian)

Currently translated at 99.7% (696 of 698 strings)

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

* Translated using Weblate (French)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 98.9% (690 of 698 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (German)

Currently translated at 99.9% (697 of 698 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 98.0% (684 of 698 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (89 of 89 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (French)

Currently translated at 99.9% (697 of 698 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (German)

Currently translated at 98.5% (703 of 714 strings)

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

* Translated using Weblate (Greek)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (91 of 91 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 97.1% (693 of 714 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (91 of 91 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (91 of 91 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100,0% (91 of 91 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Galician)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (91 of 91 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 97.9% (699 of 714 strings)

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

* Translated using Weblate (French)

Currently translated at 100,0% (91 of 91 strings)

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

* Translated using Weblate (French)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.7% (349 of 350 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 97.8% (89 of 91 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 97.9% (699 of 714 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 100.0% (91 of 91 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 97.9% (699 of 714 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 98.0% (700 of 714 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (714 of 714 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (91 of 91 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100,0% (91 of 91 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (93 of 93 strings)

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

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 84.6% (296 of 350 strings)

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

* Translated using Weblate (Croatian)

Currently translated at 47.4% (166 of 350 strings)

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

* Translated using Weblate (Danish)

Currently translated at 96.6% (338 of 350 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (93 of 93 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Finnish)

Currently translated at 94.6% (331 of 350 strings)

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

* Translated using Weblate (Chinese (Simplified))

Currently translated at 82.9% (290 of 350 strings)

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

* Translated using Weblate (Georgian)

Currently translated at 87.4% (306 of 350 strings)

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

* Translated using Weblate (Armenian)

Currently translated at 68.9% (241 of 350 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 96.6% (690 of 714 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 99.7% (349 of 350 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 95.8% (684 of 714 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (93 of 93 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (93 of 93 strings)

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

* Translated using Weblate (Malay)

Currently translated at 13.7% (48 of 350 strings)

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

* Translated using Weblate (Tamil)

Currently translated at 13.7% (48 of 350 strings)

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

* Translated using Weblate (Russian)

Currently translated at 91.7% (321 of 350 strings)

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

* Translated using Weblate (German)

Currently translated at 96.6% (338 of 350 strings)

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

* Translated using Weblate (Korean)

Currently translated at 97.1% (340 of 350 strings)

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

* Translated using Weblate (Serbian (latin))

Currently translated at 70.0% (245 of 350 strings)

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

* Translated using Weblate (Thai)

Currently translated at 10.3% (36 of 350 strings)

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

* Translated using Weblate (Ido)

Currently translated at 36.0% (126 of 350 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 70.6% (247 of 350 strings)

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

* Translated using Weblate (Telugu)

Currently translated at 97.1% (340 of 350 strings)

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

* Translated using Weblate (Swedish)

Currently translated at 85.7% (300 of 350 strings)

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

* Translated using Weblate (Welsh)

Currently translated at 95.1% (333 of 350 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 94.6% (331 of 350 strings)

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

* Translated using Weblate (Polish)

Currently translated at 95.7% (335 of 350 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Turkish)

Currently translated at 44.3% (155 of 350 strings)

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

* Translated using Weblate (Persian)

Currently translated at 96.6% (338 of 350 strings)

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

* Translated using Weblate (Norwegian (old code))

Currently translated at 72.0% (252 of 350 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.7% (349 of 350 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 95.7% (89 of 93 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100,0% (714 of 714 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (714 of 714 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 99.7% (712 of 714 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 100.0% (93 of 93 strings)

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

* Translated using Weblate (German)

Currently translated at 99.7% (349 of 350 strings)

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

* Translated using Weblate (German)

Currently translated at 98.9% (706 of 714 strings)

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

* Translated using Weblate (German)

Currently translated at 98.9% (706 of 714 strings)

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

* Translated using Weblate (Danish)

Currently translated at 96.9% (339 of 350 strings)

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

* Translated using Weblate (Danish)

Currently translated at 89.2% (83 of 93 strings)

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

* Translated using Weblate (French)

Currently translated at 100,0% (93 of 93 strings)

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

* Translated using Weblate (French)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 99.7% (712 of 714 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100,0% (93 of 93 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (93 of 93 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100,0% (93 of 93 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 99.7% (712 of 714 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (93 of 93 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (714 of 714 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Galician)

Currently translated at 99,9% (713 of 714 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100,0% (93 of 93 strings)

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

* Normalize translations

* Add missing translations for ar, cs, sk and sr

* Translated using Weblate (Galician)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (713 of 714 strings)

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

* Translated using Weblate (Galician)

Currently translated at 99.9% (713 of 714 strings)

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

* Normalize translations

* Translated using Weblate (Asturian)

Currently translated at 37.3% (266 of 714 strings)

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

* Translated using Weblate (Asturian)

Currently translated at 68.3% (239 of 350 strings)

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

* Normalize translations

7 years ago[Glitch] Fix “load more” button when no data has been fetched
Thibaut Girka [Wed, 12 Dec 2018 16:00:31 +0000 (17:00 +0100)]
[Glitch] Fix “load more” button when no data has been fetched

7 years ago[Glitch] Make account media gallery more consistent with account timeline
Thibaut Girka [Wed, 12 Dec 2018 17:06:00 +0000 (18:06 +0100)]
[Glitch] Make account media gallery more consistent with account timeline

Display “load more” more consistently, add a loading indicator on first load.

7 years ago[Glitch] Fix LoadMore usage in account media gallery
Thibaut Girka [Tue, 11 Dec 2018 17:51:01 +0000 (18:51 +0100)]
[Glitch] Fix LoadMore usage in account media gallery

(Even though that codepath is probably never actually used…)

7 years ago[Glitch] Do not display empty message when the list is known to have more elements
Thibaut Girka [Wed, 12 Dec 2018 17:04:10 +0000 (18:04 +0100)]
[Glitch] Do not display empty message when the list is known to have more elements

7 years agoMinor cleanup in ScrollableList component
Thibaut Girka [Wed, 12 Dec 2018 17:02:28 +0000 (18:02 +0100)]
Minor cleanup in ScrollableList component

7 years agoAdd account hashtags to ActivityPub actor JSON (#9450)
Eugen Rochko [Thu, 13 Dec 2018 04:22:01 +0000 (05:22 +0100)]
Add account hashtags to ActivityPub actor JSON (#9450)

7 years agoFix bootsnap cache directory being declared relatively (#9511)
Eugen Rochko [Thu, 13 Dec 2018 04:19:52 +0000 (05:19 +0100)]
Fix bootsnap cache directory being declared relatively (#9511)

Resolve #9490

7 years agoAdd spec for Settings::ExportsController#create (#9512)
ysksn [Thu, 13 Dec 2018 01:53:52 +0000 (10:53 +0900)]
Add spec for Settings::ExportsController#create (#9512)

7 years agoVarious fixes to scrollable lists and media gallery (#9501)
ThibG [Wed, 12 Dec 2018 21:32:44 +0000 (22:32 +0100)]
Various fixes to scrollable lists and media gallery (#9501)

* Always use the scrollable class for the ScrollList component

Fixes #9499 as well as empty timelines' scrollbar “blinking”
between loading state and empty state.

* Do not display empty message when the list is known to have more elements

Fixes #9500

* Fix LoadMore usage in account media gallery

(Even though that codepath is probably never actually used…)

* Make account media gallery more consistent with account timeline

Fixes #9498

Display “load more” more consistently, add a loading indicator on first load.

* Fix “load more” button when no data has been fetched

7 years agoCreate Settings::BaseController (#9507)
ysksn [Wed, 12 Dec 2018 21:32:13 +0000 (06:32 +0900)]
Create Settings::BaseController (#9507)

Define `Settings::BaseController#set_body_classes` so that sub classes
inherit `Settings::BaseController` don't need to define
`#set_body_classes` agein.

7 years agoi18n: Update Polish translation (#9509)
Marcin Mikołajczak [Wed, 12 Dec 2018 17:13:20 +0000 (18:13 +0100)]
i18n: Update Polish translation (#9509)

7 years agoRemove redundant (#9503)
ysksn [Wed, 12 Dec 2018 04:54:34 +0000 (13:54 +0900)]
Remove redundant (#9503)

7 years agoUse find_or_initialize_by (#9504)
ysksn [Wed, 12 Dec 2018 04:54:09 +0000 (13:54 +0900)]
Use find_or_initialize_by (#9504)

7 years agoAdd admin ability to remove an user's header image (#9495)
ThibG [Tue, 11 Dec 2018 18:28:03 +0000 (19:28 +0100)]
Add admin ability to remove an user's header image (#9495)

* Fix markup in admin/accounts/:id table for avatar

* Add admin ability to remove an user's header image

7 years agoAdd instance-wide setting to disable profile directory (#9497)
ThibG [Tue, 11 Dec 2018 18:18:29 +0000 (19:18 +0100)]
Add instance-wide setting to disable profile directory (#9497)

* Add instance-wide setting to disable profile directory

Fixes #9496

When the profile directory is disabled:
- The “discoverable” setting is hidden from users
- The “profile directory” link is not shown on public pages
- /explore returns 404

* Move Setting.profile_directory check to a before_action filter

7 years agoBump letter_opener from 1.6.0 to 1.7.0 (#9493)
dependabot[bot] [Tue, 11 Dec 2018 05:34:02 +0000 (14:34 +0900)]
Bump letter_opener from 1.6.0 to 1.7.0 (#9493)

Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases)
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump json-ld-preloaded from 2.2.3 to 3.0.0 (#9416)
dependabot[bot] [Tue, 11 Dec 2018 04:40:01 +0000 (05:40 +0100)]
Bump json-ld-preloaded from 2.2.3 to 3.0.0 (#9416)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 2.2.3 to 3.0.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years ago[i18n] Update Occitan (#9491)
Yamagishi Kazutoshi [Tue, 11 Dec 2018 04:38:57 +0000 (13:38 +0900)]
[i18n] Update Occitan (#9491)

* Adds the Profil directory

* Adds the line about directory

* Harmonisation

* Update oc.yml

* i18n-tasks normalize && i18n-tasks remove-unused

* yarn manage:translations

7 years agoMake custom emoji domains case insensitive #9351 (#9474)
Adam Copp [Tue, 11 Dec 2018 04:30:57 +0000 (04:30 +0000)]
Make custom emoji domains case insensitive #9351 (#9474)

* Make custom emoji domains case sensitive #9351

* Fixup style in downcase_domain to comply with codeclimate.

* switch if! to unless

* Don't use transactions, operate in batches.

Also revert spurious schema change.

7 years agoImprove e-mail MX validator and add tests (#9489)
Eugen Rochko [Mon, 10 Dec 2018 21:53:25 +0000 (22:53 +0100)]
Improve e-mail MX validator and add tests (#9489)

7 years agoUse same CORS policy for /@:username and /users/:username (#9485)
ThibG [Mon, 10 Dec 2018 20:39:47 +0000 (21:39 +0100)]
Use same CORS policy for /@:username and /users/:username (#9485)

Fixes #8189

rack-cors being called before the application router, it does not follow
the redirection, and we need a separate rule for /users/:username.

7 years agoAdd specs for activitypub collections controller (#9484)
ysksn [Mon, 10 Dec 2018 20:39:25 +0000 (05:39 +0900)]
Add specs for activitypub collections controller (#9484)

* Add specs for ActivityPub::CollectionsController#show

* Raise ActiveRecord::RecordNotFound

Raising ActiveRecord::NotFound raises NameError: uninitialized constant
ActiveRecord::NotFound.

7 years agoAdd spec for Admin::SuspentionsController#new (#9483)
ysksn [Mon, 10 Dec 2018 20:38:21 +0000 (05:38 +0900)]
Add spec for Admin::SuspentionsController#new (#9483)

7 years agoRemove RemoteAccountControllerConcern never used (#9482)
ysksn [Mon, 10 Dec 2018 20:38:01 +0000 (05:38 +0900)]
Remove RemoteAccountControllerConcern never used (#9482)

7 years agoFix Admin::TagsController#unhide (#9481)
ysksn [Mon, 10 Dec 2018 20:37:38 +0000 (05:37 +0900)]
Fix Admin::TagsController#unhide (#9481)

7 years agoAdd specs for Admin::InvitesController (#9471)
ysksn [Sun, 9 Dec 2018 16:19:28 +0000 (01:19 +0900)]
Add specs for Admin::InvitesController (#9471)

7 years agoMerge pull request #849 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 9 Dec 2018 15:38:09 +0000 (16:38 +0100)]
Merge pull request #849 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoFix directory controller in glitch-soc
Thibaut Girka [Sun, 9 Dec 2018 13:19:58 +0000 (14:19 +0100)]
Fix directory controller in glitch-soc

7 years ago[Glitch] Fix various things in the directory
Thibaut Girka [Sun, 9 Dec 2018 12:34:13 +0000 (13:34 +0100)]
[Glitch] Fix various things in the directory

Port ecd303c097bf20aa971628ba8420a9f17f3dd1f7 to glitch-soc

7 years agoPort directory CSS changes from upstream
Thibaut Girka [Sun, 9 Dec 2018 12:33:00 +0000 (13:33 +0100)]
Port directory CSS changes from upstream

Port 73be8f38c115c279e3d3961b98bd2b82b9706b05 to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 9 Dec 2018 12:28:09 +0000 (13:28 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

7 years agoAdd setting to not aggregate reblogs (#9248)
ThibG [Sun, 9 Dec 2018 12:03:01 +0000 (13:03 +0100)]
Add setting to not aggregate reblogs (#9248)

* Add setting to not aggregate reblogs

Fixes #9222

* Handle cases where user is nil in add_to_home and add_to_list

* Add hint for setting_aggregate_reblogs option

* Reword setting_aggregate_reblogs label

7 years agoCache hashtag sample accounts, and exclude ineligible ones (#9465)
Eugen Rochko [Sat, 8 Dec 2018 00:32:26 +0000 (01:32 +0100)]
Cache hashtag sample accounts, and exclude ineligible ones (#9465)

7 years agoMake notification time smaller and reduce contrast (#9464)
Eugen Rochko [Fri, 7 Dec 2018 23:40:11 +0000 (00:40 +0100)]
Make notification time smaller and reduce contrast (#9464)

7 years agoi18n: Update Polish translation (#9459)
Marcin Mikołajczak [Fri, 7 Dec 2018 20:08:29 +0000 (21:08 +0100)]
i18n: Update Polish translation (#9459)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoRemove pending spec (#9453)
ysksn [Fri, 7 Dec 2018 15:53:55 +0000 (00:53 +0900)]
Remove pending spec (#9453)

7 years agoBump rubocop from 0.61.0 to 0.61.1 (#9451)
dependabot[bot] [Fri, 7 Dec 2018 15:42:50 +0000 (16:42 +0100)]
Bump rubocop from 0.61.0 to 0.61.1 (#9451)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.0 to 0.61.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.0...v0.61.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoEscape HTML in profile name preview in profile settings (#9446)
Paweł Ngei [Fri, 7 Dec 2018 15:42:22 +0000 (16:42 +0100)]
Escape HTML in profile name preview in profile settings (#9446)

* fix non-escaped html in the profile settings

* provide a default profile text in case if there's no custom one

* update haml syntax

* simplify default profile name to username

* sanitize user-input html but display emojified icons

7 years agoAdd specs for ActivityPub::InboxesController (#9456)
ysksn [Fri, 7 Dec 2018 15:40:01 +0000 (00:40 +0900)]
Add specs for ActivityPub::InboxesController (#9456)

7 years agoAdd specs for Admin::AccountModerationNotesHelper (#9455)
ysksn [Fri, 7 Dec 2018 15:39:20 +0000 (00:39 +0900)]
Add specs for Admin::AccountModerationNotesHelper (#9455)

7 years agoRemove pending spec (#9454)
ysksn [Fri, 7 Dec 2018 15:38:50 +0000 (00:38 +0900)]
Remove pending spec (#9454)

Since dots are not allowed in username,
this spec is no longer needed.

7 years agoAdd specs for AccountTagStat model (#9452)
ysksn [Fri, 7 Dec 2018 15:37:56 +0000 (00:37 +0900)]
Add specs for AccountTagStat model (#9452)

7 years agoFix various things in the directory (#9449)
Eugen Rochko [Fri, 7 Dec 2018 15:37:32 +0000 (16:37 +0100)]
Fix various things in the directory (#9449)

* Fix missing variable in directory page title

* Order hashtags by number of people instead of alphabetically

* Add icon to OpenGraph preview of directory page

* Prevent line breaks in hashtags and ensure lowercase in the table

7 years agoFix tag mb_chars comparison of profile directory (#9448)
Takeshi Umeda [Fri, 7 Dec 2018 03:18:37 +0000 (12:18 +0900)]
Fix tag mb_chars comparison of profile directory (#9448)

7 years agoMerge pull request #848 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 6 Dec 2018 16:40:43 +0000 (17:40 +0100)]
Merge pull request #848 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoAdd profile directory (#9427)
Eugen Rochko [Thu, 6 Dec 2018 16:36:11 +0000 (17:36 +0100)]
Add profile directory (#9427)

Fix #5578

7 years agoFix mention links in detailed statuses not opening in the WebUI
Thibaut Girka [Mon, 3 Dec 2018 15:16:05 +0000 (16:16 +0100)]
Fix mention links in detailed statuses not opening in the WebUI

7 years agoRevert "Add database statement timeout of 60s (#9382)"
Thibaut Girka [Thu, 6 Dec 2018 13:39:04 +0000 (14:39 +0100)]
Revert "Add database statement timeout of 60s (#9382)"

This reverts commit 58a29db99d410771f62ffb9e8c2ce95e1d3cb4ae.

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 6 Dec 2018 11:44:38 +0000 (12:44 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoRemove pending spec (#9442)
ysksn [Thu, 6 Dec 2018 08:39:15 +0000 (17:39 +0900)]
Remove pending spec (#9442)

`#from_account` isn't defined.

7 years agoAdd spec for Identity.find_for_oauth (#9441)
ysksn [Thu, 6 Dec 2018 08:38:49 +0000 (17:38 +0900)]
Add spec for Identity.find_for_oauth (#9441)

7 years agoBump rails from 5.2.1.1 to 5.2.2 (#9430)
dependabot[bot] [Thu, 6 Dec 2018 07:10:18 +0000 (16:10 +0900)]
Bump rails from 5.2.1.1 to 5.2.2 (#9430)

Bumps [rails](https://github.com/rails/rails) from 5.2.1.1 to 5.2.2.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump rails-controller-testing from 1.0.3 to 1.0.4 (#9440)
dependabot[bot] [Thu, 6 Dec 2018 07:09:13 +0000 (16:09 +0900)]
Bump rails-controller-testing from 1.0.3 to 1.0.4 (#9440)

Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump rubocop from 0.60.0 to 0.61.0 (#9439)
dependabot[bot] [Thu, 6 Dec 2018 07:08:54 +0000 (16:08 +0900)]
Bump rubocop from 0.60.0 to 0.61.0 (#9439)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.60.0 to 0.61.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.60.0...v0.61.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoAttempt fixing deadlocks by moving account stats update outside transaction (#9437)
ThibG [Wed, 5 Dec 2018 21:51:12 +0000 (22:51 +0100)]
Attempt fixing deadlocks by moving account stats update outside transaction (#9437)

* Use `update_column` instead of `update_attribute` in callback

`update_attribute` would normally cause callbacks to be called.
Called from a callback, it seems to stop further callbacks from executing.

`update_column` does the same work, but without calling callbacks or
preventing other callbacks from executing.

* Fix deadlocks by moving account stats update outside transaction

7 years agoAdd visible dates for notifications in Notification column (#9423)
Paweł Ngei [Wed, 5 Dec 2018 04:08:43 +0000 (05:08 +0100)]
Add visible dates for notifications in Notification column (#9423)

* add RelativeTimestamp elements

* style the elements properly with CSS

7 years agoFix thread depth computation in statuses_controller (#9426)
ThibG [Wed, 5 Dec 2018 01:12:29 +0000 (02:12 +0100)]
Fix thread depth computation in statuses_controller (#9426)

* Add test that should currently fail

* Fix depth computation (will still fail if statuses have been filtered out)

* Fix handling of broken threads

7 years agoBump capybara from 3.11.1 to 3.12.0 (#9388)
dependabot[bot] [Tue, 4 Dec 2018 00:27:17 +0000 (09:27 +0900)]
Bump capybara from 3.11.1 to 3.12.0 (#9388)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.1 to 3.12.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.11.1...3.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump rails-controller-testing from 1.0.2 to 1.0.3 (#9417)
dependabot[bot] [Tue, 4 Dec 2018 00:26:55 +0000 (09:26 +0900)]
Bump rails-controller-testing from 1.0.2 to 1.0.3 (#9417)

Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump pry-rails from 0.3.7 to 0.3.8 (#9418)
dependabot[bot] [Tue, 4 Dec 2018 00:26:40 +0000 (09:26 +0900)]
Bump pry-rails from 0.3.7 to 0.3.8 (#9418)

Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoAdd database statement timeout of 60s (#9382)
Eugen Rochko [Mon, 3 Dec 2018 00:32:27 +0000 (01:32 +0100)]
Add database statement timeout of 60s (#9382)

7 years agoImprove account suspension speed and completeness (#9290)
Eugen Rochko [Mon, 3 Dec 2018 00:32:08 +0000 (01:32 +0100)]
Improve account suspension speed and completeness (#9290)

- Some associations were missing from the clean-up
- Some attributes were not reset on suspension
- Skip federation and streaming deletes when purging a dead domain
- Move account association definitions to concern

7 years agoMerge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries
David Yip [Sun, 2 Dec 2018 22:30:52 +0000 (16:30 -0600)]
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries

Display a double reply arrow on public pages for toots that are replies

7 years agoMerge pull request #842 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 2 Dec 2018 19:42:10 +0000 (20:42 +0100)]
Merge pull request #842 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 2 Dec 2018 19:29:14 +0000 (20:29 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoBump version to 2.6.5 (#9413)
Eugen Rochko [Sun, 2 Dec 2018 16:41:38 +0000 (17:41 +0100)]
Bump version to 2.6.5 (#9413)

7 years agoPreload common JSON-LD contexts (#9412)
ThibG [Sun, 2 Dec 2018 15:46:13 +0000 (16:46 +0100)]
Preload common JSON-LD contexts (#9412)

Fixes #9411

7 years agoMerge pull request #840 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 2 Dec 2018 10:35:26 +0000 (11:35 +0100)]
Merge pull request #840 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 1 Dec 2018 20:00:16 +0000 (21:00 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoFix since_id
Thibaut Girka [Sat, 1 Dec 2018 16:54:12 +0000 (17:54 +0100)]
Fix since_id

7 years agoFix last_status parameter for notifications and conversations (#9407)
ThibG [Sat, 1 Dec 2018 17:36:41 +0000 (18:36 +0100)]
Fix last_status parameter for notifications and conversations (#9407)

7 years ago[i18n] update and corrections for Occitan locale (#9404)
Quentí [Sat, 1 Dec 2018 16:39:13 +0000 (17:39 +0100)]
[i18n] update and corrections for Occitan locale (#9404)

* Update + correction

Colomna and not columna
Pòt, verb missing

* Correction

D’aquí is followed by a time period, and dins by a season.
Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details.

* Correction admin zone

* Correction

Reïnicializacion, with the funny ï

7 years agoAdd a tooltip explaining what a locked account is (#9403)
Paweł Ngei [Sat, 1 Dec 2018 13:25:15 +0000 (14:25 +0100)]
Add a tooltip explaining what a locked account is (#9403)

* create a title tooltip explaining what a locked account is

* improve phrasing

* minor phrasing fix to unify default and english

7 years agoMerge pull request #837 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 30 Nov 2018 21:37:58 +0000 (22:37 +0100)]
Merge pull request #837 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoScroll to selected toot even if the ancestors happen to be loaded
Thibaut Girka [Fri, 30 Nov 2018 16:14:01 +0000 (17:14 +0100)]
Scroll to selected toot even if the ancestors happen to be loaded

7 years agoScroll to detailed status when new ancestors get inserted
Thibaut Girka [Fri, 30 Nov 2018 11:27:19 +0000 (12:27 +0100)]
Scroll to detailed status when new ancestors get inserted

7 years ago[Glitch] Fix bug in order of conversations in web UI
Thibaut Girka [Fri, 30 Nov 2018 11:24:58 +0000 (12:24 +0100)]
[Glitch] Fix bug in order of conversations in web UI

Port e18390cfe6f5f0eb55abafe072b14b7fa123e808 to glitch-soc

7 years ago[Glitch] Replace recursion in status mapStateToProps
Thibaut Girka [Fri, 30 Nov 2018 11:24:12 +0000 (12:24 +0100)]
[Glitch] Replace recursion in status mapStateToProps

Port dfbadd68374ab5ddcaa75907261bd91da688fc6b to glitch-soc

7 years ago[Glitch] Fix context building in the reducer
Thibaut Girka [Fri, 30 Nov 2018 11:23:07 +0000 (12:23 +0100)]
[Glitch] Fix context building in the reducer

Port 7706ed038f1a16d232635d564a28e6f90e53e0fd to glitch-soc

7 years ago[Glitch] Introduce flat layout to contexts reducer
Thibaut Girka [Fri, 30 Nov 2018 11:17:56 +0000 (12:17 +0100)]
[Glitch] Introduce flat layout to contexts reducer

Port 023fe5181b66ba2cbd20cca4e3bd34f132deba52 to glitch-soc

7 years agoDisplay a double reply arrow on public pages for toots that are replies
Thibaut Girka [Fri, 30 Nov 2018 21:09:52 +0000 (22:09 +0100)]
Display a double reply arrow on public pages for toots that are replies

This page took 0.11625 seconds and 4 git commands to generate.