6f75a9001f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml
Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
2018-08-31 19:10:57 +02:00
c6942a5283
Add option to not automatically unfold content warnings matching a regexp
...
Fixes #678
2018-08-31 18:35:03 +02:00
5c400a2842
Allow text inputs in local settings dialog
2018-08-31 18:35:03 +02:00
9d2739d74d
Add a setting to automatically unfold all content warnings
2018-08-31 18:35:03 +02:00
130bdb5ee8
[Glitch] Show compose form on delete & redraft when in mobile layout
...
Port 025fbb8285
2018-08-31 18:33:46 +02:00
0f1db47a7e
Fix search results on compose box
2018-08-31 18:33:46 +02:00
b4f548fa18
Fix account header showing on search page
2018-08-31 18:33:46 +02:00
4a686ddf8a
[Glitch] On the mobile UI, move the search column to the right
...
Port 20bb90ced6
2018-08-31 18:33:46 +02:00
4686b3fa76
[Glitch] Hide search from Compose on mobile devices
...
Port 0893b16695
2018-08-31 18:33:46 +02:00
37a00d4c1d
[Glitch] Add search item to tab bar for mobile devices
...
Port c9cbb8de70
2018-08-31 18:33:46 +02:00
76a3f373e3
[Glitch] Use withRouter for TabsBar
...
Port 61e6275781
2018-08-31 18:33:46 +02:00
5f035a2a1a
[Glitch] Move "compose" on mobile to floating action button
...
Port e72db6d9dd
2018-08-31 18:33:46 +02:00
70c308c4aa
[Glitch] When search enabled, display hint in search popout
...
Port 7901f9f63e
2018-08-31 18:33:46 +02:00
55880c7098
Translate more messages to Traditional Chinese ( #8543 )
2018-08-31 23:22:03 +09:00
dddf022aae
Weblate translations (2018-08-31) ( #8535 )
...
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.8% (320 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.9% (686 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Japanese)
Currently translated at 92.8% (310 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Greek)
Currently translated at 99.9% (686 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Korean)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Greek)
Currently translated at 98.8% (330 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Japanese)
Currently translated at 92.8% (310 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (687 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (687 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Occitan)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Czech)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (686 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Turkish)
Currently translated at 96.7% (323 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/
* Translated using Weblate (French)
Currently translated at 99.0% (680 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Arabic)
Currently translated at 97.4% (669 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Greek)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Galician)
Currently translated at 100,0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Czech)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Arabic)
Currently translated at 97.7% (672 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Danish)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Danish)
Currently translated at 100,0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Danish)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 99.7% (686 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Polish)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Arabic)
Currently translated at 97.8% (673 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 98.0% (674 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Thai)
Currently translated at 35.0% (241 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/th/
* Translated using Weblate (Chinese (Simplified))
Currently translated at 97.6% (326 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/
* Translated using Weblate (Italian)
Currently translated at 81.2% (559 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Turkish)
Currently translated at 34.9% (240 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/
* Translated using Weblate (Chinese (Simplified))
Currently translated at 86.6% (596 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 88.4% (608 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Bulgarian)
Currently translated at 15.3% (105 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/
* Added translation using Weblate (Welsh)
* Translated using Weblate (Japanese)
Currently translated at 98.8% (680 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Danish)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Danish)
Currently translated at 100.0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Welsh)
Currently translated at 2.5% (17 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 2.5% (17 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 6.4% (44 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 13.7% (94 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 13.7% (94 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 13.7% (94 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (French)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Basque)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 98.5% (678 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Occitan)
Currently translated at 97.2% (669 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Welsh)
Currently translated at 14.4% (99 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 15.6% (107 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* i18n-tasks normalize && yarn manage:translations
* Fix empty cy YML files
2018-08-31 04:28:29 +02:00
f5c052b5e6
refactor: getting-started__wrapper should contained in getting-started ( #8532 )
2018-08-31 03:43:02 +02:00
1bfe735d57
Inactive header in main profile to match column. ( #8520 )
2018-08-30 23:53:30 +02:00
c20b27a9f4
Restrict querySelectorAll to the upload form component
2018-08-30 13:20:37 +02:00
1544ac4e27
Add confirmation dialog when posting media without description
...
Fixes #211
2018-08-30 13:20:37 +02:00
5ce6727669
[Glitch] Reduce padding of profile metadata boxes to allow more text
...
Port 9463bba5fb
2018-08-29 19:28:59 +02:00
3b372c0041
Update de.json ( #8515 )
...
"was gibt's neues" -> was gibt's Neues
2018-08-29 22:39:34 +09:00
171e54eb46
Add opt-in feature to have the spoilers field always on ( fixes #634 )
2018-08-29 14:29:36 +02:00
c24491a8df
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-29 13:57:56 +02:00
702a926299
Replace '貼' with '嘟' for 'toot' ( #8421 )
...
Replace '貼' with '嘟' so the web front-end looks more consistent.
2018-08-29 18:05:22 +09:00
9463bba5fb
Reduce padding of profile metadata boxes to allow more text ( #8491 )
2018-08-29 01:20:11 +02:00
ceed1ebe5b
Fix followers/follows layout issues from #8418 ( #8505 )
...
* Add alwaysShowScrollbar prop to ScrollableList
* Fix followers/follows layout issues from #8418
2018-08-29 01:19:58 +02:00
648d6d7247
Delete .gitkeep file since the app/javascript/mastodon directory is no longer empty ( #8510 )
2018-08-29 08:10:04 +09:00
4a9e3f80e8
[Glitch] Add CSS class to replies
...
Port 2bbec9f4da
2018-08-28 19:52:47 +02:00
3b09597556
[Glitch] Preserve hashtag casing in web UI hashtag history
...
Port f9b23a5d62
2018-08-28 19:52:28 +02:00
24b6811a6e
[Glitch] Implement tag auto-completion by history
...
Port 460e380d38
2018-08-28 19:52:28 +02:00
e3246cd13b
Preserve hashtag casing in threaded mode
...
Inspired by f9b23a5d62
2018-08-28 19:52:28 +02:00
43d132039b
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-28 17:24:39 +02:00
937cd03a9a
[Glitch] Add missing video descriptions
...
Port ac092d03e7
2018-08-27 20:21:23 +02:00
3106c81b1e
[Glitch] Wait until relationship is loaded before showing follow button
...
Port cd049454be
2018-08-27 20:21:12 +02:00
2bbec9f4da
Add CSS class to replies ( #8473 )
2018-08-27 13:07:47 -04:00
53b7bb9d04
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
81697997a3
Include MOV in upload button tooltip. ( #8480 )
2018-08-27 13:05:27 +02:00
efdfea3f3c
Weblate translations (2018-08-27) ( #8483 )
...
* Translated using Weblate (French)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Greek)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Danish)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Corsican)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Danish)
Currently translated at 86.1% (589 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (French)
Currently translated at 99.4% (680 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (French)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Czech)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 98.6% (675 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.8% (683 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Arabic)
Currently translated at 0.1% (1 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Polish)
Currently translated at 98.9% (677 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Polish)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
2018-08-27 13:03:31 +02:00
b534249a8d
Add more hotkeys to legend ( #8469 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-26 20:22:16 +02:00
be20eb4b2f
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-26 18:21:33 +02:00
a791bac153
Add aria-label to notifications ( #8460 )
...
Fix #8192
2018-08-26 17:53:26 +02:00
5129f6f2aa
Add messages informing that collections are empty ( fixes #4115 ) ( #8418 )
...
* Add messages informing that collections are empty
Adds empty messages to blocked users, domain blocks, favourited statuses, users
that favourited toot, follow requests, followers of given user, user's being
followed by given user, lists, muted users, toots' boosts.
Switched from using ScrollContainer to ScrollableList and/or added empty
message's text.
Fixes #4115
* Update localization files with strings for #4115
* Fix whitespace issues pointed out by codeclimate
2018-08-26 16:39:37 +02:00
36393e1d2b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/views/layouts/application.html.haml
Edited:
app/helpers/application_helper.rb
app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
2018-08-26 14:23:24 +02:00
5c42e8b51b
Fix CW issues in static view on Safari ( Fixes #8354 ) ( #8446 )
...
* Fix CW issues in static view on Safari (8354)
* Fixed formatting issues
* Trailing space
2018-08-26 01:19:13 +02:00
df06f53f9b
Specify allowed media in upload button tooltip. ( #8443 )
2018-08-26 00:18:40 +02:00
cd049454be
Wait until relationship is loaded before showing follow button ( #8440 )
...
Fix #8410
2018-08-25 22:46:59 +02:00
800325f452
Weblate translations (2018-08-25) ( #8420 )
...
* Translated using Weblate (Georgian)
Currently translated at 99.8% (674 of 675 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/
* Translated using Weblate (Korean)
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Korean)
Currently translated at 96.8% (654 of 675 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Danish)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Danish)
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Danish)
Currently translated at 87.2% (589 of 675 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Galician)
Currently translated at 100.0% (680 of 680 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Czech)
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.4% (676 of 680 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Danish)
Currently translated at 88.0% (599 of 680 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Arabic)
Currently translated at 97.6% (664 of 680 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Japanese)
Currently translated at 99.7% (678 of 680 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Occitan)
Currently translated at 99.5% (677 of 680 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Arabic)
Currently translated at 97.9% (668 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Persian)
Currently translated at 99.7% (680 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Dutch)
Currently translated at 99.8% (681 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (681 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Japanese)
Currently translated at 0.0% (0 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 0.1% (1 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 0.1% (676 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (681 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (682 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Greek)
Currently translated at 99.8% (681 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.8% (674 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Danish)
Currently translated at 89.2% (609 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (French)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.8% (681 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (681 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (681 of 682 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Korean)
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (310 of 310 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* yarn manage:translations
* i18n-tasks normalize && i18n-tasks remove-unused
* revert
* Add defaultMessage
2018-08-25 13:27:56 +02:00
29da56cf75
Hide reject media checkbox when not relevant. ( #8426 )
2018-08-25 13:26:17 +02:00
ac092d03e7
Add missing video descriptions ( #8416 )
...
* Pass through video description as necessary.
* Add title to video, matching aria-label.
2018-08-24 23:55:41 +02:00
869a3af3c0
Reword the "Delete and rewrite" warning ( #8415 )
...
* Change "Delete and rewrite" warning
Reword the "Delete and rewrite" warning to make it clear that replies are not deleted.
* Update the French translation
Update the French translation to reflect the changes made to the "Delete and rewrite" warning.
2018-08-24 21:46:59 +02:00
Thibaut Girka
caasi Huang
Eugen Rochko
takayamaki
M Somerville
Finariel
Mélanie Chauvel (ariasuni)
Jakub Mendyk
Drew Schuster
Maciek Baron
Renato "Lond" Cerqueira
Marcin Mikołajczak
PatrickRWells
Yamagishi Kazutoshi
Sylvhem