Thibaut Girka
d8c35a6b85
[Glitch] Add redraft function
...
Port 16173535d9
2018-06-16 15:09:28 +02:00
ThibG
079bc2906a
Merge pull request #544 from ThibG/glitch-soc/merge-upstream
...
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-16 15:08:52 +02:00
Thibaut Girka
31091836e9
[Glitch] Add vendor prefix for background-clip
...
Port 963b82f5e5
2018-06-15 22:14:48 +02:00
David Yip
c3202b66f2
Port bf508b9f74 to glitch emoji picker.
...
Fixes #541 .
2018-06-15 22:10:50 +02:00
Thibaut Girka
3d6c594903
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
f8bc071e03
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
d928aac40c
Fix regression where CW is focused on reply ( #7811 )
2018-06-15 19:49:32 +02:00
Eugen Rochko
9ed3212e35
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
907694df6a
Add autofollow option to invites ( #7805 )
...
* Add autofollow option to invites
* Trigger CodeClimate rebuild
2018-06-15 18:00:23 +02:00
Eugen Rochko
915f02ce8f
Fix vertical alignment of navigation bar ( #7807 )
2018-06-15 18:00:03 +02:00
Eugen Rochko
681ac8580a
Remove placeholder text for media-only toots ( #7806 )
...
Ref: 0c2a08adeb
2018-06-15 15:51:51 +02:00
Eugen Rochko
a21c8a2e0e
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
9c2fc4d684
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
6e961f0731
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-14 06:17:24 +00:00
Yamagishi Kazutoshi
1ffb500242
Hide status content when spoiler text is not empty ( #7797 )
2018-06-14 08:03:51 +02:00
Yamagishi Kazutoshi
70b5274caa
Fix "Invalid DOM property class" ( #7798 )
2018-06-14 08:03:07 +02:00
David Yip
206fcde962
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
223b854b3b
Add tests for following accounts controller ( #7800 )
2018-06-14 10:49:17 +09:00
Lain Iwakura
8a66ab68e8
Handle character limit in initial state in frontend.
2018-06-14 01:56:11 +02:00
chr v1.x
bc9d1ea0e3
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
31cf3094fd
Add tests for followers_accounts_controller ( #7794 )
2018-06-13 10:28:39 +09:00
David Yip
76f9fc26a8
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
4692eed7bd
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
2018-06-12 18:13:30 -05:00
David Yip
8d90aaa1e3
Merge pull request #539 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-12 18:12:29 -05:00
David Yip
a130fcf7a9
keyword mute: Add missing scope for regex escape test
2018-06-12 17:48:38 -05:00
David Yip
4cc75efb7b
Port emojimart 2.6.1 changes to glitch flavour
...
See also the following commits:
- ae0b751a302e4a1d3109
2018-06-12 17:43:50 -05:00
David Yip
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
David Yip
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
Jenkins
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
Shuhei Kitagawa
42ef87518d
Add missing tests for admin/accounts_controller ( #7791 )
2018-06-12 21:24:46 +09:00
Eugen Rochko
daf9bf9f12
Bump version to 2.4.1
2018-06-10 17:20:56 +02:00
Lynx Kotoura
cd1d25b9d0
Uniform media and video spoiler settings and fix them of the light theme ( #7778 )
2018-06-10 16:54:22 +02:00
Yamagishi Kazutoshi
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
kedama
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
Renato "Lond" Cerqueira
2e4a1d3109
Rename emoji sheet to avoid caching issue ( #7777 )
2018-06-10 16:12:47 +02:00
Eugen Rochko
e23ccfa059
Bump version to 2.4.1rc4
2018-06-10 00:39:56 +02:00
nightpool
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
Shuhei Kitagawa
d230066746
Add tests for intents_controller ( #7763 )
2018-06-09 22:47:50 +02:00
Eugen Rochko
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
Lynx Kotoura
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
Lynx Kotoura
2d2002436c
Adjust emoji-mart-anchor-bar for environments that use display scaling ( #7772 )
2018-06-09 22:20:57 +02:00
Eugen Rochko
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
Eugen Rochko
a26c884f25
Ensure emoji-mart dependency is updated ( #7771 )
...
Regression from bf508b9
2018-06-09 21:10:53 +02:00
David Yip
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
Thibaut Girka
5af047df32
Delete references to removed constants ( fixes #537 )
2018-06-09 18:14:23 +02:00
David Yip
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
SerCom_KC
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
Eugen Rochko
cbec0de81e
Migrate old web push subscriptions to ensure deliveries ( #7764 )
2018-06-09 13:33:04 +02:00
Renato "Lond" Cerqueira
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
David Yip
c114937660
Merge pull request #535 from glitch-soc/merge-upstream
...
Merge upstream
2018-06-08 00:33:09 -05:00
