ddfcedcfe4
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
57f31b361f
Add an option restricting secondary toot privacy to that of the toot being replied to
6 years ago
401559c376
Fix whole-word selection and i18n: Add Japanese translation for Whole-word ( #8004 )
* Add Japanese translation for "Whole word" and add it's description.
* Fix to enable "Whole-word" selection.
6 years ago
d8b13b46f7
Move privacyPreference to utils
6 years ago
cd05378b59
[Glitch] Refactor privacyPrefence() to use priority list
Port f2d9a3c239
6 years ago
d67cb13d84
Use options rather than a boolean
This prepares for a third option that would restrict privacy to
privacyPreference(replyPrivacy, sideArmBasePrivacy)
6 years ago
8c8707771d
Do not store duplicate reply_privacy
6 years ago
6f06d16b1e
add option to enable auto visibility on secondary toot button
6 years ago
7cb7ecaf7e
[Glitch] Make whole-word filter regex consistent between Ruby and JS
Port front-end part of 20fefdb714
6 years ago
debc6544d9
[Glitch] Add follow button to detailed status, add gradient to mask bio cut-off ( fixes #566 )
Port 30e1da7668
6 years ago
017628fd00
Merge pull request #567 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
6 years ago
6f0f583abe
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7ac5151b74
Bump version to 2.4.3
6 years ago
d1a6b144ef
Add missing Korean translation ( #7993 )
* Add missing Korean translation
* Remove deleted strings
6 years ago
89dc0c98ee
Bump version to 2.4.3rc3
6 years ago
ffd444d221
Weblate translations (2018-07-11) ( #7992 )
* Translated using Weblate (German)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Galician)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Italian)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Danish)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (French)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Greek)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Danish)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Slovenian)
Currently translated at 41.9% (26 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sl/
* Translated using Weblate (Danish)
Currently translated at 70.9% (450 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (634 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (German)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (German)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 99.6% (632 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (636 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Danish)
Currently translated at 65.3% (64 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Japanese)
Currently translated at 95.9% (94 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/
* Translated using Weblate (Greek)
Currently translated at 74.4% (73 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (French)
Currently translated at 93.8% (92 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (Danish)
Currently translated at 67.3% (66 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (636 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/oc/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (635 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 98.7% (77 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Danish)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Persian)
Currently translated at 99.6% (634 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Added translation using Weblate (Czech)
* Added translation using Weblate (Czech)
* Added translation using Weblate (Czech)
* Added translation using Weblate (Czech)
* Added translation using Weblate (Czech)
* Added translation using Weblate (Czech)
* Translated using Weblate (Czech)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/
* Translated using Weblate (Czech)
Currently translated at 8.0% (5 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Czech)
Currently translated at 0.9% (3 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 1.0% (1 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Czech)
Currently translated at 1.2% (1 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Korean)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Slovak)
Currently translated at 80.6% (79 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Arabic)
Currently translated at 98.9% (97 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/
* Translated using Weblate (Danish)
Currently translated at 70.9% (44 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/
* Translated using Weblate (Danish)
Currently translated at 72.0% (458 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Danish)
Currently translated at 91.8% (90 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Italian)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 98.9% (97 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/
* Translated using Weblate (Czech)
Currently translated at 5.1% (4 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 5.3% (34 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Japanese)
Currently translated at 93.5% (73 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 96.9% (95 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/
* Translated using Weblate (Danish)
Currently translated at 75.1% (478 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (French)
Currently translated at 96.9% (95 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (636 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (304 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (635 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Slovak)
Currently translated at 97.4% (620 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 93.8% (92 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Japanese)
Currently translated at 93.5% (73 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Danish)
Currently translated at 75.1% (478 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (305 of 305 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% (635 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Slovak)
Currently translated at 97.6% (621 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 98.9% (97 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Greek)
Currently translated at 99.5% (633 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (305 of 305 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* i18n-tasks normalize && yarn manage:translations
6 years ago
bfce6a5485
Add link to filters in web UI dropdown ( #7990 )
6 years ago
612b00d1bb
Display reply indicator even when replying to contentless toot ( fixes #564 )
6 years ago
ef1d660596
make sure reblogged's filter is set correctly
6 years ago
faa4db7975
[Glitch] Add option to not consider word boundaries when processing keyword filtering
Port 1ca4e51eb3
6 years ago
6777dfc8d9
[Glitch] In keyword filter, account for reblogs, HTML and whole-words
Port 404c7702ec
6 years ago
00c1386b9d
[Glitch] Fix filters not affecting notifications in web UI
Port cfeb3beb4e
6 years ago
0bb1720495
Add client-side custom filter support to glitch-soc
Port cdb101340a
6 years ago
33c1607c83
[Glitch] Fix Chrome issue with sizes="0px"
6 years ago
e96a4434c7
add keybind in composer textarea for secondary submit
6 years ago
e6647ccf6d
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
Merge upstream changes
6 years ago
20fefdb714
Make whole-word filter regex consistent between Ruby and JS ( #7987 )
6 years ago
402da8065c
Migrate glitch-soc keyword mutes to Mastodon's
Completely remove glitch-soc's Keyword Mutes, migrate
existing database records to CustomFilters.
Handling of client-side filters is still not implemented
in the glitch-soc front-end.
6 years ago
ee41947e9d
Set appropriate assets pack for the keyword filter page
6 years ago
7a7d8c335e
Re-install test/dev dependencies before running tests
before_script used to trigger “yarn install --no-progress --production”,
which would uninstall dependencies required to run the tests.
Until railties is fixed or we move to Circle CI, work around that
issue by re-installing dev dependencies.
6 years ago
d392020da6
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
README.md
app/controllers/statuses_controller.rb
app/lib/feed_manager.rb
config/navigation.rb
spec/lib/feed_manager_spec.rb
Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
6 years ago
1ca4e51eb3
Add option to not consider word boundaries when processing keyword filtering ( #7975 )
* Add option to not consider word boundaries when filtering phrases
* Add a few tests for keyword/phrase filtering
6 years ago
451e585b97
Bump version to 2.4.3rc2
6 years ago
30e1da7668
Add follow button to detailed status, add gradient to mask bio cut-off ( #7979 )
* Add follow button to detailed status, add gradient to mask bio cut-off
* In landing strip, show sign up link even if closed (different href)
Point to joinmastodon.org
6 years ago
6b9e03e002
Add API method to remove a suggestion ( #7978 )
DELETE /api/v1/suggestions/:account_id
When blocking, remove suggestion from both sides. Muting not affected,
since muting is supposed to be invisible to the target.
6 years ago
ef2bcf51d7
Fix french translation of “Keyword or phrase” ( #7980 )
6 years ago
cfeb3beb4e
Fix filters not affecting notifications in web UI ( #7977 )
* Hook up filtering to statuses in notifications column
* Filter notifications for sound, desktop notifications
6 years ago
c699b2d141
Remove duplicate code for handling muted users
The mute check was indeed streamlined in f62539ce5c
6 years ago
cd509d2146
Remove .p-name microformat class ( #7961 )
Fix #7926
6 years ago
9804ec3a6d
Fix missing irreversible in filters API, expires_in param ( #7976 )
6 years ago
c24d62220d
i18n: Update Polish translation ( #7968 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
c930b61770
Revert "Fix dark background error on user-mention autosuggest ( #7937 )" ( #7964 )
This reverts commit 7da74e3157
6 years ago
617f40fc2b
Fix gradient, regression from #7927 ( #7963 )
6 years ago
f89c595ea0
Add admin setting to enable OG previews for sensitive media ( #7962 )
6 years ago
404c7702ec
In keyword filter, account for reblogs, HTML and whole-words ( #7960 )
* In keyword filter, account for reblogs, HTML and whole-words
* Match whole words in JS filter, too
* Fix typo
6 years ago
17b928502a
update twemojie to v2 ( #7911 )
6 years ago
cb36ab9a10
Bump version to 2.4.3rc1
6 years ago
78f036b7d2
Remove reference to BTC, update video link
6 years ago
8461cd4bb5
Send undo of boost to original poster if reblog ( #7959 )
Fix #7874
6 years ago
baff4a7ce0
If signed in, redirect autofollow invite to profile page ( #7956 )
Fix #7944
6 years ago
Thibaut Girka
mayaeh
Ash Levy
Eugen Rochko
Jeong Arm
Marcin Mikołajczak
Lynx Kotoura
Dryusdan