5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
2018-06-12 18:13:30 -05:00
f6bb50b6ec
Merge pull request #539 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-12 18:12:29 -05:00
99b2bc2668
keyword mute: Add missing scope for regex escape test
2018-06-12 17:48:38 -05:00
fac6e392e9
Port emojimart 2.6.1 changes to glitch flavour
...
See also the following commits:
- 0c3ce41031268d90e810
2018-06-12 17:43:50 -05:00
908a770d2b
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
e931cf656d
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
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
6151308c47
Add missing tests for admin/accounts_controller ( #7791 )
2018-06-12 21:24:46 +09:00
0979d4275a
Bump version to 2.4.1
2018-06-10 17:20:56 +02:00
7e27a3c225
Uniform media and video spoiler settings and fix them of the light theme ( #7778 )
2018-06-10 16:54:22 +02:00
01ee460ceb
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
a99179d31f
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
268d90e810
Rename emoji sheet to avoid caching issue ( #7777 )
2018-06-10 16:12:47 +02:00
35ae960122
Bump version to 2.4.1rc4
2018-06-10 00:39:56 +02:00
6310dd233a
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
7086aa598b
Add tests for intents_controller ( #7763 )
2018-06-09 22:47:50 +02:00
10f51c9886
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
91e5d9f8af
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
3df8c40508
Adjust emoji-mart-anchor-bar for environments that use display scaling ( #7772 )
2018-06-09 22:20:57 +02:00
17dc07f667
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
a043f8d277
Ensure emoji-mart dependency is updated ( #7771 )
...
Regression from 85470ec
2018-06-09 21:10:53 +02:00
34f1fd2a62
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
7d3c0e4cb4
Delete references to removed constants ( fixes #537 )
2018-06-09 18:14:23 +02:00
f9eb4ea80a
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
fc132915ec
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
18e1de6a16
Migrate old web push subscriptions to ensure deliveries ( #7764 )
2018-06-09 13:33:04 +02:00
85470ec872
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
a9515f3186
Merge pull request #535 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-08 00:33:09 -05:00
6671297e7a
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
6ba7d9d0d9
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
9b9e96eae5
Add "Edit profile" link to public profile page, increase bottom padding ( #7754 )
2018-06-07 22:40:55 +02:00
0c3ce41031
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
8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
5bf5003384
2018-06-07 05:13:49 -05:00
f8d50a4070
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
2304d52599
🌍 🇵🇱 ( #7753 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-07 13:37:43 +09:00
158cd7ee74
Bump version to 2.4.1rc3
2018-06-06 21:27:06 +02:00
59b42188a7
Filter out blocked/muted people from profile timelines ( #7747 )
...
Fix #7741
2018-06-06 21:13:30 +02:00
683707839f
Fix fetch of remote image with multiple Content-Type headers ( #7749 )
2018-06-06 20:50:07 +02:00
c75493755f
Preserve newlines in delete & redraft and desktop notifications ( #7750 )
...
Fix #7748
2018-06-06 20:49:53 +02:00
b7b331ad0d
Add missing dot for remote image ( #7751 )
2018-06-06 20:49:39 +02:00
68373e799b
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
12fa2500c4
Add missing tests for sessions controller ( #7744 )
2018-06-06 10:23:22 +09:00
d8b4f39007
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
aa177bdca7
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
fab65fb7e5
Bump version to 2.4.1rc2
2018-06-05 11:53:30 +00:00
a640c322c1
Escape metacharacters in non-whole-word keyword mutes. Fixes #533 .
...
Also addresses #463 .
2018-06-05 02:49:28 -05:00
bd0791d800
Add redraft function ( #7735 )
...
* Add redraft function
Fix #7010
* Add explicit confirmation
* Add explicit confirmation message
2018-06-05 00:17:38 +02:00
f009fef40b
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
5fb013878f
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
dc73241bd9
Detect extname from Content-Type ( #7733 )
2018-06-04 18:58:36 +02:00
David Yip
Jenkins
Shuhei Kitagawa
Eugen Rochko
Lynx Kotoura
Yamagishi Kazutoshi
kedama
Renato "Lond" Cerqueira
nightpool
Thibaut Girka
SerCom_KC
Marcin Mikołajczak