afceef74c2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
f972815f1b
Hide status content when spoiler text is not empty ( #7797 )
6 years ago
79a468016a
Fix "Invalid DOM property `class`" ( #7798 )
6 years ago
9d2b7ef9f8
Merge pull request #540 from lanodan/glitch-soc-pr/charLimit
Put maxChars back in compose.js
6 years ago
ad8814232f
Add tests for following accounts controller ( #7800 )
6 years ago
6bae583d2f
Handle character limit in initial state in frontend.
6 years ago
0338da1699
Add profile options on compose form ( #7789 )
* Add profile options on compose form
* Remove unused imports to appease codeclimate
* Play nicely with cancel button and use ellipsis-v instead of hamburger
* Fix whitespace and quotes to appease codeclimate
6 years ago
5b47774ab8
Add tests for followers_accounts_controller ( #7794 )
6 years ago
f1bfcb50f0
Merge pull request #531 from glitch-soc/454-allow-keyword-mutes-to-skip-mentions
Allow keyword mutes to skip mentions (#454 )
6 years ago
5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
6 years ago
f6bb50b6ec
Merge pull request #539 from glitch-soc/merge-upstream
Merge upstream
6 years ago
99b2bc2668
keyword mute: Add missing scope for regex escape test
6 years ago
fac6e392e9
Port emojimart 2.6.1 changes to glitch flavour
See also the following commits:
- 0c3ce41031268d90e810
6 years ago
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.
6 years ago
e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
Conflicts:
app/models/glitch/keyword_mute.rb
6 years ago
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
6151308c47
Add missing tests for admin/accounts_controller ( #7791 )
6 years ago
0979d4275a
Bump version to 2.4.1
6 years ago
7e27a3c225
Uniform media and video spoiler settings and fix them of the light theme ( #7778 )
6 years ago
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
6 years ago
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.
6 years ago
268d90e810
Rename emoji sheet to avoid caching issue ( #7777 )
6 years ago
35ae960122
Bump version to 2.4.1rc4
6 years ago
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
6 years ago
7086aa598b
Add tests for intents_controller ( #7763 )
6 years ago
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
6 years ago
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
6 years ago
3df8c40508
Adjust emoji-mart-anchor-bar for environments that use display scaling ( #7772 )
6 years ago
17dc07f667
Fix has_one association on Web::PushSubscription ( #7767 )
* Fix has_one association on Web::PushSubscription
* Fix code style issues
6 years ago
a043f8d277
Ensure emoji-mart dependency is updated ( #7771 )
Regression from 85470ec
6 years ago
34f1fd2a62
Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants
Delete references to removed constants (fixes #537 )
6 years ago
7d3c0e4cb4
Delete references to removed constants ( fixes #537 )
6 years ago
f9eb4ea80a
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
Hardcode default skin/theme in error layout (fixes #373 )
6 years ago
fc132915ec
Update Chinese (Simplified) translations ( #7769 )
* i18n: (zh-CN) #7718
* i18n: (zh-CN) #7735
* i18n: (zh-CN) #7676
6 years ago
18e1de6a16
Migrate old web push subscriptions to ensure deliveries ( #7764 )
6 years ago
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
6 years ago
a9515f3186
Merge pull request #535 from glitch-soc/merge-upstream
Merge upstream
6 years ago
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
6 years ago
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
6 years ago
9b9e96eae5
Add "Edit profile" link to public profile page, increase bottom padding ( #7754 )
6 years ago
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
6 years ago
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
6 years ago
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 )
6 years ago
2304d52599
🌍 🇵🇱 ( #7753 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
158cd7ee74
Bump version to 2.4.1rc3
6 years ago
59b42188a7
Filter out blocked/muted people from profile timelines ( #7747 )
Fix #7741
6 years ago
683707839f
Fix fetch of remote image with multiple Content-Type headers ( #7749 )
6 years ago
c75493755f
Preserve newlines in delete & redraft and desktop notifications ( #7750 )
Fix #7748
6 years ago
b7b331ad0d
Add missing dot for remote image ( #7751 )
6 years ago
68373e799b
Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists
Escape metacharacters in non-whole-word keyword mutes (#463 , #533 )
6 years ago
Jenkins
Yamagishi Kazutoshi
David Yip
Shuhei Kitagawa
Lain Iwakura
chr v1.x
Eugen Rochko
Lynx Kotoura
kedama
Renato "Lond" Cerqueira
nightpool
Thibaut Girka
SerCom_KC
Marcin Mikołajczak