4cc75efb7b
Port emojimart 2.6.1 changes to glitch flavour
...
See also the following commits:
- ae0b751a302e4a1d3109
2018-06-12 17:43:50 -05:00
b8205550dd
keyword mute: use mentions scope in home feed filtering ( #454 )
...
If a status shows up in mentions because all keyword mutes that might
apply to it are marked as "don't apply to mentions", then it ought to
show up in the home feed also.
2018-06-12 17:14:35 -05:00
f9c8642a11
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
2018-06-12 16:39:30 -05:00
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
42ef87518d
Add missing tests for admin/accounts_controller ( #7791 )
2018-06-12 21:24:46 +09:00
daf9bf9f12
Bump version to 2.4.1
2018-06-10 17:20:56 +02:00
cd1d25b9d0
Uniform media and video spoiler settings and fix them of the light theme ( #7778 )
2018-06-10 16:54:22 +02:00
51c639980c
Weblate translations (2018-06-10) ( #7779 )
...
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Persian)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (303 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (French)
Currently translated at 99.6% (303 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Slovak)
Currently translated at 95.4% (593 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Persian)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 66.3% (412 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Korean)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Slovak)
Currently translated at 95.9% (596 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused
2018-06-10 16:53:49 +02:00
101f5544e1
Control the focus when clicking the "CW" button. ( #7776 )
...
* Focus to the spoiler text when CW turns on.
* Focus back to the textarea when CW turns off.
2018-06-10 16:13:30 +02:00
2e4a1d3109
Rename emoji sheet to avoid caching issue ( #7777 )
2018-06-10 16:12:47 +02:00
e23ccfa059
Bump version to 2.4.1rc4
2018-06-10 00:39:56 +02:00
896589e034
Migration to cleanup blocked users that are still following ( #7773 )
...
* Migration to cleanup blocked users that are still following
* use follow directly, commit schema
2018-06-10 00:38:17 +02:00
d230066746
Add tests for intents_controller ( #7763 )
2018-06-09 22:47:50 +02:00
b051d74029
Fix domain hiding logic ( #7765 )
...
* Send rejections to followers when user hides domain they're on
* Use account domain blocks for "authorized followers" action
Replace soft-blocking (block & unblock) behaviour with follow rejection
* Split sync and async work of account domain blocking
Do not create domain block when removing followers by domain, that
is probably unexpected from the user's perspective.
* Adjust confirmation message for domain block
* yarn manage:translations
2018-06-09 22:46:54 +02:00
d997fb520a
Fix background color of emoji-mart-bar in light theme ( #7768 )
...
* Fix background color of emoji-mart-bar
* Uniform emoji-mart-search background color in light theme as default
2018-06-09 22:21:37 +02:00
2d2002436c
Adjust emoji-mart-anchor-bar for environments that use display scaling ( #7772 )
2018-06-09 22:20:57 +02:00
39930a8432
Fix has_one association on Web::PushSubscription ( #7767 )
...
* Fix has_one association on Web::PushSubscription
* Fix code style issues
2018-06-09 21:11:14 +02:00
a26c884f25
Ensure emoji-mart dependency is updated ( #7771 )
...
Regression from bf508b9
2018-06-09 21:10:53 +02:00
bcc27d9234
Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants
...
Delete references to removed constants (fixes #537 )
2018-06-09 11:42:56 -05:00
5af047df32
Delete references to removed constants ( fixes #537 )
2018-06-09 18:14:23 +02:00
34ac79cb68
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
...
Hardcode default skin/theme in error layout (fixes #373 )
2018-06-09 10:39:55 -05:00
77c94ffe82
Update Chinese (Simplified) translations ( #7769 )
...
* i18n: (zh-CN) #7718
* i18n: (zh-CN) #7735
* i18n: (zh-CN) #7676
2018-06-09 17:07:23 +02:00
cbec0de81e
Migrate old web push subscriptions to ensure deliveries ( #7764 )
2018-06-09 13:33:04 +02:00
bf508b9f74
Fix issues with updated emoji mart ( #7761 )
...
* Changes behavior from search light to keep custom search
The new version of emoji-mart needs the search function to constantly
receive the custom emoji array. This changes the behavior back to the
previous one in the search light method to keep the emoji autocomplete
as before
* Change test order
The order was breaking the tests
* Fix codeclimate issues
* Update to emoji mart to version without issue in picker
Fixes #7760
2018-06-08 13:28:04 +02:00
c114937660
Merge pull request #535 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-08 00:33:09 -05:00
3e2eddaba7
Weblate translations (2018-06-08) ( #7759 )
...
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Persian)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (303 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (French)
Currently translated at 99.6% (303 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Slovak)
Currently translated at 95.4% (593 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Persian)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 66.3% (412 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (304 of 304 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused
2018-06-08 04:50:52 +02:00
5aa5b86bf1
Do not accept ActivityPub follow requests from blocked user ( #7756 )
...
* Do not accept ActivityPub follow requests from blocked user
Fix #7745
* Deliver auto-rejection immediately when follow-requested by blocked account
* Fix trailing whitespace
2018-06-08 00:14:06 +02:00
e1054a747e
Add "Edit profile" link to public profile page, increase bottom padding ( #7754 )
2018-06-07 22:40:55 +02:00
ae0b751a30
Update to emojimart 2.6.1 ( #7746 )
...
* Update to emojimart 2.6.1
WIP using local updated version. Sheet comes from emoji-data@4.0.4,
file sheet_twitter_32_indexed_256.png.
* Update to 2.6.1 and uncompress data if needed
* Remove changes that were not needed
* Fix yarn lock file
* Match emojiToShowFilter behavior to new version of emoji-mart
* Fix codeclimate issue
* Match custom emoji behavior to new version of emoji-mart
* Replace emoji without shortcode in tests
* Fix code climate issues
2018-06-07 19:40:23 +02:00
c2f7676dfc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
3114ac9655
2018-06-07 05:13:49 -05:00
4b7ceed3f0
Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation
...
Use history.state to decide whether we should goBack() or go to / (fixes #247 )
2018-06-06 23:56:48 -05:00
a5e289e273
🌍 🇵🇱 ( #7753 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-07 13:37:43 +09:00
e28866b313
Bump version to 2.4.1rc3
2018-06-06 21:27:06 +02:00
ecec45ff9b
Filter out blocked/muted people from profile timelines ( #7747 )
...
Fix #7741
2018-06-06 21:13:30 +02:00
29f4196d87
Fix fetch of remote image with multiple Content-Type headers ( #7749 )
2018-06-06 20:50:07 +02:00
5d419119de
Preserve newlines in delete & redraft and desktop notifications ( #7750 )
...
Fix #7748
2018-06-06 20:49:53 +02:00
7ed181c41c
Add missing dot for remote image ( #7751 )
2018-06-06 20:49:39 +02:00
63a5f8a4e4
Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists
...
Escape metacharacters in non-whole-word keyword mutes (#463 , #533 )
2018-06-05 21:38:04 -05:00
f0022a4ddc
Add missing tests for sessions controller ( #7744 )
2018-06-06 10:23:22 +09:00
19b653991d
Weblate translations 20180605 ( #7743 )
...
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Slovak)
Currently translated at 95.4% (593 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Basque)
Currently translated at 100.0% (303 of 303 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
2018-06-05 20:28:29 +02:00
94077935ac
Add missing locale strings ( #7742 )
...
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
2018-06-06 03:11:03 +09:00
36528f28a5
Bump version to 2.4.1rc2
2018-06-05 11:53:30 +00:00
9f9aa39eb5
Escape metacharacters in non-whole-word keyword mutes. Fixes #533 .
...
Also addresses #463 .
2018-06-05 02:49:28 -05:00
16173535d9
Add redraft function ( #7735 )
...
* Add redraft function
Fix #7010
* Add explicit confirmation
* Add explicit confirmation message
2018-06-05 00:17:38 +02:00
3413105ec7
Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists
...
keyword mute: Store keywords in a list, not a regex
2018-06-04 15:58:23 -05:00
0378f74430
Fix context performance by partially reverting #7083 ( #7734 )
...
* Fix context performance by partially reverting #7083
* Fix code style issue
* fix off-by-1 error in thread limits
* code style fix
2018-06-04 22:20:12 +02:00
a936ccd126
Detect extname from Content-Type ( #7733 )
2018-06-04 18:58:36 +02:00
a78445e117
fix RuboCop error ( #7442 )
...
* fix RuboCop error
RuboCop doesn't work by following error.
```
$ rubocop
Error: The `Style/TrailingCommaInLiteral` cop no longer exists. Please use `Style/TrailingCommaInArrayLiteral` and/or `Style/TrailingCommaInHashLiteral` instead.
(obsolete configuration found in .rubocop.yml, please update it)
```
it comes from RuboCop 0.53.0 [\[Fix #3394\] Separate Array & Hash Literal Comma configuration by garettarrowood · Pull Request #5307 · bbatsov/rubocop](https://github.com/bbatsov/rubocop/pull/5307 )
* ci(CodeClimate): specify RuboCop version 0.54
* https://docs.codeclimate.com/docs/rubocop#section-using-rubocop-s-newer-versions
* [RuboCop 0.55.0 is not available yet](https://github.com/codeclimate/codeclimate-rubocop/issues/121 ) on CodeClimate rubocop channel
2018-06-04 14:49:10 +02:00
1a145c6af1
Skip processing when HEAD method returns 501 ( #7730 )
2018-06-04 13:42:53 +02:00
963b82f5e5
Add vendor prefix for background-clip ( #7727 )
2018-06-04 13:24:20 +02:00
David Yip