]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years agoStore URIs of follows, follow requests and blocks for ActivityPub (#7160)
Eugen Rochko [Fri, 4 May 2018 19:14:34 +0000 (21:14 +0200)]
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)

Same URI passed between follow request and follow, since they are
the same thing in ActivityPub. Local URIs are generated during
creation using UUIDs and are passed to serializers.

7 years agoDo not render first page of following and followers collections unless explicitly...
ThibG [Fri, 4 May 2018 18:17:01 +0000 (20:17 +0200)]
Do not render first page of following and followers collections unless explicitly asked to (#7357)

7 years agoBetter pagination for ActivityPub outbox (#7356)
Eugen Rochko [Fri, 4 May 2018 17:19:11 +0000 (19:19 +0200)]
Better pagination for ActivityPub outbox (#7356)

7 years agoImprove “how to translate” (#7358)
Marcin Mikołajczak [Fri, 4 May 2018 16:37:37 +0000 (18:37 +0200)]
Improve “how to translate” (#7358)

7 years agoAdd translate guide to CONTRIBUTING.md (#7355)
Yamagishi Kazutoshi [Fri, 4 May 2018 16:01:12 +0000 (01:01 +0900)]
Add translate guide to CONTRIBUTING.md (#7355)

7 years agoShow remote reports in admin UI as coming from domain rather than user (#7347)
Eugen Rochko [Fri, 4 May 2018 11:26:25 +0000 (13:26 +0200)]
Show remote reports in admin UI as coming from domain rather than user (#7347)

Fix #6994

7 years agoMarginally improve convert/ffmpeg calls performance with posix-spawn (#7346)
Eugen Rochko [Fri, 4 May 2018 11:22:23 +0000 (13:22 +0200)]
Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346)

7 years agoFix 2fa description in Japanese (#7349)
Shuhei Kitagawa [Fri, 4 May 2018 04:58:08 +0000 (13:58 +0900)]
Fix 2fa description in Japanese (#7349)

7 years agoFixes/do not override timestamps (#7336)
ThibG [Thu, 3 May 2018 21:02:46 +0000 (23:02 +0200)]
Fixes/do not override timestamps (#7336)

* Revert "Fixes/do not override timestamps (#7331)"

This reverts commit 581a5c9d29ef2a12f46b67a1097a9ad6df1c6953.

* Document Snowflake ID corner-case a bit more

Snowflake IDs are used for two purposes: making object identifiers harder to
guess and ensuring they are in chronological order. For this reason, they
are based on the `created_at` attribute of the object.

Unfortunately, inserting items with older snowflakes IDs will break the
assumption of consumers of the paging APIs that new items will always have
a greater identifier than the last seen one.

* Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at

7 years agoDo not re-position scroll when loading more (inserting items from below) (#7344)
ThibG [Thu, 3 May 2018 20:32:05 +0000 (22:32 +0200)]
Do not re-position scroll when loading more (inserting items from below) (#7344)

7 years agoAdd a missing question mark in rack_attack.rb (#7338)
Akihiko Odaki [Thu, 3 May 2018 16:51:00 +0000 (01:51 +0900)]
Add a missing question mark in rack_attack.rb (#7338)

7 years agoThrottle media post (#7337)
Akihiko Odaki [Thu, 3 May 2018 15:32:00 +0000 (00:32 +0900)]
Throttle media post (#7337)

The previous rate limit allowed to post media so fast that it is possible
to fill up the disk space even before an administrator notices. The new
rate limit is configured so that it takes 24 hours to eat 10 gigabytes:
10 * 1024 / 8 / (24 * 60 / 30) = 27 (which rounded to 30)

The period is set long so that it does not prevent from attaching several
media to one post, which would happen in a short period. For example,
if the period is 5 minutes, the rate limit would be:
10 * 1024 / 8 / (24 * 60 / 5) = 4

This long period allows to lift the limit up.

7 years agoAdd el and te (#7332)
Yamagishi Kazutoshi [Thu, 3 May 2018 13:54:10 +0000 (22:54 +0900)]
Add el and te (#7332)

* Add el and te

* Add missing locale files

7 years agoDelete dump.rdb (#7334)
Yamagishi Kazutoshi [Thu, 3 May 2018 12:30:18 +0000 (21:30 +0900)]
Delete dump.rdb (#7334)

7 years agoFixes/do not override timestamps (#7331)
ThibG [Thu, 3 May 2018 11:33:08 +0000 (13:33 +0200)]
Fixes/do not override timestamps (#7331)

* Do not override timestamps for incoming toots

* Remove every reference to override_timestamps

Statuses are now created with the announced publishing date
and are only pushed to timelines if that date is at most
6 hours earlier than the time at which it is processed.

7 years agoRevert "Do not override timestamps for incoming toots" (#7330)
Eugen Rochko [Thu, 3 May 2018 10:32:33 +0000 (12:32 +0200)]
Revert "Do not override timestamps for incoming toots" (#7330)

* Revert "Weblate translations 20180503 (#7325)"

This reverts commit dfa6bccb64d9ee5512dddc10afd9a484db2dbb25.

* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)"

This reverts commit 58852695c8ec490239ed3812f82971f8c1e6c172.

* Revert "Add pry-byebug (#7307)"

This reverts commit ab773e4d5ffdd78a61d3ebf0f79e60ee5c9f7e92.

* Revert "Do not override timestamps for incoming toots (#7326)"

This reverts commit bd367918328daedb37f49727f4e16e33679fdb15.

7 years agoWeblate translations 20180503 (#7325)
Renato "Lond" Cerqueira [Thu, 3 May 2018 10:12:09 +0000 (12:12 +0200)]
Weblate translations 20180503 (#7325)

* Translated using Weblate (German)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 92.3% (578 of 626 strings)

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

* Added translation using Weblate (Greek)

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 100.0% (75 of 75 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 93.5% (58 of 62 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% (62 of 62 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% (62 of 62 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.6% (624 of 626 strings)

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

* Added translation using Weblate (Greek)

* Added translation using Weblate (Malay)

* Translated using Weblate (Greek)

Currently translated at 0.6% (2 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 1.3% (4 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 2.0% (6 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 2.3% (7 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 2.7% (8 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 3.0% (9 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 4.3% (27 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 4.7% (30 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 4.7% (30 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 5.1% (32 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 5.2% (33 of 626 strings)

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

* Translated using Weblate (Swedish)

Currently translated at 95.1% (59 of 62 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.3% (622 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 23.8% (70 of 294 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 94.0% (589 of 626 strings)

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

* Added translation using Weblate (Telugu)

* Translated using Weblate (German)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (German)

Currently translated at 98.3% (61 of 62 strings)

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

* Translated using Weblate (Telugu)

Currently translated at 0.3% (2 of 626 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (German)

Currently translated at 98.3% (62 of 62 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (75 of 75 strings)

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

* Translated using Weblate (German)

Currently translated at 99.5% (623 of 626 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 93.2% (584 of 626 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 93.2% (584 of 626 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 93.2% (584 of 626 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 93.2% (584 of 626 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 99.8% (625 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 95.0% (595 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.1% (71 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.1% (71 of 294 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (French)

Currently translated at 99.6% (624 of 626 strings)

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

* Translated using Weblate (Italian)

Currently translated at 54.6% (342 of 626 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (294 of 294 strings)

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

* 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 99.8% (625 of 626 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (German)

Currently translated at 99.6% (624 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Swedish)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Swedish)

Currently translated at 99.5% (623 of 626 strings)

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

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

* Add back file removed by weblate

7 years agoPrevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)
ThibG [Thu, 3 May 2018 10:09:11 +0000 (12:09 +0200)]
Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)

7 years agoAdd pry-byebug (#7307)
Shuhei Kitagawa [Thu, 3 May 2018 10:08:54 +0000 (19:08 +0900)]
Add pry-byebug (#7307)

7 years agoDo not override timestamps for incoming toots (#7326)
ThibG [Thu, 3 May 2018 09:42:52 +0000 (11:42 +0200)]
Do not override timestamps for incoming toots (#7326)

7 years agoAdd missing tests for report.rb (#7324)
Shuhei Kitagawa [Thu, 3 May 2018 08:42:36 +0000 (17:42 +0900)]
Add missing tests for report.rb (#7324)

7 years agoPlace emoji picker top if it is closer to the bottom of the viewport (fixes #7277...
ThibG [Thu, 3 May 2018 08:42:18 +0000 (10:42 +0200)]
Place emoji picker top if it is closer to the bottom of the viewport (fixes #7277) (#7314)

7 years agoFix n+1 queries in StatusThreadingConcern (#7321)
Eugen Rochko [Thu, 3 May 2018 08:41:58 +0000 (10:41 +0200)]
Fix n+1 queries in StatusThreadingConcern (#7321)

7 years agoFix cache_associated no longer working (#7320)
Eugen Rochko [Thu, 3 May 2018 08:41:41 +0000 (10:41 +0200)]
Fix cache_associated no longer working (#7320)

7 years agoSerialize webfinger XML with Ox instead of Nokogiri (#7319)
Eugen Rochko [Wed, 2 May 2018 20:28:46 +0000 (22:28 +0200)]
Serialize webfinger XML with Ox instead of Nokogiri (#7319)

25ms -> 0.5ms

7 years agoImprove PostStatusService performance (#7317)
Eugen Rochko [Wed, 2 May 2018 20:10:57 +0000 (22:10 +0200)]
Improve PostStatusService performance (#7317)

Offload creation of local notifications to a worker. Remove two
redundant SQL queries from ProcessMentionsService, remove n+1
XML/JSON serialization via memoization

7 years agoSlightly reduce RAM usage (#7301)
Eugen Rochko [Wed, 2 May 2018 16:58:48 +0000 (18:58 +0200)]
Slightly reduce RAM usage (#7301)

* No need to re-require sidekiq plugins, they are required via Gemfile

* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile

* Replace ruby-oembed with FetchOEmbedService

Reduce startup by 45382 allocated objects

* Remove preloaded JSON-LD in favour of caching HTTP responses

Reduce boot RAM by about 6 MiB

* Fix tests

* Fix test suite by stubbing out JSON-LD contexts

7 years agoKeep notification when muting_notifications is true (#7311)
abcang [Wed, 2 May 2018 14:14:51 +0000 (23:14 +0900)]
Keep notification when muting_notifications is true (#7311)

* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test

7 years agoAccept actor object updates from all supported actor types (#7312)
ThibG [Wed, 2 May 2018 14:08:16 +0000 (16:08 +0200)]
Accept actor object updates from all supported actor types (#7312)

7 years agoAllow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
Eugen Rochko [Wed, 2 May 2018 13:57:37 +0000 (15:57 +0200)]
Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)

Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials

7 years agoRemove most behaviour disparities between blocks and mutes (#7231)
Eugen Rochko [Wed, 2 May 2018 13:50:20 +0000 (15:50 +0200)]
Remove most behaviour disparities between blocks and mutes (#7231)

* Remove most behaviour disparities between blocks and mutes

The only differences between block and mute should be:

- Mutes can optionally NOT affect notifications
- Mutes should not be visible to the muted

Fix #7230
Fix #5713

* Do not allow boosting someone you blocked

Fix #7248

* Do not allow favouriting someone you blocked

* Fix nil error in StatusPolicy

7 years agoSpeed up test suite by not generating RSA keys in test environment (#7296)
Eugen Rochko [Wed, 2 May 2018 13:45:24 +0000 (15:45 +0200)]
Speed up test suite by not generating RSA keys in test environment (#7296)

One RSA keypair for all fabricated test accounts is enough

7 years agoGuard against nil URLs in Request class (#7284)
Eugen Rochko [Wed, 2 May 2018 13:44:22 +0000 (15:44 +0200)]
Guard against nil URLs in Request class (#7284)

Fix #7265

7 years agoAdd missing tests for user.rb (#7306)
Shuhei Kitagawa [Wed, 2 May 2018 12:13:52 +0000 (21:13 +0900)]
Add missing tests for user.rb (#7306)

7 years agoSupport Actors/Statuses with multiple types (#7305)
Surinna Curtis [Wed, 2 May 2018 10:40:24 +0000 (05:40 -0500)]
Support Actors/Statuses with multiple types (#7305)

* Add equals_or_includes_any? helper in JsonLdHelper

* Support arrays in JSON-LD type fields for actors/tags/objects.

* Spec for resolving accounts with extension types

* Style tweaks for codeclimate

7 years agoFix low-contrasted cancel button of reply indicator (#7300)
Lynx Kotoura [Tue, 1 May 2018 12:02:04 +0000 (21:02 +0900)]
Fix low-contrasted cancel button of reply indicator (#7300)

7 years agoFix missing updated_at attribute on emoji EntityCache (#7297)
Eugen Rochko [Mon, 30 Apr 2018 20:49:33 +0000 (22:49 +0200)]
Fix missing updated_at attribute on emoji EntityCache (#7297)

Just don't try to save space by only selecting few attributes. If
anyone is wondering, this is needed because the emoji entity cache
is not really only used for entities, it's accessed again to
generate Emoji tags in ActivityPub/OStatus, so a lot more properties
are used than what is needed in HTML alone...

7 years ago[i18n] Occitan update (#7294)
Yamagishi Kazutoshi [Mon, 30 Apr 2018 11:14:50 +0000 (20:14 +0900)]
[i18n] Occitan update (#7294)

* Translated new strings

+ few changes

* First update

* Almost complet

Missing the changes in the privacy policy

* Update simple_form.oc.yml

* bundle exec i18n-tasks normalize

* bundle exec i18n-tasks remove-unused

7 years agoDisable API access when login is disabled (#7289)
Eugen Rochko [Mon, 30 Apr 2018 07:13:14 +0000 (09:13 +0200)]
Disable API access when login is disabled (#7289)

7 years agoFix missing domain attribute in EntityCache for emoji (#7290)
Eugen Rochko [Mon, 30 Apr 2018 07:12:55 +0000 (09:12 +0200)]
Fix missing domain attribute in EntityCache for emoji (#7290)

7 years agoReturn HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)
Eugen Rochko [Mon, 30 Apr 2018 07:12:36 +0000 (09:12 +0200)]
Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)

Fix #7243

7 years agoFix "Show more" URL on paginated threads for remote statuses (#7285)
Eugen Rochko [Sun, 29 Apr 2018 23:59:42 +0000 (01:59 +0200)]
Fix "Show more" URL on paginated threads for remote statuses (#7285)

* Fix URL of "Show more" link in paginated threads (ancestors side)

Increase item limits in threads

Fix #7268

* Fix "Show more" link in paginated threads (descendants side)

7 years agoRemove unnecessary hyphen from restore_cache key (#7276)
Yamagishi Kazutoshi [Sat, 28 Apr 2018 09:20:30 +0000 (18:20 +0900)]
Remove unnecessary hyphen from restore_cache key (#7276)

7 years ago🌍: 🇵🇱⬆️ (#7275)
Marcin Mikołajczak [Fri, 27 Apr 2018 13:12:14 +0000 (15:12 +0200)]
🌍: 🇵🇱⬆️ (#7275)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoAdd entity cache (#7271)
Eugen Rochko [Thu, 26 Apr 2018 23:38:10 +0000 (01:38 +0200)]
Add entity cache (#7271)

* Add entity cache

Use a caching layer for mentions and custom emojis that are
dynamically extracted from text.

Reduce duplicate text extractions

* Fix code style issue

7 years agoAdd support for separate Redis for cache (#7272)
Eugen Rochko [Thu, 26 Apr 2018 23:37:59 +0000 (01:37 +0200)]
Add support for separate Redis for cache (#7272)

* Add support for separate Redis for cache

CACHE_REDIS_URL to allow using a different Redis server for cache
purposes, with cache-specific configuration such as key eviction

* Fix code style issues

7 years agoAdd Basque language support (#7267)
Yamagishi Kazutoshi [Thu, 26 Apr 2018 11:56:45 +0000 (20:56 +0900)]
Add Basque language support (#7267)

7 years agoWeblate translations 20180426 (#7266)
Renato "Lond" Cerqueira [Thu, 26 Apr 2018 09:58:22 +0000 (11:58 +0200)]
Weblate translations 20180426 (#7266)

* Translated using Weblate (Swedish)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 92.0% (576 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Swedish)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Swedish)

Currently translated at 99.6% (624 of 626 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.3% (622 of 626 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.2% (621 of 626 strings)

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

* Translated using Weblate (Basque)

Currently translated at 32.2% (20 of 62 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 99.6% (293 of 294 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 82.4% (516 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 92.1% (577 of 626 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 92.3% (578 of 626 strings)

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

* Translated using Weblate (Basque)

Currently translated at 100.0% (294 of 294 strings)

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

https://sustatu.eus/1380226549995

* Translated using Weblate (Catalan)

Currently translated at 100.0% (294 of 294 strings)

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

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

7 years agoBetter phrasing in swedish translation (#7263)
Stefan Midjich [Wed, 25 Apr 2018 22:36:52 +0000 (00:36 +0200)]
Better phrasing in swedish translation (#7263)

* more sane phrasing in 🇸🇪 translation

* another small issue in 🇸🇪 translation

* better phrasing in 🇸🇪 translation

7 years agoAppend '.test' to hostname in stub data (#7260)
MIYAGI Hikaru [Wed, 25 Apr 2018 12:12:28 +0000 (21:12 +0900)]
Append '.test' to hostname in stub data (#7260)

7 years agoHTTP proxy support for outgoing request, manage access to hidden service (#7134)
MIYAGI Hikaru [Wed, 25 Apr 2018 00:14:49 +0000 (09:14 +0900)]
HTTP proxy support for outgoing request, manage access to hidden service (#7134)

* Add support for HTTP client proxy

* Add access control for darknet

Supress error when access to darknet via transparent proxy

* Fix the codes pointed out

* Lint

* Fix an omission + lint

* any? -> include?

* Change detection method to regexp to avoid test fail

7 years agoAdd RSS feeds for end-users (#7259)
Eugen Rochko [Wed, 25 Apr 2018 00:10:02 +0000 (02:10 +0200)]
Add RSS feeds for end-users (#7259)

* Add RSS feed for accounts

* Add RSS feeds for hashtags

* Fix code style issues

* Fix code style issues

7 years agomore sane phrasing in 🇸🇪 translation (#7256)
Stefan Midjich [Tue, 24 Apr 2018 23:54:24 +0000 (01:54 +0200)]
more sane phrasing in 🇸🇪 translation (#7256)

* more sane phrasing in 🇸🇪 translation

* another small issue in 🇸🇪 translation

7 years agoWeblate translations (2018-04-24) (#7252)
Renato "Lond" Cerqueira [Tue, 24 Apr 2018 09:48:11 +0000 (11:48 +0200)]
Weblate translations (2018-04-24) (#7252)

* Translated using Weblate (Dutch)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.6% (287 of 288 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.5% (623 of 626 strings)

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

* Translated using Weblate (Galician)

Currently translated at 99.8% (625 of 626 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (French)

Currently translated at 99.6% (624 of 626 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.5% (631 of 634 strings)

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

* Translated using Weblate (Korean)

Currently translated at 99.8% (633 of 634 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (French)

Currently translated at 99.6% (632 of 634 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.6% (632 of 634 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (634 of 634 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (634 of 634 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/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Japanese)

Currently translated at 93.5% (58 of 62 strings)

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

* Added translation using Weblate (Basque)

* Added translation using Weblate (Basque)

* Translated using Weblate (Galician)

Currently translated at 100.0% (62 of 62 strings)

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

* Added translation using Weblate (Basque)

* Added translation using Weblate (Basque)

* Added translation using Weblate (Basque)

* Added translation using Weblate (Basque)

* Translated using Weblate (Galician)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Galician)

Currently translated at 99.8% (633 of 634 strings)

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

* Translated using Weblate (Basque)

Currently translated at 0.3% (1 of 288 strings)

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

* Translated using Weblate (Basque)

Currently translated at 50.0% (1 of 2 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/eu/

* Translated using Weblate (Basque)

Currently translated at 1.6% (1 of 62 strings)

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

* Translated using Weblate (Basque)

Currently translated at 1.3% (1 of 75 strings)

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

* Translated using Weblate (Basque)

Currently translated at 1.6% (1 of 62 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (634 of 634 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (634 of 634 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 93.5% (58 of 62 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 93.5% (58 of 62 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 99.6% (287 of 288 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 88.4% (561 of 634 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 90.3% (573 of 634 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (75 of 75 strings)

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

* Translated using Weblate (Italian)

Currently translated at 3.2% (2 of 62 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (288 of 288 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (75 of 75 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Italian)

Currently translated at 32.4% (206 of 634 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (62 of 62 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 81.3% (516 of 634 strings)

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

* Translated using Weblate (Italian)

Currently translated at 51.2% (325 of 634 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 91.6% (581 of 634 strings)

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

* Translated using Weblate (Italian)

Currently translated at 51.8% (329 of 634 strings)

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

* Normalize translations
Ran yarn build:development && i18n-tasks normalize && yarn manage:translations

* Remove unused translations
Ran i18n-tasks remove-unused

7 years agoFix ID duplication in timelines (#7251)
Akihiko Odaki [Tue, 24 Apr 2018 09:47:27 +0000 (18:47 +0900)]
Fix ID duplication in timelines (#7251)

7 years agoImplement the ability for instances to define a list of disallowed hashtags (#7176)
Emelia Smith [Mon, 23 Apr 2018 21:52:58 +0000 (23:52 +0200)]
Implement the ability for instances to define a list of disallowed hashtags (#7176)

The goal here isn't to prevent these hashtags from existing, but just to strongly curtail their usage; The hashtags may still exist in the database via federated status, or from being created prior to this feature.

7 years agoPrevent suspended accounts from appearing in AccountSearchService (#7246)
Emelia Smith [Mon, 23 Apr 2018 19:27:18 +0000 (21:27 +0200)]
Prevent suspended accounts from appearing in AccountSearchService (#7246)

7 years agoFix fullscreen video player (fixes #7244) (#7245)
ThibG [Mon, 23 Apr 2018 18:12:16 +0000 (20:12 +0200)]
Fix fullscreen video player (fixes #7244) (#7245)

7 years agoPaginate descendant statuses in public page (#7148)
Akihiko Odaki [Mon, 23 Apr 2018 17:27:35 +0000 (02:27 +0900)]
Paginate descendant statuses in public page (#7148)

7 years agotasks/mastodon: fix prompt for Redis password (#7241)
Alejandro Martinez Ruiz [Mon, 23 Apr 2018 14:03:58 +0000 (15:03 +0100)]
tasks/mastodon: fix prompt for Redis password (#7241)

7 years ago🌍: Make 🇵🇱 translation more consistent (#7239)
Marcin Mikołajczak [Mon, 23 Apr 2018 09:49:03 +0000 (11:49 +0200)]
🌍: Make 🇵🇱 translation more consistent (#7239)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoUpdate dependencies for Ruby (2018-04-23) (#7237)
Yamagishi Kazutoshi [Mon, 23 Apr 2018 09:29:17 +0000 (18:29 +0900)]
Update dependencies for Ruby (2018-04-23) (#7237)

* Update annotate to version 2.7.3

* Update aws-sdk-s3 to version 1.9.2

* Update browser to version 2.5.3

* Update capistrano to version 3.10.2

* Update domain_name to version 0.5.20180417

* Update http to version 3.2.0

* Update lograge to version 0.10.0

* Update oj to version 3.5.1

* Update parallel_tests to version 2.21.3

* Update puma to version 3.11.4

* Update rubocop to version 0.55.0

* Update scss_lint to version 0.57.0

* Update simplecov to version 0.16.1

* Update tty-command to version 0.8.0

* Update tty-prompt to version 0.16.0

* Update pkg-config to version 1.3.0

* Update fog-local to version 0.5.0

* Update fog-openstack to version 0.1.25

* Update devise-two-factor to version 3.0.3

* bundle update

7 years agoDetect and prevent image bombs, max. processable dimension 4096^2 (#7229)
Eugen Rochko [Mon, 23 Apr 2018 07:16:38 +0000 (09:16 +0200)]
Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)

7 years agoMove precompile step to build stage (#7235)
Yamagishi Kazutoshi [Mon, 23 Apr 2018 07:16:26 +0000 (16:16 +0900)]
Move precompile step to build stage (#7235)

7 years agoRefactor resizeImage method (#7236)
Yamagishi Kazutoshi [Mon, 23 Apr 2018 07:15:51 +0000 (16:15 +0900)]
Refactor resizeImage method (#7236)

- Use URL.createObjectURL (replace from FileReader)
- Use HTMLCanvasElement.prototype.toBlob
  (replace from HTMLCanvasElement.prototype.toDataURL)
- Use Promise (replace callback interface)

7 years agoImprove relative timestamps in web UI (#7233)
Eugen Rochko [Sun, 22 Apr 2018 22:43:53 +0000 (00:43 +0200)]
Improve relative timestamps in web UI (#7233)

Use short instead of numeric month, display year when different year

E.g.: "Apr 4" instead of "4/4", "Apr 4, 2017" if different year

7 years agoResize images before upload in web UI to reduce bandwidth (#7223)
Eugen Rochko [Sun, 22 Apr 2018 22:43:36 +0000 (00:43 +0200)]
Resize images before upload in web UI to reduce bandwidth (#7223)

* Resize images before upload in web UI to reduce bandwidth

Fix #7218

* Fix issues

* Do not resize GIFs in JS

7 years agoRemove "nsfw" category for sensitive statuses in OStatus serializer (#7048)
Eugen Rochko [Sun, 22 Apr 2018 20:09:03 +0000 (22:09 +0200)]
Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048)

Fix #7011

7 years agoRescue Mastodon::LengthValidationError in Remoteable (#7228)
Eugen Rochko [Sun, 22 Apr 2018 13:42:00 +0000 (15:42 +0200)]
Rescue Mastodon::LengthValidationError in Remoteable (#7228)

Fix #7198 by allowing records with optional attachments to save

7 years agoFix: Use "exportierten" instead of "exportieren" in translation (#7186)
jumoru [Sun, 22 Apr 2018 12:46:19 +0000 (14:46 +0200)]
Fix: Use "exportierten" instead of "exportieren" in translation (#7186)

Spotted when looking at https://metalhead.club/@thomas/99881521526619858

7 years agoFix text colors (#7227)
Lynx Kotoura [Sun, 22 Apr 2018 12:29:40 +0000 (21:29 +0900)]
Fix text colors (#7227)

7 years agoDo not set emoji as inline-block (fixes #5743) (#7207)
ThibG [Sun, 22 Apr 2018 10:10:37 +0000 (12:10 +0200)]
Do not set emoji as inline-block (fixes #5743) (#7207)

7 years agoAbility to specify Redis passwd on mastodon:setup (#7222)
David Baucum [Sun, 22 Apr 2018 09:49:16 +0000 (05:49 -0400)]
Ability to specify Redis passwd on mastodon:setup (#7222)

Closes #7221

7 years agoFix randomly fail (similar #7219) (#7225)
Yamagishi Kazutoshi [Sun, 22 Apr 2018 09:41:39 +0000 (18:41 +0900)]
Fix randomly fail (similar #7219) (#7225)

7 years agoFix: Use "welches" instead of "dass" in translation (#7185)
Matthias Beyer [Sun, 22 Apr 2018 03:28:12 +0000 (05:28 +0200)]
Fix: Use "welches" instead of "dass" in translation (#7185)

7 years agoReset locale on registration tests (#7219)
Yamagishi Kazutoshi [Sat, 21 Apr 2018 21:37:07 +0000 (06:37 +0900)]
Reset locale on registration tests (#7219)

7 years agoReplace badge to CircleCI (#7216)
Yamagishi Kazutoshi [Sat, 21 Apr 2018 19:56:40 +0000 (04:56 +0900)]
Replace badge to CircleCI (#7216)

7 years agoAdd parallel test processors (#7215)
Yamagishi Kazutoshi [Sat, 21 Apr 2018 19:36:22 +0000 (04:36 +0900)]
Add parallel test processors (#7215)

7 years agoSeparate high contrast theme (#7213)
Lynx Kotoura [Sat, 21 Apr 2018 19:35:55 +0000 (04:35 +0900)]
Separate high contrast theme (#7213)

7 years agoUse raw status code on have_http_status (#7214)
Yamagishi Kazutoshi [Sat, 21 Apr 2018 19:35:07 +0000 (04:35 +0900)]
Use raw status code on have_http_status (#7214)

7 years agoForce convert to JPG for preview card thumbnails to avoid animations (#7109)
Eugen Rochko [Sat, 21 Apr 2018 19:34:36 +0000 (21:34 +0200)]
Force convert to JPG for preview card thumbnails to avoid animations (#7109)

* Force convert to JPG for preview card thumbnails to avoid animations

Fix #7093

* Conditionally convert to JPG only if original is GIF
Coalesce and strip on all formats to ensure no animated APNGs

7 years agoone grammar fix (#7212)
goofy-bz [Sat, 21 Apr 2018 18:07:25 +0000 (20:07 +0200)]
one grammar fix (#7212)

7 years agoIntroduce rspec-retry (#7206)
Yamagishi Kazutoshi [Fri, 20 Apr 2018 17:31:30 +0000 (02:31 +0900)]
Introduce rspec-retry (#7206)

7 years agoIgnore keyevents during text composition (#7205)
unarist [Fri, 20 Apr 2018 16:36:52 +0000 (01:36 +0900)]
Ignore keyevents during text composition (#7205)

KeyboardEvent.key may be physical key name (Escape, Tab, etc.)
even in text composition and it causes hotkeys or suggestion selection.
So we need to check e.which or e.isComposing.

Checking e.which also allows us to avoid Esc key on compositionend in Safari.

7 years agoFix spec for sr-Latn (#7203)
Yamagishi Kazutoshi [Fri, 20 Apr 2018 16:14:31 +0000 (01:14 +0900)]
Fix spec for sr-Latn (#7203)

7 years agoFix the hot key (j, k) does not function correctly when there is a pinned toot in...
TakesxiSximada [Fri, 20 Apr 2018 16:14:21 +0000 (01:14 +0900)]
Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. (#7202)

* Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.

* Fix typo

* Add custom attribute prefix

7 years agoFix #6157: boosting own private toots (#7200)
mayaeh [Fri, 20 Apr 2018 12:58:33 +0000 (21:58 +0900)]
Fix #6157: boosting own private toots (#7200)

* Fix boosting own private toots.

* Run yarn manage:translations and update Japanese translations.

7 years agoFix Esc hotkey behavior (#7199)
unarist [Fri, 20 Apr 2018 12:04:16 +0000 (21:04 +0900)]
Fix Esc hotkey behavior (#7199)

This fixes following cases which causes hotkey action accidentally:

* hitting Esc key to cancel text composition (mostly in CJK)

  Although events on cancelling composition are still heavily
  browser / input method dependent, but this implementation would
  covers current UI Events spec and some exceptions.

* hitting Esc key to close autocomplete suggestions

This PR changes to use keydown event instead of keyup event as well as other hotkeys.

7 years agoReplace Travis to CircleCI (#7196)
Yamagishi Kazutoshi [Fri, 20 Apr 2018 11:46:08 +0000 (20:46 +0900)]
Replace Travis to CircleCI (#7196)

7 years agoAdd extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)
Yamagishi Kazutoshi [Fri, 20 Apr 2018 10:21:28 +0000 (19:21 +0900)]
Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)

7 years agoImprove report layout (#7188)
Eugen Rochko [Fri, 20 Apr 2018 00:28:48 +0000 (02:28 +0200)]
Improve report layout (#7188)

* Use table for statuses in report

* Display reported account and reporter in the same table

* Split accounts and general report info into two tables again

* Redesign report statuses table, notes, merge notes and action log

* Remove unused translations

* Fix code style issue

* Fix code style issue

* Fix code style issue

7 years agoReplace preload link tag to Rails helper (#7192)
Yamagishi Kazutoshi [Fri, 20 Apr 2018 00:06:53 +0000 (09:06 +0900)]
Replace preload link tag to Rails helper (#7192)

7 years agoFix webkit scrollbars (#7191)
beatrix [Thu, 19 Apr 2018 21:35:47 +0000 (17:35 -0400)]
Fix webkit scrollbars (#7191)

* Revert "Make scroll bars wider (#7060)"

This reverts commit 11715454d033784bf6176b75a954e5c28b5d79e5.

* for real make webkit scrollbar wider

7 years agoReports: Merge contents and comment columns (#7189)
Emelia Smith [Thu, 19 Apr 2018 13:39:54 +0000 (15:39 +0200)]
Reports: Merge contents and comment columns (#7189)

7 years agoFix text color in "show more" link inside boost confirmation modal (#7183)
Eugen Rochko [Thu, 19 Apr 2018 00:36:31 +0000 (02:36 +0200)]
Fix text color in "show more" link inside boost confirmation modal (#7183)

7 years agoRescue SSL errors when processing mentions, remove useless line (#7184)
Eugen Rochko [Wed, 18 Apr 2018 22:53:31 +0000 (00:53 +0200)]
Rescue SSL errors when processing mentions, remove useless line (#7184)

7 years agoi18n: Update Polish translation (#7181)
Marcin Mikołajczak [Wed, 18 Apr 2018 15:14:21 +0000 (17:14 +0200)]
i18n: Update Polish translation (#7181)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoAdd color variables of texts for better accesibility (#7125)
Lynx Kotoura [Wed, 18 Apr 2018 14:52:15 +0000 (23:52 +0900)]
Add color variables of texts for better accesibility (#7125)

* Add variables for text colors

* Change variables in sass files

* Apply text color variables for recently added colors

* Fix text colors of emoji mart anchors

* Fix text colors of search__input

* Fix text colors of text area of compose-form

* Fix icon colors of privacy dropdown and modal

* Inverted icon colors by classname

* Change variables in boost.scss

* Change action-button-color

* Fix text colors of pre-header

7 years agoFix comparing id (#7180)
abcang [Wed, 18 Apr 2018 14:50:19 +0000 (23:50 +0900)]
Fix comparing id (#7180)

7 years agoAdd revealing/hiding statuses button to keyboard shortcuts legend column (#7178)
Marcin Mikołajczak [Wed, 18 Apr 2018 11:15:57 +0000 (13:15 +0200)]
Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>