Eugen Rochko
075e162319
Whitelist report notification param in Settings::NotificationsController ( #8560 )
...
Bug in #8559
2018-09-02 02:05:32 +02:00
Eugen Rochko
c593d6df9c
Add preference for report notification e-mails, skip for duplicates ( #8559 )
...
If an unresolved report for the same target account already exists,
no new notification is generated
2018-09-02 00:11:58 +02:00
M Somerville
a060beee72
Skip VS15 (Emoji textual presentation). ( #8553 )
...
Mastodon converts all Emoji to images, whether they have a VS15 after
them or not, but leaves the VS15 in the string, which is displayed as
a black box in Safari.
2018-09-01 19:42:02 +02:00
Yamagishi Kazutoshi
5c609c7419
Integrating :one
and :other
in ar.yml ( #8555 )
2018-09-01 19:41:21 +02:00
ThibG
2b82829a53
Merge pull request #699 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-09-01 17:44:06 +02:00
Thibaut Girka
a74a7d5fe3
Merge branch 'master' into glitch-soc/merge-upstream
2018-09-01 17:23:46 +02:00
Yamagishi Kazutoshi
0e661dd2e9
Fix static URL when disable autoplay ( #8548 )
2018-09-01 16:09:24 +02:00
Thibaut Girka
cc7adf7e84
Fix composer not displaying on chrome mobile ( fixes #696 )
2018-09-01 09:39:25 +02:00
Eugen Rochko
08721170da
Bump version to 2.5.0rc2
2018-09-01 03:37:43 +02:00
trwnh
6a147f8377
Fix the display of missing lists ( #8523 )
...
* Fix the display of missing lists
See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions.
* import ColumnBackButton
missed the import with the first commit
2018-09-01 03:36:36 +02:00
Eugen Rochko
50f226348f
Fix wrong string being used on login failure when using LDAP ( #8534 )
...
Fix #8527
2018-09-01 03:35:37 +02:00
ThibG
fd2c7aa8ec
Merge pull request #694 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-31 20:56:22 +02:00
ThibG
45c0f5433c
Do not show follow button on moved or memorial accounts ( #8546 )
...
This restores the logic from before the public profile redesign. Fixes #8503
2018-08-31 20:33:01 +02:00
Thibaut Girka
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
Thibaut Girka
c6942a5283
Add option to not automatically unfold content warnings matching a regexp
...
Fixes #678
2018-08-31 18:35:03 +02:00
Thibaut Girka
5c400a2842
Allow text inputs in local settings dialog
2018-08-31 18:35:03 +02:00
Thibaut Girka
9d2739d74d
Add a setting to automatically unfold all content warnings
2018-08-31 18:35:03 +02:00
Thibaut Girka
130bdb5ee8
[Glitch] Show compose form on delete & redraft when in mobile layout
...
Port 025fbb8285
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
0f1db47a7e
Fix search results on compose box
2018-08-31 18:33:46 +02:00
Thibaut Girka
b4f548fa18
Fix account header showing on search page
2018-08-31 18:33:46 +02:00
Thibaut Girka
4a686ddf8a
[Glitch] On the mobile UI, move the search column to the right
...
Port 20bb90ced6
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
4686b3fa76
[Glitch] Hide search from Compose on mobile devices
...
Port 0893b16695
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
37a00d4c1d
[Glitch] Add search item to tab bar for mobile devices
...
Port c9cbb8de70
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
76a3f373e3
[Glitch] Use withRouter for TabsBar
...
Port 61e6275781
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
5f035a2a1a
[Glitch] Move "compose" on mobile to floating action button
...
Port e72db6d9dd
to glitch-soc
2018-08-31 18:33:46 +02:00
Thibaut Girka
70c308c4aa
[Glitch] When search enabled, display hint in search popout
...
Port 7901f9f63e
to glitch-soc
2018-08-31 18:33:46 +02:00
caasi Huang
55880c7098
Translate more messages to Traditional Chinese ( #8543 )
2018-08-31 23:22:03 +09:00
ThibG
0b62585748
Self-notify on accepting follow requests ( #8541 )
2018-08-31 15:17:31 +02:00
Renato "Lond" Cerqueira
fe56d26f7b
Fix autoplay issue with spoiler tag ( #8540 )
...
Add tests to avoid similar issues in the future
2018-08-31 15:16:59 +02:00
Yamagishi Kazutoshi
50d8cf8aed
Save button for relays translatable ( #8539 )
2018-08-31 15:15:21 +02:00
Yamagishi Kazutoshi
11c515e7e2
Normalize Welsh ( #8538 )
2018-08-31 15:12:06 +02:00
Eugen Rochko
562250246c
Add Welsh language option ( #8536 )
2018-08-31 18:16:19 +09:00
Eugen Rochko
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
Eugen Rochko
e3764bdb52
Do not sign useless User-Agent or Accept-Encoding headers ( #8533 )
...
Fix #8080
2018-08-31 04:22:52 +02:00
mayaeh
18eb565755
Add --verbose and --dry-run option to tootctl media remove ( #8519 )
...
* Add --verbose and --dry-run options to CLI interface for removing remote media.
* Fix coding style problem.
2018-08-31 03:46:13 +02:00
takayamaki
f5c052b5e6
refactor: getting-started__wrapper should contained in getting-started ( #8532 )
2018-08-31 03:43:02 +02:00
M Somerville
1bfe735d57
Inactive header in main profile to match column. ( #8520 )
2018-08-30 23:53:30 +02:00
Renato "Lond" Cerqueira
11658d8653
Add animate custom emoji param to embed pages ( #8507 )
...
* Add animate custom emoji param to embed pages
* Rename param, use it for avatars and gifs
* Fix issues pointed by codeclimate and breaking test
* Ignore brakeman warning
2018-08-30 23:14:01 +02:00
Thibaut Girka
5d647197ec
Add bookmarks to archive takeout
2018-08-30 16:29:47 +02:00
Thibaut Girka
c20b27a9f4
Restrict querySelectorAll to the upload form component
2018-08-30 13:20:37 +02:00
Thibaut Girka
1544ac4e27
Add confirmation dialog when posting media without description
...
Fixes #211
2018-08-30 13:20:37 +02:00
Renato "Lond" Cerqueira
5b2b493a90
Fix nil host in remotable ( #8508 )
...
Host can be nil in urls like
'https:https://example.com/path/file.png '
2018-08-29 21:13:49 +02:00
Thibaut Girka
5ce6727669
[Glitch] Reduce padding of profile metadata boxes to allow more text
...
Port 9463bba5fb
to glitch-soc
2018-08-29 19:28:59 +02:00
mayaeh
cc26fd71ac
Fix CLI interface for removing remote media ( #8506 )
...
* Fix that can't delete media files even if "tootctl media remove" execute when "--background" not attached.
* Revert
This reverts commit 5aa7e09645b27bae38a26030148b23e553ee2662.
* Change to obtain and pass all columns when "--background" option is false.
2018-08-29 18:35:09 +02:00
Finariel
3b372c0041
Update de.json ( #8515 )
...
"was gibt's neues" -> was gibt's Neues
2018-08-29 22:39:34 +09:00
Thibaut Girka
171e54eb46
Add opt-in feature to have the spoilers field always on ( fixes #634 )
2018-08-29 14:29:36 +02:00
ThibG
1b479f08c5
Merge pull request #690 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-29 14:23:45 +02:00
Thibaut Girka
c24491a8df
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-29 13:57:56 +02:00
caasi Huang
702a926299
Replace '貼' with '嘟' for 'toot' ( #8421 )
...
Replace '貼' with '嘟' so the web front-end looks more consistent.
2018-08-29 18:05:22 +09:00
Satsuki Yanagi
ad94e1d50a
Add ffmpeg buildpack for scalingo ( #8500 )
...
* Add ffmpeg buildpack for scalingo.
* Add environment variable to install ffprobe
Note: For existing applications, admins needs to add 'WITH_FFPROBE=true' to environment variable.
2018-08-29 01:21:23 +02:00