7f24242ef6
Merge pull request #801 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-30 14:20:25 +01:00
48be335f4f
Remove duplicate and outdated specs
2018-10-30 12:46:05 +01:00
3aa2418217
[Glitch] RTL: fix toot privacy preferences radio buttonss
...
Port e961a763a2
2018-10-30 11:24:40 +01:00
e32a4f55fe
[Glitch] RTL: fix preferences page checkbox margins
...
Port 5ee0b51ac8
2018-10-30 11:24:19 +01:00
94ad76a5b9
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-30 11:22:25 +01:00
6771e8c88c
Bump oj from 3.6.12 to 3.7.0 ( #9155 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.12 to 3.7.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.6.12...v3.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 06:39:52 +01:00
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
d4415cc316
Bump i18n-tasks from master to 0.9.28 ( #9148 )
2018-10-30 01:06:47 +01:00
e961a763a2
RTL: fix toot privacy preferences radio buttonss ( #9146 )
2018-10-30 00:49:29 +01:00
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
33a71e8f7c
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
7ec3f6022d
move some constants to rails environment
2018-10-29 21:29:31 +01:00
88659eda24
Merge pull request #798 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-29 21:29:15 +01:00
ee5132a00e
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-29 14:16:35 +01:00
e84da282f6
Bump version to 2.6.0rc3 ( #9142 )
...
* Bump version to 2.6.0rc3
* Update CHANGELOG.md
2018-10-29 14:15:54 +01:00
f16d66c5c8
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-29 14:09:54 +01:00
3fd808ab26
Update AUTHORS.md ( #9141 )
2018-10-29 14:05:53 +01:00
b40ea6d1d4
Bump sanitize from 4.6.6 to 5.0.0 ( #9140 )
2018-10-29 14:05:25 +01:00
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
32f950a7a8
Update i18n-tasks to master ( #9139 )
2018-10-29 13:46:39 +01:00
fb2e699eeb
Improved grammar in German translation ( #9092 )
...
Just a grammar improvement.
2018-10-29 13:24:15 +01:00
2b18f5f85d
Add Page AP type support ( #9121 )
2018-10-29 13:23:29 +01:00
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
ce33ce94c9
Bump parallel_tests from 2.25.0 to 2.26.0 ( #9137 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.25.0 to 2.26.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:55 +01:00
8c944c2f63
Bump tzinfo-data from 1.2018.6 to 1.2018.7 ( #9136 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.6 to 1.2018.7.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.6...v1.2018.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:34 +01:00
3b89abc343
Bump rubocop from 0.59.2 to 0.60.0 ( #9135 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.59.2 to 0.60.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.59.2...v0.60.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:16 +01:00
5de592bcce
Bump doorkeeper from 5.0.1 to 5.0.2 ( #9134 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.1...v5.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:54:56 +01:00
9c38c5daa3
Fix dimensions of preview cards, fix crash in web UI, fix warning ( #9133 )
2018-10-29 04:42:07 +01:00
7f22ed0fc9
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-28 20:36:55 +01:00
b00f60f1d3
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
26fe37c414
Update i18n-tasks and change CircleCI command ( #9104 )
...
* Update i18n-tasks and CircleCI command
* Fix #9088
* Update i18n-tasks
* Fix ast
2018-10-28 07:15:20 +01:00
11b3ee4f4c
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
93a1ab9030
Add progress indicators to MigrateAccountConversations ( #9101 )
...
* Add progress indicators to MigrateAccountConversations
* Avoid running expensive query for explain
* Use exec_query instead of execute
2018-10-28 06:40:45 +01:00
678f5ed296
Set z-index of dropdown to 9999. ( #9126 )
2018-10-28 06:39:59 +01:00
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
6f78500d4f
Do not remove "dead" domains in tootctl accounts cull ( #9108 )
...
Leave `tootctl accounts cull` to simply check removed accounts from
live domains, and skip temporarily unavailable domains, while listing
them in the final output for further action.
Add `tootctl domains purge DOMAIN` to be able to purge a domain from
that list manually
2018-10-27 22:56:16 +02:00
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
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
8f4fab65a1
Do not rely on hover for upload form options if touch is used
2018-10-27 19:06:49 +02:00
008f98b304
[Glitch] RTL: fix column-back-button__icon margins/content
...
Port 6e1a4f85ad
2018-10-27 18:55:11 +02:00
c13cfeac09
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-27 18:54:26 +02:00
eef8d9a5f7
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
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
215e649391
Fix styling in /auth/edit ( #9117 )
2018-10-26 22:49:17 +02:00
e53cc673e7
Ignore invalid hashtags on remote statuses instead of rejecting them ( #9118 )
...
Fixes #9115
2018-10-26 22:48:35 +02:00
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
82e7988afc
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
1e2695198a
Skip link-back check if body is nil ( #9107 )
2018-10-26 03:31:23 +02:00
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
768b0f132d
Fix direct messages column not loading more items on scroll ( #9102 )
...
Fix #9097
2018-10-26 01:55:08 +02:00
ThibG