d8c35a6b85
[Glitch] Add redraft function
...
Port 16173535d9
7 years ago
079bc2906a
Merge pull request #544 from ThibG/glitch-soc/merge-upstream
...
Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
31091836e9
[Glitch] Add vendor prefix for background-clip
...
Port 963b82f5e5
7 years ago
c3202b66f2
Port bf508b9f74 to glitch emoji picker.
...
Fixes #541 .
7 years ago
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…
7 years ago
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
7 years ago
d928aac40c
Fix regression where CW is focused on reply ( #7811 )
7 years ago
9ed3212e35
Remove rack-timeout ( #7809 )
...
Timeout considered harmful due to leaving the app in a broken
state, including unreaped database connections
7 years ago
907694df6a
Add autofollow option to invites ( #7805 )
...
* Add autofollow option to invites
* Trigger CodeClimate rebuild
7 years ago
915f02ce8f
Fix vertical alignment of navigation bar ( #7807 )
7 years ago
681ac8580a
Remove placeholder text for media-only toots ( #7806 )
...
Ref: 0c2a08adeb
7 years ago
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)
7 years ago
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
7 years ago
6e961f0731
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1ffb500242
Hide status content when spoiler text is not empty ( #7797 )
7 years ago
70b5274caa
Fix "Invalid DOM property `class`" ( #7798 )
7 years ago
206fcde962
Merge pull request #540 from lanodan/glitch-soc-pr/charLimit
...
Put maxChars back in compose.js
7 years ago
223b854b3b
Add tests for following accounts controller ( #7800 )
7 years ago
8a66ab68e8
Handle character limit in initial state in frontend.
7 years ago
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
7 years ago
31cf3094fd
Add tests for followers_accounts_controller ( #7794 )
7 years ago
76f9fc26a8
Merge pull request #531 from glitch-soc/454-allow-keyword-mutes-to-skip-mentions
...
Allow keyword mutes to skip mentions (#454 )
7 years ago
4692eed7bd
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
8d90aaa1e3
Merge pull request #539 from glitch-soc/merge-upstream
...
Merge upstream
7 years ago
a130fcf7a9
keyword mute: Add missing scope for regex escape test
7 years ago
4cc75efb7b
Port emojimart 2.6.1 changes to glitch flavour
...
See also the following commits:
- ae0b751a302e4a1d3109
7 years ago
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.
7 years ago
f9c8642a11
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
7 years ago
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
42ef87518d
Add missing tests for admin/accounts_controller ( #7791 )
7 years ago
daf9bf9f12
Bump version to 2.4.1
7 years ago
cd1d25b9d0
Uniform media and video spoiler settings and fix them of the light theme ( #7778 )
7 years ago
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
7 years ago
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.
7 years ago
2e4a1d3109
Rename emoji sheet to avoid caching issue ( #7777 )
7 years ago
e23ccfa059
Bump version to 2.4.1rc4
7 years ago
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
7 years ago
d230066746
Add tests for intents_controller ( #7763 )
7 years ago
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
7 years ago
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
7 years ago
2d2002436c
Adjust emoji-mart-anchor-bar for environments that use display scaling ( #7772 )
7 years ago
39930a8432
Fix has_one association on Web::PushSubscription ( #7767 )
...
* Fix has_one association on Web::PushSubscription
* Fix code style issues
7 years ago
a26c884f25
Ensure emoji-mart dependency is updated ( #7771 )
...
Regression from bf508b9
7 years ago
bcc27d9234
Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants
...
Delete references to removed constants (fixes #537 )
7 years ago
5af047df32
Delete references to removed constants ( fixes #537 )
7 years ago
34ac79cb68
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
...
Hardcode default skin/theme in error layout (fixes #373 )
7 years ago
77c94ffe82
Update Chinese (Simplified) translations ( #7769 )
...
* i18n: (zh-CN) #7718
* i18n: (zh-CN) #7735
* i18n: (zh-CN) #7676
7 years ago
cbec0de81e
Migrate old web push subscriptions to ensure deliveries ( #7764 )
7 years ago
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
7 years ago
c114937660
Merge pull request #535 from glitch-soc/merge-upstream
...
Merge upstream
7 years ago
Thibaut Girka
David Yip
Eugen Rochko
chr v1.x
Jenkins
Yamagishi Kazutoshi
Shuhei Kitagawa
Lain Iwakura
Lynx Kotoura
kedama
Renato "Lond" Cerqueira
nightpool
SerCom_KC