Masoud Abkenar
97b2ba4240
Update fa.json ( #7814 )
...
somehow weblate cannot transfer translation of these two words to here
2018-06-16 10:05:45 +09:00
Thibaut Girka
e8ccac468a
[Glitch] Add vendor prefix for background-clip
...
Port e0354aba7c
2018-06-15 22:14:48 +02:00
David Yip
8cafeedc25
Port 85470ec872 to glitch emoji picker.
...
Fixes #541 .
2018-06-15 22:10:50 +02:00
Thibaut Girka
db200226b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/mastodon/initial_state.js
db/schema.rb
Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
2018-06-15 20:51:39 +02:00
Eugen Rochko
3b8023f9f9
Bump version to 2.4.2rc1
2018-06-15 20:38:41 +02:00
Eugen Rochko
0df91c7b1e
Add dat, dweb, ipfs, ipns, ssb, gopher protocols to URL extractor ( #7810 )
...
* Add dat:// and gopher:// to URL extractor
Fix #6072
* Fix comment indent
* Add dweb, ipfs, ipns, ssb
2018-06-15 20:21:47 +02:00
Eugen Rochko
09147186b7
Fix regression where CW is focused on reply ( #7811 )
2018-06-15 19:49:32 +02:00
Eugen Rochko
53f0452b70
Remove rack-timeout ( #7809 )
...
Timeout considered harmful due to leaving the app in a broken
state, including unreaped database connections
2018-06-15 19:46:25 +02:00
Eugen Rochko
ca85658975
Add autofollow option to invites ( #7805 )
...
* Add autofollow option to invites
* Trigger CodeClimate rebuild
2018-06-15 18:00:23 +02:00
Eugen Rochko
33dd9bf36d
Fix vertical alignment of navigation bar ( #7807 )
2018-06-15 18:00:03 +02:00
Eugen Rochko
c3b3594305
Remove placeholder text for media-only toots ( #7806 )
...
Ref: cfa9b6e13a
2018-06-15 15:51:51 +02:00
Eugen Rochko
1cc775200e
Add "find friends", "invite people", and more to getting started footer ( #7803 )
...
- Find friends from Twitter (bridge)
- Invite people (when invites enabled)
- Security (change e-mail/password)
- Developers (create OAuth apps/tokens)
2018-06-15 15:51:37 +02:00
chr v1.x
4f42238c29
Put "Media Only" option in column settings instead of content area headline ( #7801 )
...
* Action/reducer for changing column settings takes a path and a value
instead of a javascript object
* Settings menu version and column headline version working simultaneously
* remove column headline entirely
* remove css for headlines that aren't possible now
* Remove commented out code from unfruitful attempt at this feature
* Give direct timeline its own column settings bc it doesn't have a media only option
* Fix typo in public timeline code that was preventing per-column settings from working properly
* Fix codeclimate issues
* Missing semicolons
* Use redux state to set onlyMedia, let that do the update instead of a callback. Consequently, unpinned setting works without history modification
* Unused import
2018-06-15 11:15:15 +02:00
Jenkins
afceef74c2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-14 06:17:24 +00:00
Yamagishi Kazutoshi
f972815f1b
Hide status content when spoiler text is not empty ( #7797 )
2018-06-14 08:03:51 +02:00
Yamagishi Kazutoshi
79a468016a
Fix "Invalid DOM property class" ( #7798 )
2018-06-14 08:03:07 +02:00
David Yip
9d2b7ef9f8
Merge pull request #540 from lanodan/glitch-soc-pr/charLimit
...
Put maxChars back in compose.js
2018-06-13 22:46:31 -05:00
Shuhei Kitagawa
ad8814232f
Add tests for following accounts controller ( #7800 )
2018-06-14 10:49:17 +09:00
Lain Iwakura
6bae583d2f
Handle character limit in initial state in frontend.
2018-06-14 01:56:11 +02:00
chr v1.x
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
2018-06-13 14:44:50 +02:00
Shuhei Kitagawa
5b47774ab8
Add tests for followers_accounts_controller ( #7794 )
2018-06-13 10:28:39 +09:00
David Yip
f1bfcb50f0
Merge pull request #531 from glitch-soc/454-allow-keyword-mutes-to-skip-mentions
...
Allow keyword mutes to skip mentions (#454 )
2018-06-12 19:28:08 -05:00
David Yip
5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
2018-06-12 18:13:30 -05:00
David Yip
f6bb50b6ec
Merge pull request #539 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-12 18:12:29 -05:00
David Yip
99b2bc2668
keyword mute: Add missing scope for regex escape test
2018-06-12 17:48:38 -05:00
David Yip
fac6e392e9
Port emojimart 2.6.1 changes to glitch flavour
...
See also the following commits:
- 0c3ce41031268d90e810
2018-06-12 17:43:50 -05:00
David Yip
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
David Yip
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
Jenkins
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
Shuhei Kitagawa
6151308c47
Add missing tests for admin/accounts_controller ( #7791 )
2018-06-12 21:24:46 +09:00
Eugen Rochko
0979d4275a
Bump version to 2.4.1
2018-06-10 17:20:56 +02:00
Lynx Kotoura
7e27a3c225
Uniform media and video spoiler settings and fix them of the light theme ( #7778 )
2018-06-10 16:54:22 +02:00
Yamagishi Kazutoshi
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
kedama
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
Renato "Lond" Cerqueira
268d90e810
Rename emoji sheet to avoid caching issue ( #7777 )
2018-06-10 16:12:47 +02:00
Eugen Rochko
35ae960122
Bump version to 2.4.1rc4
2018-06-10 00:39:56 +02:00
nightpool
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
Shuhei Kitagawa
7086aa598b
Add tests for intents_controller ( #7763 )
2018-06-09 22:47:50 +02:00
Eugen Rochko
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
Lynx Kotoura
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
Lynx Kotoura
3df8c40508
Adjust emoji-mart-anchor-bar for environments that use display scaling ( #7772 )
2018-06-09 22:20:57 +02:00
Eugen Rochko
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
Eugen Rochko
a043f8d277
Ensure emoji-mart dependency is updated ( #7771 )
...
Regression from 85470ec
2018-06-09 21:10:53 +02:00
David Yip
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
Thibaut Girka
7d3c0e4cb4
Delete references to removed constants ( fixes #537 )
2018-06-09 18:14:23 +02:00
David Yip
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
SerCom_KC
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
Eugen Rochko
18e1de6a16
Migrate old web push subscriptions to ensure deliveries ( #7764 )
2018-06-09 13:33:04 +02:00
Renato "Lond" Cerqueira
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
David Yip
a9515f3186
Merge pull request #535 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-08 00:33:09 -05:00
