1
0
Commit Graph

9212 Commits

Author SHA1 Message Date
Thibaut Girka
9c5e7805cc Merge branch 'master' into glitch-soc/merge-upstream 2019-03-07 13:24:30 +01:00
dependabot[bot]
637c952ccb Bump webpush from 0.3.6 to 0.3.7 (#10205)
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-07 20:38:10 +09:00
marcin mikołajczak
44475bbc9c i18n:🇵🇱 (#10199)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-03-07 02:52:43 +01:00
ThibG
34f261e6af Avoid unnecessarily fetching the replies collection when it is empty (#10201) 2019-03-07 01:50:37 +01:00
ThibG
dfb45374d2 Fix AddLockVersionToPolls migration (#10200) 2019-03-07 01:50:06 +01:00
rinsuki
f44091d653 Fix #10202 (#10203) 2019-03-07 01:49:42 +01:00
Thibaut Girka
84c807a0dc Allow setting whether this is a single choice poll or multiple choices one 2019-03-06 23:56:53 +01:00
Thibaut Girka
cb6e351f4d Disable file upload when there is a poll 2019-03-06 23:56:53 +01:00
Thibaut Girka
235be596bc Use server-provided poll limits instead of hardcoded ones
Also does not enable polls if no limits are provided by the server
2019-03-06 23:56:53 +01:00
Thibaut Girka
3b1390dc78 Serialize poll limits in instance serializer and initial state 2019-03-06 23:56:53 +01:00
Thibaut Girka
8fe86cebaa [Glitch] Port polls creation UI from upstream 2019-03-06 23:56:53 +01:00
Thibaut Girka
3e5a0bc825 Fix AddLockVersionToPolls migration 2019-03-06 23:56:43 +01:00
ThibG
da8ce25fa1
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-06 22:59:07 +01:00
ThibG
6e295beab2 [Glitch] Disable the underlying button element when an ItemButton is disabled
Port b3668a79ec to glitch-soc
2019-03-06 22:40:17 +01:00
Thibaut Girka
cf4fd8bcfe Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 22:39:22 +01:00
ThibG
96f905f409 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
ThibG
b3668a79ec Disable the underlying button element when an ItemButton is disabled (#10194)
Fixes #10191
2019-03-06 15:10:32 +01:00
ThibG
cb217444b8 Disable file upload when there is a poll (#10195) 2019-03-06 15:09:18 +01:00
Thibaut Girka
1bb23100b1 Add an icon to highlight polls behind a Content Warning 2019-03-06 13:01:27 +01:00
ThibG
fefacb7b7a
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-06 12:20:17 +01:00
Eugen Rochko
94a0149ff3 Fix poll options not rendering text after vote/refresh
Port fd128b9c7a to glitch-soc
2019-03-06 11:44:27 +01:00
Eugen Rochko
94f1a751bf Avoid line breaks in poll options
Port 57643557b6 to glitch-soc
2019-03-06 11:43:14 +01:00
Eugen Rochko
7f32d675b0 Render unicode emoji in polls using emoji pack
Port 4407f07014 to glitch-soc
2019-03-06 11:42:25 +01:00
Thibaut Girka
4806232997 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00
dependabot[bot]
ad6f7ea250 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
Eugen Rochko
fd128b9c7a
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
Eugen Rochko
57643557b6
Avoid line breaks in poll options (#10188) 2019-03-06 04:54:32 +01:00
Eugen Rochko
5996be994d
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
Eugen Rochko
d97cbb0da6
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
Eugen Rochko
4407f07014
Render unicode emoji in polls using emoji pack (#10185) 2019-03-06 03:57:46 +01:00
Thibaut Girka
e80fabfd84 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
ThibG
bd3567b3f8
Merge pull request #938 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-06 00:20:30 +01:00
Thibaut Girka
f108c6a042 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 00:03:46 +01:00
ThibG
efd0fb8088 Fix newlines in OStatus and RSS serializations (#10183) 2019-03-05 23:58:58 +01:00
Thibaut Girka
ff827c1f38 [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
Marek Ľach
b5f119cfaf 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
ThibG
772b4ba24c
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-05 22:20:58 +01:00
Aditoo17
7be1d70411 I18n: Update Czech pluralization (#10182) 2019-03-05 22:13:04 +01:00
Eugen Rochko
d604489b5e
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
Thibaut Girka
866496ac16 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 21:40:28 +01:00
Eugen Rochko
ba6ca3cd69 Fix various issues in polls
Port front-end changes from a198add83b to glitch-soc
2019-03-05 21:35:03 +01:00
ThibG
7f27ee35a8 Display closed polls as such
Port cda6ece760 to glitch-soc
2019-03-05 21:35:03 +01:00
ThibG
530151466e Fixes to the polls UI
Port 4ced609497 to glitch-soc
2019-03-05 21:35:03 +01:00
Eugen Rochko
f14eda23e9 Fix web UI crash on page load when detailed status has a poll
Port 5dfa433698 to glitch-soc
2019-03-05 21:35:03 +01:00
ThibG
2156765448 Insert polls in redux stores before statuses so it avoids crashes
Port 26c56d0c10 to glitch-soc
2019-03-05 21:35:03 +01:00
Eugen Rochko
8d70a8a19b Add polls
Port front-end parts of 230a012f00 to glitch-soc
2019-03-05 21:35:03 +01:00
Thibaut Girka
0d19fcc2fb Port upstream refactoring of reducers and actions
Also includes 9e45b051cf
2019-03-05 21:35:03 +01:00
ThibG
636db1f54f 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
Eugen Rochko
cce1c3252f Fix home timeline perpetually reloading when empty
Port 3e0ed36e8e to glitch-soc
2019-03-05 19:30:11 +01:00
Thibaut Girka
f513317ba2 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