bcf157a1a9
Avoid loading rails-ujs twice on vanilla flavour
2018-07-16 16:42:52 +02:00
f26f1145ac
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
955d5d36e8
Use LoadingBar instead of blur to indicate that an image is loading ( fixes #4060 ) ( #7562 )
2018-07-15 01:18:09 +02:00
d0d23b8f0a
Do not cause an error if domain_lists.blocks.next is undefined ( #8021 )
...
A valid URL is always truthy, so we can simplify this check
2018-07-14 23:28:29 +02:00
2a176514be
Display full acct on public status pages, always ( #8011 )
2018-07-14 04:07:47 +02:00
38e9662d78
Disable language detection for texts shorter than 140 characters ( #8010 )
...
If the input text is blank after preparation (only mention, or
only URL, or empty as in a media post), then use nil as language,
since it's OK to show to everyone.
Otherwise, always fall back to the server's default locale
2018-07-14 04:05:36 +02:00
e9b322d0a6
Upgrade webpack to version v4.x ( #6655 )
2018-07-14 03:56:41 +02:00
e709107463
Display Mastodon version in footer of web UI ( #8013 )
...
Fix #7846
2018-07-14 03:56:34 +02:00
9b75dee316
Weblate translations (2018-07-14) ( #8016 )
...
* Translated using Weblate (Slovak)
Currently translated at 97.7% (622 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* 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 (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* 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 (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 (Portuguese (Brazil))
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* 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/
Eine Option ist "nie", also muss es das Ablaufdatum sein, nicht das Datum bis wann es gültig ist
* Translated using Weblate (Japanese)
Currently translated at 99.6% (305 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* 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 (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 100.0% (80 of 80 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Slovak)
Currently translated at 98.7% (79 of 80 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.7% (622 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Danish)
Currently translated at 100.0% (80 of 80 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Galician)
Currently translated at 100.0% (643 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Japanese)
Currently translated at 93.9% (77 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.2% (638 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.3% (639 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Danish)
Currently translated at 77.2% (497 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Greek)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (643 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Slovak)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.0% (624 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Czech)
Currently translated at 5.2% (34 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* i18n-tasks normalize && yarn manage:translations
2018-07-14 10:54:11 +09:00
47c59591e0
Do not count self in potential friendships ( #8014 )
2018-07-14 10:44:23 +09:00
e55dce3176
Add federation relay support ( #7998 )
...
* Add federation relay support
* Add admin UI for managing relays
* Include actor on relay-related activities
* Fix i18n
2018-07-13 02:16:06 +02:00
ddfcedcfe4
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-12 19:26:20 +02:00
57f31b361f
Add an option restricting secondary toot privacy to that of the toot being replied to
2018-07-12 19:15:44 +02:00
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.
2018-07-12 17:58:26 +02:00
d8b13b46f7
Move privacyPreference to utils
2018-07-12 15:31:42 +02:00
cd05378b59
[Glitch] Refactor privacyPrefence() to use priority list
...
Port f2d9a3c239
2018-07-12 15:31:42 +02:00
d67cb13d84
Use options rather than a boolean
...
This prepares for a third option that would restrict privacy to
privacyPreference(replyPrivacy, sideArmBasePrivacy)
2018-07-12 11:22:34 +02:00
8c8707771d
Do not store duplicate reply_privacy
2018-07-12 11:22:34 +02:00
6f06d16b1e
add option to enable auto visibility on secondary toot button
2018-07-12 11:22:34 +02:00
7cb7ecaf7e
[Glitch] Make whole-word filter regex consistent between Ruby and JS
...
Port front-end part of 20fefdb714
2018-07-11 22:06:34 +02:00
debc6544d9
[Glitch] Add follow button to detailed status, add gradient to mask bio cut-off ( fixes #566 )
...
Port 30e1da7668
2018-07-11 22:05:15 +02:00
6f0f583abe
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-11 17:57:08 +02:00
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
2018-07-11 01:14:38 +02:00
bfce6a5485
Add link to filters in web UI dropdown ( #7990 )
2018-07-11 00:56:54 +02:00
612b00d1bb
Display reply indicator even when replying to contentless toot ( fixes #564 )
2018-07-10 22:53:04 +02:00
ef1d660596
make sure reblogged's filter is set correctly
2018-07-10 14:06:04 +02:00
faa4db7975
[Glitch] Add option to not consider word boundaries when processing keyword filtering
...
Port 1ca4e51eb3
2018-07-10 14:06:04 +02:00
6777dfc8d9
[Glitch] In keyword filter, account for reblogs, HTML and whole-words
...
Port 404c7702ec
2018-07-10 14:06:04 +02:00
00c1386b9d
[Glitch] Fix filters not affecting notifications in web UI
...
Port cfeb3beb4e
2018-07-10 14:06:04 +02:00
0bb1720495
Add client-side custom filter support to glitch-soc
...
Port cdb101340a
2018-07-10 14:06:04 +02:00
33c1607c83
[Glitch] Fix Chrome issue with sizes="0px"
2018-07-10 10:53:36 +02:00
e96a4434c7
add keybind in composer textarea for secondary submit
2018-07-10 10:53:22 +02:00
20fefdb714
Make whole-word filter regex consistent between Ruby and JS ( #7987 )
2018-07-10 03:01:50 +02:00
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.
2018-07-09 19:19:23 +02:00
ee41947e9d
Set appropriate assets pack for the keyword filter page
2018-07-09 19:19:23 +02:00
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.
2018-07-09 07:13:59 +02:00
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
2018-07-09 02:22:09 +02:00
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
2018-07-07 22:20:14 +02:00
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.
2018-07-07 21:09:54 +02:00
cfeb3beb4e
Fix filters not affecting notifications in web UI ( #7977 )
...
* Hook up filtering to statuses in notifications column
* Filter notifications for sound, desktop notifications
2018-07-07 19:31:19 +02:00
c699b2d141
Remove duplicate code for handling muted users
...
The mute check was indeed streamlined in f62539ce5c
2018-07-07 19:10:13 +02:00
cd509d2146
Remove .p-name microformat class ( #7961 )
...
Fix #7926
2018-07-07 18:51:56 +02:00
9804ec3a6d
Fix missing irreversible in filters API, expires_in param ( #7976 )
2018-07-07 18:51:45 +02:00
c930b61770
Revert "Fix dark background error on user-mention autosuggest ( #7937 )" ( #7964 )
...
This reverts commit 7da74e3157
2018-07-06 13:19:18 +02:00
617f40fc2b
Fix gradient, regression from #7927 ( #7963 )
2018-07-06 13:16:31 +02:00
f89c595ea0
Add admin setting to enable OG previews for sensitive media ( #7962 )
2018-07-06 02:15:56 +02:00
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
2018-07-06 02:15:44 +02:00
8461cd4bb5
Send undo of boost to original poster if reblog ( #7959 )
...
Fix #7874
2018-07-05 20:57:50 +02:00
baff4a7ce0
If signed in, redirect autofollow invite to profile page ( #7956 )
...
Fix #7944
2018-07-05 20:57:35 +02:00
32a4b524fb
In e-mail validator, fallback from MX to A record ( #7955 )
...
Fix #7831
2018-07-05 20:57:24 +02:00
Thibaut Girka