tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
7,964 Commits 20 Branches 113 Tags 222 MiB
0d3612482e
Commit Graph

2641 Commits

Author SHA1 Message Date
Eugen Rochko
f59b840549
Fix empty display name precedence over username in web UI (#9163) 
Fix #9131
 2018-10-30 17:06:12 +01:00
Quentí
a3d40ba53b [i18n] Update for Occitan (#9157) 
* Update oc.json

* Update devise.oc.yml

* Update oc.yml

* Update oc.json
 2018-10-30 15:05:01 +01:00
Masoud Abkenar
3aa2418217 [Glitch] RTL: fix toot privacy preferences radio buttonss 
Port e961a763a2 to glitch-soc
 2018-10-30 11:24:40 +01:00
Masoud Abkenar
e32a4f55fe [Glitch] RTL: fix preferences page checkbox margins 
Port 5ee0b51ac8 to glitch-soc
 2018-10-30 11:24:19 +01:00
Thibaut Girka
94ad76a5b9 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 11:22:25 +01:00
trwnh
2cc099c70f Make detailed-status__wrapper actually wrap detailed status (#8547) 
* Remove class from scrollable div

.detailed-status__wrapper does not actually wrap the detailed status here

* Re-add class to focusable div

.detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area
 2018-10-30 06:33:02 +01:00
Masoud Abkenar
e961a763a2 RTL: fix toot privacy preferences radio buttonss (#9146) 2018-10-30 00:49:29 +01:00
Masoud Abkenar
5ee0b51ac8 RTL: fix preferences page checkbox margins (#9145) 
* RTL: fix preferences page checkbox margins

* Update rtl.scss
 2018-10-30 00:47:43 +01:00
Thibaut Girka
a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
 2018-10-29 14:00:41 +01:00
Renato "Lond" Cerqueira
9d84d55cf0 Weblate translations (2018-10-26) (#9113) 
* Translated using Weblate (French)

Currently translated at 99.7% (699 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Italian)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/

* Translated using Weblate (Italian)

Currently translated at 90.7% (636 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Italian)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Japanese)

Currently translated at 95.7% (89 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.4% (697 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Greek)

Currently translated at 99.6% (698 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Basque)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/

* Translated using Weblate (Basque)

Currently translated at 100.0% (701 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/

* Translated using Weblate (Korean)

Currently translated at 100.0% (701 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (701 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Translated using Weblate (French)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Spanish)

Currently translated at 98.7% (692 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Dutch)

Currently translated at 89.2% (83 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 97.4% (683 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Occitan)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/

* Translated using Weblate (Occitan)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* Translated using Weblate (Occitan)

Currently translated at 99.7% (699 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (German)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/

* Translated using Weblate (German)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (German)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (German)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/

* Translated using Weblate (Arabic)

Currently translated at 97.0% (680 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 99.7% (337 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Czech)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Serbian)

Currently translated at 89.2% (83 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (701 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Czech)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Corsican)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/

* Translated using Weblate (French)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Galician)

Currently translated at 100,0% (701 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Welsh)

Currently translated at 99.4% (336 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Welsh)

Currently translated at 81.7% (76 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (338 of 338 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% (93 of 93 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% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/

* Translated using Weblate (Welsh)

Currently translated at 94.4% (662 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 97.8% (91 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/

* Translated using Weblate (Corsican)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/

* Translated using Weblate (Welsh)

Currently translated at 96.9% (95 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/

* Translated using Weblate (Catalan)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Catalan)

Currently translated at 100,0% (701 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Welsh)

Currently translated at 99.4% (336 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Occitan)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Persian)

Currently translated at 99.7% (699 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Arabic)

Currently translated at 97.6% (684 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (English)

Currently translated at 99.7% (699 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/

* Translated using Weblate (Galician)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Persian)

Currently translated at 99.6% (698 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (English)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (701 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Occitan)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Welsh)

Currently translated at 99.4% (336 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/

* Translated using Weblate (Welsh)

Currently translated at 99.0% (97 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (98 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (98 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (2 of 2 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (98 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/

* Translated using Weblate (Welsh)

Currently translated at 94.7% (664 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Persian)

Currently translated at 99.7% (699 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Persian)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Czech)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Welsh)

Currently translated at 94.7% (664 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Czech)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Spanish)

Currently translated at 99.9% (700 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 85.4% (599 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 93.3% (654 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/

* Translated using Weblate (Finnish)

Currently translated at 61.3% (57 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/

* Translated using Weblate (Hebrew)

Currently translated at 57.0% (53 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/

* Translated using Weblate (French)

Currently translated at 100,0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Bulgarian)

Currently translated at 14,8% (104 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/

* Translated using Weblate (Asturian)

Currently translated at 31,2% (219 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 85,2% (597 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/

* Translated using Weblate (Croatian)

Currently translated at 15,0% (105 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hr/

* Translated using Weblate (Georgian)

Currently translated at 94,3% (661 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/

* Translated using Weblate (Hebrew)

Currently translated at 43,1% (302 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/

* Translated using Weblate (Ido)

Currently translated at 30,0% (210 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/

* Translated using Weblate (Hungarian)

Currently translated at 74,3% (521 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/

* Translated using Weblate (Indonesian)

Currently translated at 32,7% (229 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/

* Translated using Weblate (Polish)

Currently translated at 98,1% (688 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/

* Translated using Weblate (Romanian)

Currently translated at 0,0% (0 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/

* Translated using Weblate (Russian)

Currently translated at 96,0% (673 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/

* Translated using Weblate (Serbian (latin))

Currently translated at 69,6% (488 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/

* Translated using Weblate (Thai)

Currently translated at 32,7% (229 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/th/

* Translated using Weblate (Turkish)

Currently translated at 32,5% (228 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 96,7% (327 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/

* Translated using Weblate (Ukrainian)

Currently translated at 89,9% (630 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/

* Translated using Weblate (Ido)

Currently translated at 38,7% (36 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/io/

* Translated using Weblate (Turkish)

Currently translated at 95,9% (324 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/

* Translated using Weblate (Portuguese)

Currently translated at 57,0% (53 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/

* Translated using Weblate (Indonesian)

Currently translated at 37,6% (35 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/id/

* Translated using Weblate (Norwegian (old code))

Currently translated at 57,0% (53 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/

* Translated using Weblate (Serbian (latin))

Currently translated at 58,1% (54 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr_Latn/

* Translated using Weblate (Ukrainian)

Currently translated at 39,8% (37 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/

* Translated using Weblate (Thai)

Currently translated at 43,0% (40 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/th/

* Translated using Weblate (Turkish)

Currently translated at 38,7% (36 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/tr/

* Translated using Weblate (Finnish)

Currently translated at 84.0% (589 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/

* Translated using Weblate (Polish)

Currently translated at 98.1% (688 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/

* Translated using Weblate (Italian)

Currently translated at 93.6% (656 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Serbian (latin))

Currently translated at 68.2% (478 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/

* Translated using Weblate (Slovenian)

Currently translated at 12.8% (90 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/

* Translated using Weblate (Armenian)

Currently translated at 71.0% (240 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hy/

* Translated using Weblate (Asturian)

Currently translated at 99.1% (335 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/

* Translated using Weblate (French)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Indonesian)

Currently translated at 97.0% (328 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/

* Translated using Weblate (Ido)

Currently translated at 94.1% (318 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/io/

* Translated using Weblate (Finnish)

Currently translated at 86.1% (291 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/

* Translated using Weblate (Romanian)

Currently translated at 99.7% (337 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/

* Translated using Weblate (Russian)

Currently translated at 96.4% (326 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/

* Translated using Weblate (Polish)

Currently translated at 99.1% (335 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/

* Translated using Weblate (Serbian (latin))

Currently translated at 72.2% (244 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr_Latn/

* Translated using Weblate (Slovenian)

Currently translated at 88.8% (300 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* Translated using Weblate (Ido)

Currently translated at 66.1% (41 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/io/

* Translated using Weblate (Asturian)

Currently translated at 46.2% (43 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/

* Translated using Weblate (Bulgarian)

Currently translated at 34.4% (32 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/bg/

* Translated using Weblate (Croatian)

Currently translated at 34.4% (32 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hr/

* Translated using Weblate (Slovenian)

Currently translated at 7.5% (7 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 69.9% (65 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hans/

* Translated using Weblate (Italian)

Currently translated at 94.4% (662 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Greek)

Currently translated at 89.1% (301 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Indonesian)

Currently translated at 31.4% (220 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/

* Translated using Weblate (Bulgarian)

Currently translated at 22.5% (76 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/bg/

* Translated using Weblate (Croatian)

Currently translated at 48.8% (165 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hr/

* Translated using Weblate (Hebrew)

Currently translated at 69.2% (234 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/

* Translated using Weblate (Hungarian)

Currently translated at 70.7% (239 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/

* Translated using Weblate (Tamil)

Currently translated at 69.5% (235 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ta/

* Translated using Weblate (Thai)

Currently translated at 65.1% (220 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 87.3% (295 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/

* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused

* Translated using Weblate (Danish)

Currently translated at 98,5% (333 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (Bulgarian)

Currently translated at 14,1% (99 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 82,6% (579 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 92,4% (648 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/

* Translated using Weblate (Danish)

Currently translated at 98,0% (687 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Georgian)

Currently translated at 94,3% (661 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/

* Translated using Weblate (Hungarian)

Currently translated at 73,0% (512 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/

* Translated using Weblate (Norwegian (old code))

Currently translated at 74,8% (524 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/

* Translated using Weblate (Ido)

Currently translated at 19,3% (135 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/

* Translated using Weblate (Russian)

Currently translated at 96,0% (673 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/

* Translated using Weblate (Swedish)

Currently translated at 85,9% (602 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/

* Translated using Weblate (Turkish)

Currently translated at 32,0% (224 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/

* Translated using Weblate (Ukrainian)

Currently translated at 89,3% (626 of 701 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 98,5% (333 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/

* Translated using Weblate (Esperanto)

Currently translated at 90,5% (306 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Galician)

Currently translated at 85,5% (289 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Georgian)

Currently translated at 90,2% (305 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ka/

* Translated using Weblate (Greek)

Currently translated at 99,1% (335 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Norwegian (old code))

Currently translated at 74,3% (251 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/

* Translated using Weblate (Portuguese)

Currently translated at 72,8% (246 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/

* Translated using Weblate (Serbian)

Currently translated at 98,5% (333 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/

* Translated using Weblate (Slovak)

Currently translated at 98,5% (333 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Spanish)

Currently translated at 97,6% (330 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/

* Translated using Weblate (Swedish)

Currently translated at 88,5% (299 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/

* Translated using Weblate (Telugu)

Currently translated at 98,5% (333 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/

* Translated using Weblate (Ukrainian)

Currently translated at 82,0% (277 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/uk/

* Translated using Weblate (Danish)

Currently translated at 90,3% (84 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/

* Translated using Weblate (Occitan)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/

* Translated using Weblate (Danish)

Currently translated at 98.8% (334 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (French)

Currently translated at 100.0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (Slovenian)

Currently translated at 11.8% (11 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (338 of 338 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Normalize translations

* Fix cy locale
 2018-10-29 13:20:29 +01:00
Eugen Rochko
9c38c5daa3
Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133) 2018-10-29 04:42:07 +01:00
ThibG
7f22ed0fc9
Merge pull request #794 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-28 20:36:55 +01:00
Thibaut Girka
b00f60f1d3 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
kedama
678f5ed296 Set z-index of dropdown to 9999. (#9126) 2018-10-28 06:39:59 +01:00
Eugen Rochko
795f0107d2
Include preview cards in status entity in REST API (#9120) 
* Include preview cards in status entity in REST API

* Display preview card in-stream

* Improve in-stream display of preview cards
 2018-10-28 06:35:03 +01:00
Thibaut Girka
ee1f1a2ec9 When searching for an emoji with multiple separators, consider the full input 
e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not
“blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up,
although it is likely what the user wanted to type in the first place.
 2018-10-27 22:45:11 +02:00
ThibG
a90b569350 When searching for an emoji with multiple separators, consider the full input (#9124) 
e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not
“blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up,
although it is likely what the user wanted to type in the first place.
 2018-10-27 22:32:54 +02:00
Thibaut Girka
8f4fab65a1 Do not rely on hover for upload form options if touch is used 2018-10-27 19:06:49 +02:00
Thibaut Girka
008f98b304 [Glitch] RTL: fix column-back-button__icon margins/content 
Port 6e1a4f85ad to glitch-soc
 2018-10-27 18:55:11 +02:00
Thibaut Girka
c13cfeac09 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-27 18:54:26 +02:00
Masoud Abkenar
6e1a4f85ad RTL: fix column-back-button__icon margins/content (#9112) 
* RTL: fix column-back-button__icon margins/content

* Update rtl.scss

* Update rtl.scss
 2018-10-26 22:49:39 +02:00
Thibaut Girka
5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
 2018-10-26 20:41:43 +02:00
Eugen Rochko
161aeadbb4
Remove character counter from edit profile (#9100) 
* Remove display name and bio counter hint, simply limit input

* Remove now redundant translations

* Fix code style issue
 2018-10-26 01:55:24 +02:00
Eugen Rochko
768b0f132d
Fix direct messages column not loading more items on scroll (#9102) 
Fix #9097
 2018-10-26 01:55:08 +02:00
Eugen Rochko
a2e3401e48
Fix conversations not being marked read on click (#9103) 
Fix #9096
 2018-10-26 01:54:58 +02:00
Eugen Rochko
d723f2a0a8
Fix RTL layout of status display names (#9075) 
Fix #2350
 2018-10-24 18:18:08 +02:00
Eugen Rochko
288e435fe5
Show upload options on click as well as hover (#9074) 
Fix #8918
 2018-10-24 18:17:15 +02:00
Eugen Rochko
01c169e796
Fix JS error when posting from page without router context (#9073) 
Fix #9057
 2018-10-24 01:31:31 +02:00
Thibaut Girka
8f3096b846 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
Eugen Rochko
39abec4d25
Fix public timelines not instantly updating on compose (#9050) 
Fix #9034
 2018-10-23 00:43:18 +02:00
Eugen Rochko
ad510db3a1
Show suggested follows on search screen in mobile layout (#9010) 
Reminder: Suggestions were added in #7918 and are based on who you
interact with who you do not follow. E.g. if you boost someone a lot
from seeing other people's boosts of that person, it makes sense you
might be interested in following the original source; or if you reply
to someone a lot, maybe you'd want to follow them

Each suggestion can be dismissed
 2018-10-23 00:08:39 +02:00
Eugen Rochko
81017eaea7
Revert "RTL: remove blank character inside bdi (#9038)" (#9056) 
This reverts commit c7e9f9ff1e.
 2018-10-22 23:23:00 +02:00
Thibaut Girka
0c7f710be1 [Glitch] Surround mid-text display names with bdi tags 
Port 7861c5f108 to glitch-soc
 2018-10-22 18:57:20 +02:00
Thibaut Girka
323ae1403a [Glitch] fix: initial state of PrivacyDropdown is should not be null 
Port bebe8ec887 to glitch-soc
 2018-10-22 18:41:34 +02:00
Thibaut Girka
1bb23d0407 [Glitch] RTL: fix cardbar margins and alignment 
Port c73864c137 to glitch-soc
 2018-10-22 18:39:37 +02:00
Thibaut Girka
c9b19e05e2 [Glitch] RTL: fix admin account avatar margin in about page 
Port 3a157210c8 to glitch-soc
 2018-10-22 18:38:52 +02:00
Thibaut Girka
c14be538a6 [Glitch] RTL: fix column settings toggle label 
Port bf58461d36 to glitch-soc
 2018-10-22 18:38:11 +02:00
Thibaut Girka
a1f512f18b [Glitch] Fix domain label position and color 
Port 25f9ead041 to glitch-soc
 2018-10-22 18:37:17 +02:00
Thibaut Girka
9950db2e1c [Glitch] RTL: fix preferences layout 
Port 029943d59b to glitch-soc
 2018-10-22 18:34:48 +02:00
Thibaut Girka
076f0a0eb6 [Glitch] Fix admin account avatar margin 
Port 065b39e7a4 to glitch-soc
 2018-10-22 18:33:35 +02:00
Thibaut Girka
aa277ab5fb [Glitch] RTL: fix user stats in about page 
Port 301cbcc980 to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
ef9c11e050 [Glitch] RTL: fix domain append at signup form 
Port 65b3804a6c to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
e18724363d [Glitch] Fixes 8987 broken alignment at "Remote interaction dialog" 
Port d35801aaa2 to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
1139b758c5 [Glitch] RTL: fix admin account margins in about page 
Port f8c1b32541 to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
bf9c4b6d98 [Glitch] undo part of PR 8202 to fix RTL 
Port efd09e2ebb to glitch-soc
 2018-10-22 18:22:01 +02:00
Thibaut Girka
9f1c9b6135 [Glitch] Improve style of notice/alert messages 
Port b972478812 to glitch-soc
 2018-10-22 18:20:43 +02:00
Thibaut Girka
dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
 2018-10-22 17:51:38 +02:00
Masoud Abkenar
c7e9f9ff1e RTL: remove blank character inside bdi (#9038) 
* RTL: remove blank character inside bdi

* Update app/javascript/mastodon/components/display_name.js

Co-Authored-By: mabkenar <ampbox@gmail.com>
 2018-10-22 01:04:32 +02:00
Masoud Abkenar
c73864c137 RTL: fix cardbar margins and alignment (#9044) 2018-10-21 18:37:57 +02:00
Masoud Abkenar
3a157210c8 RTL: fix admin account avatar margin in about page (#9039) 
* RTL: fix admin account avatar margin in about page

* fix code style
 2018-10-21 16:45:08 +02:00
Thibaut Girka
04bedd237b Attempt at fixing inline video player 2018-10-21 16:09:07 +02:00
Thibaut Girka
dfa5b0576f Update mediaGallery component's width when opening CWs 2018-10-21 16:09:07 +02:00
Masoud Abkenar
bf58461d36 RTL: fix column settings toggle label (#9037) 2018-10-21 20:31:40 +09:00
kedama
25f9ead041 Fix domain label position and color (#9033) 
* Fix position of the domain label

* Fix position of the domain label for RTL

- Fix color mismatch of linear gradient which assigned to "::after" pseudo class
 2018-10-21 14:35:25 +09:00
Thibaut Girka
e4c3ea1809 Force sensitive content flag when posting a toot with a CW 
Indeed, when the “Always enable the Content Warning field” setting is enabled,
sending a content-less toot with a CW would move the CW to the toot's content
and leave the toot not marked as sensitive.
 2018-10-20 17:06:21 +02:00
Thibaut Girka
13c3fa8d36 Focus the UI when pressing Escape in the CW field 2018-10-20 15:00:39 +02:00
Eugen Rochko
fd5285658f
Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
Eugen Rochko
eb1b9903a6
Redesign direct messages column (#9022) 2018-10-20 02:23:58 +02:00
Masoud Abkenar
029943d59b RTL: fix preferences layout (#9021) 2018-10-20 01:05:17 +02:00
bsky
065b39e7a4 Fix admin account avatar margin (#9020) 2018-10-19 20:35:42 +02:00
Masoud Abkenar
301cbcc980 RTL: fix user stats in about page (#9018) 2018-10-19 20:16:13 +09:00
Eugen Rochko
a38a452481
Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
takayamaki
bebe8ec887 fix: initial state of PrivacyDropdown is should not be null (#9008) 2018-10-19 00:00:19 +02:00
Masoud Abkenar
65b3804a6c RTL: fix domain append at signup form (#9007) 2018-10-18 21:19:31 +02:00
ThibG
007f7690fa Fix fav/boosts hotkeys not working on detailed statuses (#9006) 2018-10-18 19:52:00 +02:00
Thibaut Girka
b13c34de3a Fix fav/boosts hotkeys not working on detailed statuses 2018-10-18 19:00:59 +02:00
Masoud Abkenar
f8c1b32541 RTL: fix admin account margins in about page (#9005) 2018-10-18 14:35:49 +02:00
ThibG
adb06baef6 Handle global hotkeys even when no element has focus (#8998) 
This fixes hotkeys not working when pressing the column
“back” button, for instance.
 2018-10-17 16:56:16 +02:00
Masoud Abkenar
d35801aaa2 Fixes 8987 broken alignment at "Remote interaction dialog" (#8988) 2018-10-15 16:09:08 +02:00
Masoud Abkenar
efd09e2ebb undo part of PR 8202 to fix RTL (#8979) 2018-10-15 04:39:20 +02:00
Thibaut Girka
b0527a4ce7 Handle alt+enter in the spoiler input as shortcut for secondary post 
Fixes #780
 2018-10-14 12:00:21 +02:00
Eugen Rochko
b972478812
Improve style of notice/alert messages (#8973) 2018-10-13 01:51:30 +02:00
Eugen Rochko
7d182442a7
Weblate translations (2018-10-12) (#8972) 
* Translated using Weblate (Welsh)

Currently translated at 64.4% (448 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Arabic)

Currently translated at 98.0% (682 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (French)

Currently translated at 99.9% (695 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Arabic)

Currently translated at 94.3% (82 of 87 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Welsh)

Currently translated at 88.7% (297 of 335 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (French)

Currently translated at 100.0% (335 of 335 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100,0% (87 of 87 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (Czech)

Currently translated at 100.0% (335 of 335 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (87 of 87 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/

* Translated using Weblate (Czech)

Currently translated at 99.9% (695 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Persian)

Currently translated at 100.0% (335 of 335 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Arabic)

Currently translated at 94.6% (88 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (335 of 335 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Czech)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/

* Translated using Weblate (Galician)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (696 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Greek)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/

* Translated using Weblate (Greek)

Currently translated at 98.8% (331 of 335 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 99.7% (694 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Persian)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Czech)

Currently translated at 99.9% (695 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (French)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (French)

Currently translated at 99.9% (695 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Japanese)

Currently translated at 99.4% (692 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Corsican)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/

* Translated using Weblate (Corsican)

Currently translated at 99.9% (695 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/

* Translated using Weblate (German)

Currently translated at 99.6% (693 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (German)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

* Translated using Weblate (Japanese)

Currently translated at 99.4% (692 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.9% (695 of 696 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (335 of 335 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Japanese)

Currently translated at 94.6% (88 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* i18n-tasks normalize

* yarn manage:translations
 2018-10-13 01:51:14 +02:00
Thibaut Girka
70d346ea95 Fix auto-unfold CWs when no regexp is set 
Fixes #778
 2018-10-12 23:34:26 +02:00
Eugen Rochko
9d4541c612
Display customized mascot in web UI and fix admin form for it (#8964) 
Follow-up to #8766
 2018-10-12 04:04:08 +02:00
ThibG
0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-11 21:28:03 +02:00
Eugen Rochko
87fdd139b8
Do not push DMs into the home feed (#8940) 
* Do not push DMs into the home feed

* Show DMs column after sending a DM, if DMs column is not already shown
 2018-10-11 01:31:03 +02:00
Thibaut Girka
bb1103d974 Really fix HotKeys 2018-10-10 17:40:06 +02:00
Thibaut Girka
a02244f17c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
 2018-10-09 21:08:26 +02:00
mayaeh
e50cb5f4bd Fix that the copy button of verify link did not work. (#8938) 2018-10-09 19:36:13 +02:00
Thibaut Girka
269edc0e48 Fix CW icon color in local-settings modal 2018-10-09 18:10:54 +02:00
Thibaut Girka
721aec40cd Define some local-settings hints 2018-10-09 18:10:54 +02:00
Thibaut Girka
26409f3e8e Add support for hints (or extended descriptions) in local-settings pages 2018-10-09 18:10:54 +02:00
Thibaut Girka
5f308a7f05 When screen width is too narrow, hide local-settings page text, keep only icons 2018-10-09 18:10:54 +02:00
Thibaut Girka
6cd793f0ac Change “preferences” icon to match settings page icon 2018-10-09 18:10:54 +02:00
Thibaut Girka
edb9ec8543 Add icons for each of the local-setting pages 2018-10-09 18:10:54 +02:00
Thibaut Girka
122ac9cd1d Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 12:12:03 +02:00
ThibG
4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-09 12:11:14 +02:00
Thibaut Girka
d0b1369a85 Fix app-wide hotkeys randomly failing to work 2018-10-09 12:10:51 +02:00
mayaeh
87abbb07f3 Add Japanese translations. (#8927) 2018-10-09 07:12:37 +09:00
Thibaut Girka
b368d3c15d Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 15:34:53 +02:00
mayaeh
770e337497 Fixed error occurrence when pinning the DM column. (#8922) 2018-10-08 14:43:38 +02:00
Thibaut Girka
d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
Thibaut Girka
96c3d26870 Move “Show action buttons in collapsed toots” option 2018-10-08 13:49:25 +02:00
Thibaut Girka
faecb35fe0 Switch from selects to radio buttons for local settings, improve styling 2018-10-08 13:49:25 +02:00
Eugen Rochko
774ac47373
Add conversations API (#8832) 
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
 2018-10-07 23:44:58 +02:00
Thibaut Girka
a3677a828d [Glitch] Change documentation URL 
Port 28401962ca to glitch-soc
 2018-10-07 22:56:24 +02:00
Thibaut Girka
b4ba1058b8 [Glitch] RTL: fix margins of public-account-header__tabs 
Port 185cb2dc3a to glitch-soc
 2018-10-07 22:56:24 +02:00
Thibaut Girka
611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
Thibaut Girka
7cc7843109 Do not scroll timelines when *closing* media modals 
Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases.
 2018-10-07 12:08:32 +02:00