13567f13af
[Glitch] Port some of upstream's getting started footer links
2018-10-31 10:07:41 +01:00
083f015f9f
Fix reducer error when conversation has no last status in web UI ( #9173 )
...
Fix #9170
2018-10-31 00:55:20 +01:00
3981da6f90
Revert "Fix FetchAtomService content type handling ( #9132 )" ( #9171 )
...
This reverts commit c20d55f7dd
2018-10-31 00:43:34 +01:00
407cab9844
[i18n] Update for Occitan ( #9169 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
* Update simple_form.oc.yml
* Update oc.json
2018-10-30 22:06:31 +01:00
5ad4bcbece
[Glitch] Fix empty display name precedence over username in web UI
...
Port 4084814d8a
2018-10-30 17:54:50 +01:00
fd18ed4cea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
8bef422043
Add a local setting for inline preview cards
2018-10-30 17:51:06 +01:00
4fe81a99c6
Add a “link” status icon for toots with a preview card
2018-10-30 17:51:06 +01:00
7f023b3b98
[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning
...
Port 766a808de4
2018-10-30 17:51:06 +01:00
18870c45f1
[Glitch] Include preview cards in status entity in REST API
...
Port cf2ab9c394
2018-10-30 17:51:06 +01:00
4084814d8a
Fix empty display name precedence over username in web UI ( #9163 )
...
Fix #9131
2018-10-30 17:06:12 +01:00
e242688a74
Fix td instead of th in sessions table header ( #9162 )
...
Fix #9130
2018-10-30 17:00:34 +01:00
ca87d98d16
Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" ( #9161 )
...
This reverts commit 0c756cfd54
2018-10-30 16:25:54 +01:00
c20d55f7dd
Fix FetchAtomService content type handling ( #9132 )
...
* Add profile to json+ld in Accept
It's required by the ActivityPub spec
* Use headers['Content-type'] instead of mime_type
mime_type strips the profile from the content type, but it's still available raw in the headers hash
* Add test for ld+json with profile
2018-10-30 15:07:57 +01:00
a43fdd72ba
[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
d84886f35e
Accept the same payload in multiple inboxes and deliver ( #9150 )
2018-10-30 15:03:55 +01:00
c15b8ee75b
Always let through notifications from staff ( #9152 )
...
* Always let through notifications from staff
Follow-up to #8993
* Let messages from staff through, but no other notifications
2018-10-30 15:02:55 +01:00
cfe92b50bb
Fix Pleroma mentions being fetched as preview cards ( #9158 )
2018-10-30 15:02:24 +01:00
bdcdc35df7
[Glitch] RTL: fix toot privacy preferences radio buttonss
...
Port 27b5a57f6d
2018-10-30 11:24:40 +01:00
cecd8b25c4
[Glitch] RTL: fix preferences page checkbox margins
...
Port 4e034437e3
2018-10-30 11:24:19 +01:00
7406141a71
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-30 11:22:25 +01:00
fcd79aba0b
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
27b5a57f6d
RTL: fix toot privacy preferences radio buttonss ( #9146 )
2018-10-30 00:49:29 +01:00
4e034437e3
RTL: fix preferences page checkbox margins ( #9145 )
...
* RTL: fix preferences page checkbox margins
* Update rtl.scss
2018-10-30 00:47:43 +01:00
1cbcb09d67
Do not hide boost notifications from followed people with hidden boosts ( #9147 )
...
* Do not hide boost notifications from followed people with hidden boosts
Not displaying boosts from a followed user in the Home timeline and not
having notifications when they reblog your own content are two very
separate concerns, tying them together seem counter-intuitive and unwanted.
* Update specs accordingly
2018-10-30 00:47:31 +01:00
5fbafbb54d
move some constants to rails environment
2018-10-29 21:29:31 +01:00
13ea29754d
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
a342451341
Add Page AP type support ( #9121 )
2018-10-29 13:23:29 +01:00
e362029b5d
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
766a808de4
Fix dimensions of preview cards, fix crash in web UI, fix warning ( #9133 )
2018-10-29 04:42:07 +01:00
f945bbac81
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-28 20:36:55 +01:00
c954f89bdd
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
c3005d09e6
Reset status cache when status_stat or media_attachment updates ( #9119 )
...
* Reset status cache when status_stat or media_attachment updates
Fix #8711
Media attachments are generally immutable, but admins can update
the sensitive flag, and this would ensure the change is visible
instantly. Same for updates to status stats. That is a regression
from #8185 , because even the correct updated_at fetched from a join
doesn't seem to invalidate the cache.
* Remove join from Status#cache_ids since it has no effect
2018-10-28 06:42:34 +01:00
854d492e34
Set z-index of dropdown to 9999. ( #9126 )
2018-10-28 06:39:59 +01:00
cf2ab9c394
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
2ad5e2c933
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
11fc53d394
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
d091159140
Do not rely on hover for upload form options if touch is used
2018-10-27 19:06:49 +02:00
f679c8d70d
[Glitch] RTL: fix column-back-button__icon margins/content
...
Port 38bd132c46
2018-10-27 18:55:11 +02:00
65cc5faf80
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-27 18:54:26 +02:00
7c01fbf4fd
Add locality check to ActivityPub::FetchRemoteAccountService ( #9109 )
...
* Add locality check to ActivityPub::FetchRemoteAccountService
Fix #8643
Because there are a few places where it is called, it is difficult
to confirm if they all previously checked it for locality. It's better
to make sure within the service.
* Remove faux-remote duplicates of local accounts
2018-10-26 23:08:34 +02:00
38bd132c46
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
b5042bbeeb
Fix styling in /auth/edit ( #9117 )
2018-10-26 22:49:17 +02:00
e169e36810
Ignore invalid hashtags on remote statuses instead of rejecting them ( #9118 )
...
Fixes #9115
2018-10-26 22:48:35 +02:00
c32a5f86b6
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
56774d3bd4
Fix missing `mention` argument when processing incoming Create activities ( #9114 )
...
* Fix missing `mention` argument when processing incoming Create activities
* Fix typo (param → params)
2018-10-26 12:59:59 +02:00
95ef0e144a
Skip link-back check if body is nil ( #9107 )
2018-10-26 03:31:23 +02:00
3a115d3f49
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
f8596e3b5a
Fix direct messages column not loading more items on scroll ( #9102 )
...
Fix #9097
2018-10-26 01:55:08 +02:00
ebaef6e3df
Fix conversations not being marked read on click ( #9103 )
...
Fix #9096
2018-10-26 01:54:58 +02:00
8d76db2714
Do not fetch preview card for mentioned users ( #6934 )
2018-10-25 18:13:19 +02:00
b110105a53
Allow inbox owner to view implicitly targeted ActivityPub payload ( #9093 )
...
Fix #9091
2018-10-25 18:12:22 +02:00
db85c8f0f6
Migrate all old direct messages to new conversations schema ( #9085 )
2018-10-25 01:44:02 +02:00
cad03e69b3
Set @body_classes to admin layout ( #9081 )
2018-10-25 00:10:01 +02:00
e29581a150
Fix RTL layout of status display names ( #9075 )
...
Fix #2350
2018-10-24 18:18:08 +02:00
256a10c192
Show upload options on click as well as hover ( #9074 )
...
Fix #8918
2018-10-24 18:17:15 +02:00
27e829b362
Fix JS error when posting from page without router context ( #9073 )
...
Fix #9057
2018-10-24 01:31:31 +02:00
9d02774407
Keep back own DMs in Home timeline
...
Follow-up to 415822a849
2018-10-23 20:03:35 +02:00
2b7b807df0
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-23 17:15:57 +02:00
b49f2eef89
Fix public timelines not instantly updating on compose ( #9050 )
...
Fix #9034
2018-10-23 00:43:18 +02:00
541fda5fc8
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
a984d5a1c4
Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )
...
This reverts commit 4bfec4b32d
2018-10-22 23:23:00 +02:00
1a63a8f74e
[Glitch] Surround mid-text display names with bdi tags
...
Port 19aaf0e99f
2018-10-22 18:57:20 +02:00
6651d4fa7c
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port 8f0c64baf1
2018-10-22 18:41:34 +02:00
2159add1d6
[Glitch] RTL: fix cardbar margins and alignment
...
Port eb62f72990
2018-10-22 18:39:37 +02:00
f48cff1a95
[Glitch] RTL: fix admin account avatar margin in about page
...
Port a105bf8516
2018-10-22 18:38:52 +02:00
15e3b0f070
[Glitch] RTL: fix column settings toggle label
...
Port 26c662792c
2018-10-22 18:38:11 +02:00
c47e40cd6e
[Glitch] Fix domain label position and color
...
Port 45b8a91983
2018-10-22 18:37:17 +02:00
69d348ed98
[Glitch] RTL: fix preferences layout
...
Port 6b1f1c32c5
2018-10-22 18:34:48 +02:00
7dc82e1eb2
[Glitch] Fix admin account avatar margin
...
Port 064b26f03c
2018-10-22 18:33:35 +02:00
acd870ccba
[Glitch] RTL: fix user stats in about page
...
Port 4a95304331
2018-10-22 18:31:50 +02:00
81c0cbaa9e
[Glitch] RTL: fix domain append at signup form
...
Port ec15808edd
2018-10-22 18:31:50 +02:00
0631c9ed7c
[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
...
Port 024326e6e6
2018-10-22 18:31:50 +02:00
d779b09ed7
[Glitch] RTL: fix admin account margins in about page
...
Port 3d51268c4c
2018-10-22 18:31:50 +02:00
d804ed1dd4
[Glitch] undo part of PR 8202 to fix RTL
...
Port 96696a40ff
2018-10-22 18:22:01 +02:00
2ecd3d97ba
[Glitch] Improve style of notice/alert messages
...
Port ce6772690f
2018-10-22 18:20:43 +02:00
415822a849
Keep new DMs in home feeds and in the old DM timeline
...
Revert server-side part of 8efdf1a898
2018-10-22 18:15:51 +02:00
46259a36d0
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
4bfec4b32d
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
f14067368f
Fix og:url on toots' public view ( #9047 )
...
Fixes #9045
2018-10-21 22:52:10 +02:00
eb62f72990
RTL: fix cardbar margins and alignment ( #9044 )
2018-10-21 18:37:57 +02:00
a105bf8516
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
085c41ebf2
Put a video camera emoji or a picture frame emoji instead of “.”
...
This uses the same logic as the status icons in the glitch flavor.
2018-10-21 16:09:18 +02:00
88cd14802d
Do not move CWs to toot body when toot body is empty
...
Fixes #395
Instead of leaving the toot body blank, it replaces it with a single “.” in
order for the fold/unfold CW behavior to not look *too* weird on upstream
Mastodon. Note that this does not fix upstream's CW-dropping behavior, as
that is decided at the time the toot is posted, not received.
2018-10-21 16:09:18 +02:00
3d8c1f6104
Attempt at fixing inline video player
2018-10-21 16:09:07 +02:00
9614abc713
Update mediaGallery component's width when opening CWs
2018-10-21 16:09:07 +02:00
26c662792c
RTL: fix column settings toggle label ( #9037 )
2018-10-21 20:31:40 +09:00
45b8a91983
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
8c2027ebe2
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
1cb7fe932d
Focus the UI when pressing Escape in the CW field
2018-10-20 15:00:39 +02:00
40d23fc4d1
Add option to block reports from domain ( #8830 )
2018-10-20 08:02:44 +02:00
9ccae7feff
Add "disable" button to report screen ( #9024 )
...
* Add "disable" button to report screen
* i18n-tasks remove-unused
2018-10-20 02:39:39 +02:00
9309e5981d
Redesign direct messages column ( #9022 )
2018-10-20 02:23:58 +02:00
6b1f1c32c5
RTL: fix preferences layout ( #9021 )
2018-10-20 01:05:17 +02:00
064b26f03c
Fix admin account avatar margin ( #9020 )
2018-10-19 20:35:42 +02:00
4a95304331
RTL: fix user stats in about page ( #9018 )
2018-10-19 20:16:13 +09:00
e3b2234382
Add unread indicator to conversations ( #9009 )
2018-10-19 01:47:29 +02:00
8f0c64baf1
fix: initial state of PrivacyDropdown is should not be null ( #9008 )
2018-10-19 00:00:19 +02:00
ec15808edd
RTL: fix domain append at signup form ( #9007 )
2018-10-18 21:19:31 +02:00
b420d15a9b
Fix fav/boosts hotkeys not working on detailed statuses ( #9006 )
2018-10-18 19:52:00 +02:00
a8e896af12
Fix fav/boosts hotkeys not working on detailed statuses
2018-10-18 19:00:59 +02:00
3d51268c4c
RTL: fix admin account margins in about page ( #9005 )
2018-10-18 14:35:49 +02:00
92b93a12cb
Do not show "limited" visibility in default visibility preference ( #8999 )
...
* Do not show "limited" visibility in default visibility preference
Fix regression from #8950
* Fix code style issue
2018-10-17 22:04:40 +02:00
654520ec8c
Improve support for aspects/circles ( #8950 )
...
* Add silent column to mentions
* Save silent mentions in ActivityPub Create handler and optimize it
Move networking calls out of the database transaction
* Add "limited" visibility level masked as "private" in the API
Unlike DMs, limited statuses are pushed into home feeds. The access
control rules between direct and limited statuses is almost the same,
except for counter and conversation logic
* Ensure silent column is non-null, add spec
* Ensure filters don't check silent mentions for blocks/mutes
As those are "this person is also allowed to see" rather than "this
person is involved", therefore does not warrant filtering
* Clean up code
* Use Status#active_mentions to limit returned mentions
* Fix code style issues
* Use Status#active_mentions in Notification
And remove stream_entry eager-loading from Notification
2018-10-17 17:13:04 +02:00
6e5f9ee743
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
96388bae5f
always allow DMs from staff ( #8993 )
2018-10-16 19:55:05 +02:00
2a43a09ec0
Improve form for selecting media display preference ( #8965 )
...
Regression from #8569
2018-10-16 14:07:54 +02:00
024326e6e6
Fixes 8987 broken alignment at "Remote interaction dialog" ( #8988 )
2018-10-15 16:09:08 +02:00
96696a40ff
undo part of PR 8202 to fix RTL ( #8979 )
2018-10-15 04:39:20 +02:00
ccf5ddfd88
Handle alt+enter in the spoiler input as shortcut for secondary post
...
Fixes #780
2018-10-14 12:00:21 +02:00
ce6772690f
Improve style of notice/alert messages ( #8973 )
2018-10-13 01:51:30 +02:00
c04048aae8
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
794b2dad99
Fix auto-unfold CWs when no regexp is set
...
Fixes #778
2018-10-12 23:34:26 +02:00
dbc1b36b61
Allow selecting both default flavour and theme
...
Fixes #672
2018-10-12 19:06:35 +02:00
27376e2457
Improve signature verification safeguards ( #8959 )
...
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit 65d1a2d10a
2018-10-12 07:00:41 +02:00
2a36092328
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
3ede0e8b95
Fix missing protocol in dns-prefetch, improve code style ( #8963 )
...
Regression from #8942
2018-10-12 02:19:10 +02:00
bf125acdb0
Fix microformats on statuses according to updated spec ( #8958 )
2018-10-12 02:04:07 +02:00
735a43bdea
Fix type of conversation ID in conversations API ( #8961 )
2018-10-12 01:36:51 +02:00
0a5b65533d
Improve signature verification safeguards ( #8959 )
...
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit 65d1a2d10a
2018-10-12 00:15:55 +02:00
10ed0ddd2a
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-11 21:28:03 +02:00
51c53e709f
Set Content-Security-Policy rules through RoR's config ( #8957 )
...
* Set CSP rules in RoR's configuration
* Override CSP setting in the embed controller to allow frames
2018-10-11 20:35:46 +02:00
70a7f72fda
Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream
2018-10-11 14:12:36 +02:00
b9e620946c
Fix typo in ActivityPub Create handler ( #8952 )
...
Regression from #8951
2018-10-11 02:10:15 +02:00
8efdf1a898
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
ce087ef889
Move network calls out of transaction in ActivityPub handler ( #8951 )
...
Mention and emoji code may perform network calls, but does not need
to do that inside the database transaction. This may improve availability
of database connections when using pgBouncer in transaction mode.
2018-10-11 00:50:18 +02:00
bf559a477a
Really fix HotKeys
2018-10-10 17:40:06 +02:00
af3ef0afb0
Add description meta tag additionally to og:description ( #8941 )
...
Fix #8685
2018-10-10 02:21:30 +02:00
c227151023
Add dns-prefetch if using different host for assets or uploads ( #8942 )
2018-10-10 01:31:10 +02:00
8cb843039c
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
cf43973ecd
Fix that the copy button of verify link did not work. ( #8938 )
2018-10-09 19:36:13 +02:00
ad0f37e924
Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )
2018-10-09 19:35:14 +02:00
f9fc7d7660
Fix CW icon color in local-settings modal
2018-10-09 18:10:54 +02:00
d21c9f08e5
Define some local-settings hints
2018-10-09 18:10:54 +02:00
c40ba63f42
Add support for hints (or extended descriptions) in local-settings pages
2018-10-09 18:10:54 +02:00
c598692cdf
When screen width is too narrow, hide local-settings page text, keep only icons
2018-10-09 18:10:54 +02:00
56773bc55c
Change “preferences” icon to match settings page icon
2018-10-09 18:10:54 +02:00
065a19b18b
Add icons for each of the local-setting pages
2018-10-09 18:10:54 +02:00
f09150f2a9
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-09 12:12:03 +02:00
d73c1df33b
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-09 12:11:14 +02:00
e968dcea13
Fix app-wide hotkeys randomly failing to work
2018-10-09 12:10:51 +02:00
bcb43baf50
Add Japanese translations. ( #8927 )
2018-10-09 07:12:37 +09:00
683608dd60
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 15:34:53 +02:00
96a313d02b
Fixed error occurrence when pinning the DM column. ( #8922 )
2018-10-08 14:43:38 +02:00
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 13:51:33 +02:00
3f68e9ed11
Move “Show action buttons in collapsed toots” option
2018-10-08 13:49:25 +02:00
caa56b01a9
Switch from selects to radio buttons for local settings, improve styling
2018-10-08 13:49:25 +02:00
00d31a292c
rubocop issues - Cleaning up ( #8912 )
...
* cleanup pass
* undo mistakes
* fixed.
* revert
2018-10-08 04:50:11 +02:00
65d1a2d10a
Remove dead code ( #8919 )
...
SignatureVerification#matches_time_window? is not called anywhere.
2018-10-08 04:48:54 +02:00
ea57aca5e1
Replace SVG asset with Custom mascot ( #8766 )
2018-10-08 00:20:45 +02:00
Thibaut Girka