8124b60a99
Fix AddLockVersionToPolls migration
2019-03-06 23:56:43 +01:00
cff221b519
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 22:59:07 +01:00
6b4eb1ac96
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port 365f875f57
2019-03-06 22:40:17 +01:00
f123b809a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 22:39:22 +01:00
4f2eb43d8a
Add optimistic lock to avoid race conditions when handling votes ( #10196 )
...
* Add optimistic lock to avoid race conditions when handling votes
* Force-reload polls when getting `ActiveRecord::StaleObjectError`
2019-03-06 19:53:57 +01:00
365f875f57
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
2019-03-06 15:10:32 +01:00
0b7c53937f
Disable file upload when there is a poll ( #10195 )
2019-03-06 15:09:18 +01:00
8d82e153f3
Add an icon to highlight polls behind a Content Warning
2019-03-06 13:01:27 +01:00
1397836898
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 12:20:17 +01:00
9844b44e99
Fix poll options not rendering text after vote/refresh
...
Port 9cae3a3b48
2019-03-06 11:44:27 +01:00
31017d18a5
Avoid line breaks in poll options
...
Port 0d8890f073
2019-03-06 11:43:14 +01:00
3ce4d88e6c
Render unicode emoji in polls using emoji pack
...
Port 73d3bb4a2c
2019-03-06 11:42:25 +01:00
3ebbc1f017
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 11:29:06 +01:00
67764e36f9
Bump active_record_query_trace from 1.5.4 to 1.6 ( #10192 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.5.4 to 1.6.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-06 14:58:13 +09:00
9cae3a3b48
Fix poll options not rendering text after vote/refresh ( #10189 )
...
* Fix poll options not rendering text after vote/refresh
* Fix poll options not showing up on public pages
* Fix code style issue
2019-03-06 05:35:52 +01:00
0d8890f073
Avoid line breaks in poll options ( #10188 )
2019-03-06 04:54:32 +01:00
1441046fdf
Fix poll validation issues ( #10186 )
...
- Fix missing interpolation argument in PollValidator
- Fix PollValidator rejecting exact allowed min/max durations
2019-03-06 04:54:11 +01:00
a15b0dc600
Add UI for creating polls ( #10184 )
...
* Add actions and reducers for polls
* Add poll button
* Disable media upload if poll enabled
* Add poll form
* Make delete & redraft work with polls
2019-03-06 04:53:37 +01:00
73d3bb4a2c
Render unicode emoji in polls using emoji pack ( #10185 )
2019-03-06 03:57:46 +01:00
bd97259b57
Fix toots opening in dynamic column when trying to interact with them
...
This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
2019-03-06 00:20:43 +01:00
66206bf2f9
Merge pull request #938 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 00:20:30 +01:00
9cb4a4c14e
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 00:03:46 +01:00
46f837a107
Fix newlines in OStatus and RSS serializations ( #10183 )
2019-03-05 23:58:58 +01:00
6ad1fc3254
[Glitch] Perform deep comparison for card data when receiving new props
...
Prevents embedded players from resetting when interacting with the toot
2019-03-05 23:22:29 +01:00
1ca322f241
Minor update for Slovak tr ( #10181 )
...
* Minor update for Slovak tr
* Update sk.yml
* Update sk.yml
2019-03-05 22:42:37 +01:00
750b967e86
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-05 22:20:58 +01:00
2182495cc7
I18n: Update Czech pluralization ( #10182 )
2019-03-05 22:13:04 +01:00
9e24d7dfa9
Weblate translations (2019-03-05) ( #10180 )
...
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Czech)
Currently translated at 99,9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Greek)
Currently translated at 98,4% (752 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 66,8% (510 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/kk/
* Translated using Weblate (Italian)
Currently translated at 99,7% (360 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 100,0% (63 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/it/
* Translated using Weblate (Italian)
Currently translated at 100,0% (111 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Kazakh)
Currently translated at 99,9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/kk/
* Translated using Weblate (Italian)
Currently translated at 88,9% (679 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (764 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Persian)
Currently translated at 99,7% (762 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Arabic)
Currently translated at 93,2% (712 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 96,4% (107 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Korean)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (764 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Korean)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Corsican)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Corsican)
Currently translated at 99,9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (French)
Currently translated at 99,7% (360 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Lithuanian)
Currently translated at 99,9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/lt/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* Translated using Weblate (Kazakh)
Currently translated at 99,9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/kk/
* Translated using Weblate (Greek)
Currently translated at 99,9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Added translation using Weblate (Bengali)
* Translated using Weblate (Bengali)
Currently translated at 2,1% (16 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bn/
* Translated using Weblate (Japanese)
Currently translated at 98,1% (354 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Galician)
Currently translated at 100,0% (764 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (762 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (French)
Currently translated at 99.9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Telugu)
Currently translated at 99.4% (359 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Spanish)
Currently translated at 84.7% (647 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (111 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (762 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Esperanto)
Currently translated at 98.2% (109 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Esperanto)
Currently translated at 99.9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Japanese)
Currently translated at 98.3% (751 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Esperanto)
Currently translated at 98.4% (62 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/
* Translated using Weblate (Esperanto)
Currently translated at 99.9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Czech)
Currently translated at 99.9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (111 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Persian)
Currently translated at 100.0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Czech)
Currently translated at 100.0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Occitan)
Currently translated at 95,7% (731 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100,0% (111 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Persian)
Currently translated at 99,7% (762 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Occitan)
Currently translated at 100,0% (361 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100,0% (63 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/oc/
* Translated using Weblate (Occitan)
Currently translated at 96.9% (740 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (French)
Currently translated at 99.9% (763 of 764 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Czech)
Currently translated at 100.0% (111 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Thai)
Currently translated at 14.4% (52 of 361 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/
* Translated using Weblate (Greek)
Currently translated at 99.9% (771 of 772 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Korean)
Currently translated at 100.0% (772 of 772 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Corsican)
Currently translated at 99.9% (771 of 772 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (770 of 772 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (111 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (French)
Currently translated at 99.9% (771 of 772 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Czech)
Currently translated at 99.0% (764 of 772 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Persian)
Currently translated at 99.7% (770 of 772 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Czech)
Currently translated at 98.7% (765 of 775 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (774 of 775 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Swedish)
Currently translated at 64,0% (71 of 111 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Corsican)
Currently translated at 99,9% (774 of 775 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Greek)
Currently translated at 99,9% (774 of 775 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Czech)
Currently translated at 100.0% (63 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Galician)
Currently translated at 100,0% (775 of 775 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (63 of 63 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/
* i18n-tasks normalize
* yarn manage:translations
* Fix missing plural keys
* Fix inconsistent interpolations
2019-03-05 21:52:40 +01:00
4c06fafeae
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 21:40:28 +01:00
ec787e4205
Fix various issues in polls
...
Port front-end changes from 1321801577
2019-03-05 21:35:03 +01:00
25ef8dffbc
Display closed polls as such
...
Port 674d232cd1
2019-03-05 21:35:03 +01:00
469e5af537
Fixes to the polls UI
...
Port 4987602069
2019-03-05 21:35:03 +01:00
c156b6d696
Fix web UI crash on page load when detailed status has a poll
...
Port 21246d861e
2019-03-05 21:35:03 +01:00
e31450e8ad
Insert polls in redux stores before statuses so it avoids crashes
...
Port 6d08fd5170
2019-03-05 21:35:03 +01:00
342d9d25bb
Add polls
...
Port front-end parts of 4a3acdc916
2019-03-05 21:35:03 +01:00
69fd801c8e
Port upstream refactoring of reducers and actions
...
Also includes 4923646361
2019-03-05 21:35:03 +01:00
acbf18b517
When serializing polls over OStatus, serialize poll options to text ( #10160 )
...
* When serializing polls over OStatus, serialize poll options to text
* Do the same for RSS feeds
* Use “[ ] ” as a prefix for poll options instead of “- ”
2019-03-05 21:09:18 +01:00
0dc5c2a4a5
Fix home timeline perpetually reloading when empty
...
Port 0c8d1435c5
2019-03-05 19:30:11 +01:00
c0b876f726
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- db/schema.rb
Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
657436c5db
Bump version to 2.7.4 ( #10179 )
2019-03-05 18:22:46 +01:00
7c61f27433
Fix status creation API silently discarding invalid poll ( #10171 )
2019-03-05 15:21:31 +01:00
0c8e3beb51
Do not error out on unsalvageable errors in FetchRepliesService ( #10175 )
...
* Do not error out on unsalvageable errors in FetchRepliesService
Fixes #10152
* Fix FetchRepliesWorker erroring out on deleted statuses
2019-03-05 15:21:14 +01:00
fbe97b9643
Fix suspended account's fields being set as empty dict instead of list ( #10178 )
...
Fixes #10177
2019-03-05 15:19:54 +01:00
a7dfbbd4fb
Fix NoMethodError in ActivityPub::NoteSerializer ( #10172 )
2019-03-05 05:09:01 +01:00
31a1fa3dcf
Fix last_fetched_at not being set on polls ( #10170 )
2019-03-05 04:10:01 +01:00
1321801577
Fix various issues in polls ( #10165 )
...
* Fix ActivityPub poll results being serialized even with hide_totals
* Fix poll refresh button having a different font size
* Display poll in OpenGraph description
* Fix NoMethodError when serializing votes
Regression from #10158
* Fix polls on public pages being broken for non-logged-in users
* Do not show time remaining if poll has no expiration date
2019-03-05 03:51:18 +01:00
53336aa646
Add test ensuring that unknown object types are rejected ( #10166 )
2019-03-05 11:46:36 +09:00
9cb5dcc379
Fix featured tag form not failing on failed tag validations ( #10167 )
2019-03-05 03:46:24 +01:00
7f956cfa30
Fix poll options not being stripped of surrounding whitespace on save ( #10168 )
2019-03-05 03:45:56 +01:00
674d232cd1
Display closed polls as such ( #10156 )
2019-03-04 22:52:41 +01:00
Thibaut Girka