Eugen Rochko
cd049454be
Wait until relationship is loaded before showing follow button ( #8440 )
...
Fix #8410
2018-08-25 22:46:59 +02:00
Alexander
cfe3cd58d6
fix pam authentication for certain hostnames ( #8412 )
2018-08-25 22:35:29 +02:00
M Somerville
2a59c6a5e7
Default puma to running on localhost only. ( #8429 )
2018-08-25 21:24:20 +02:00
asonix
1854085012
Merge branch 'asonix/light-pop-theme' of asonix/mastodon into asonix/changes
2018-08-25 18:14:42 +00:00
54b9d468cb
Add light pop theme, rename 'Pop' to 'Inflate' for squeak lang
2018-08-25 13:07:28 -05:00
Eugen Rochko
93537c5560
Disable retries on all scheduled tasks ( #8413 )
2018-08-25 13:28:07 +02:00
Yamagishi Kazutoshi
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
M Somerville
95bd0d4528
Support ActivityStreams’ summaryMap. ( #8422 )
...
In the same way as contentMap and nameMap.
2018-08-25 13:27:34 +02:00
M Somerville
2bba6e582d
Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. ( #8423 )
...
Still check for S3_CLOUDFRONT_HOST for existing installs.
2018-08-25 13:27:08 +02:00
M Somerville
29da56cf75
Hide reject media checkbox when not relevant. ( #8426 )
2018-08-25 13:26:17 +02:00
Eugen Rochko
793eea2982
Add improved CLI interface for removing remote media ( #8411 )
...
./bin/tootctl media remove --days 7 --background
Make the old rake task point to it
2018-08-25 13:25:39 +02:00
MIYAGI Hikaru
b4fc810bc3
Revice Japanese translation of deleted_status
( #8419 )
...
レポート関連の翻訳にある`deleted_status`は、ステータスが削除された残骸を示すものなので、
動作ではなく名詞として翻訳する方がより適切です。
2018-08-25 10:03:35 +09:00
asonix
ed5d2a9c37
Merge branch 'asonix/fix-themes' of asonix/mastodon into asonix/changes
2018-08-24 23:54:14 +00:00
f64adca068
Fix themes
2018-08-24 18:50:15 -05:00
asonix
06b19206a5
Merge branch 'asonix/rename-theme' of asonix/mastodon into asonix/changes
2018-08-24 23:45:38 +00:00
d8ee4d9cf6
Rename 'dog' theme to 'Pop'
2018-08-24 18:43:16 -05:00
asonix
c430871001
Merge branch 'asonix/use-upstream-assets' of asonix/mastodon into asonix/changes
2018-08-24 22:53:27 +00:00
asonix
a360567a15
Merge branch 'v2.4.5-branch' of asonix/mastodon into asonix/changes
2018-08-24 22:53:00 +00:00
ee371616c3
Fix themes
2018-08-24 17:27:05 -05:00
b7dcefe02a
Set default mastodon theme, add translations
2018-08-24 17:25:12 -05:00
aafbc70eeb
Limit width
2018-08-24 17:19:54 -05:00
4a53e9d4df
Add more theme options, revert to 'sock' masto icons
2018-08-24 17:17:04 -05:00
4b5dc3422d
Merge branch 'asonix/changes' into v2.4.5-branch
2018-08-24 17:05:33 -05:00
M Somerville
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
Sylvhem
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
Eugen Rochko
add3b63a0c
Bump version to 2.4.5
2018-08-24 20:11:40 +02:00
Eugen Rochko
221c8c771f
Prevent ActivityPub movedTo recursion ( #8092 )
...
Fix #8051
2018-08-24 20:11:16 +02:00
ThibG
a16d41e9fb
Fix FixAccountsUniqueIndex migration ( #8212 )
2018-08-24 20:10:18 +02:00
ThibG
f6ad5edbaa
Make some migration script more robust ( fixes #8007 ) ( #8170 )
...
Include a dummy Account class in the migration script containing only the
attributes relevant to the migration in order to not rely as much on the
codebase being in sync with the database schema.
2018-08-24 20:09:57 +02:00
Akihiko Odaki
3f4812c583
Fix index detection a migration to revert index change ( #8026 )
2018-08-24 20:09:13 +02:00
Eugen Rochko
86792bd309
Upgrade Doorkeeper to 5.0.0 ( #8409 )
...
See doorkeeper-gem/doorkeeper#1137
2018-08-24 20:06:50 +02:00
Eugen Rochko
b37ae64578
Upgrade Doorkeeper to 5.0.0 ( #8409 )
...
See doorkeeper-gem/doorkeeper#1137
2018-08-24 18:17:11 +02:00
MIYAGI Hikaru
a083604d1d
Support UNIX domain socket for streaming service without using PORT ( #8217 )
...
* Support UNIX domain socket for streaming service without using PORT
The use of UNIX domain socket for streaming service was not officially supported,
but it was made unofficial to use by setting a path to PORT.
From now on, SOCKET will be used just like setting for puma.
* Hundle relative path
2018-08-24 18:16:53 +02:00
asonix
0ab4dc8a5f
Merge branch 'asonix/link-to-others' of asonix/mastodon into asonix/changes
2018-08-24 13:21:08 +00:00
Ceralor
d04b032340
Added bitbucket, picarto, twitch, and reddit formats
2018-08-24 00:08:29 -05:00
39992f55c1
Add telegram link
2018-08-23 23:57:37 -05:00
asonix
85a01c54c4
Merge branch 'fix-locales' of asonix/mastodon into asonix/changes
2018-08-24 04:43:23 +00:00
0fd274e507
Don't call squeak 'en'
2018-08-23 23:41:54 -05:00
asonix
b9c86b6ccb
Merge branch 'fix-locales' of asonix/mastodon into asonix/changes
2018-08-24 04:23:46 +00:00
6d5d064461
Add option in UI for Squeak, use :en as fallback
2018-08-23 23:21:39 -05:00
asonix
3a98854fc4
Merge branch 'ceralor/changes' of asonix/mastodon into asonix/changes
2018-08-24 03:49:19 +00:00
Ceralor
589af2a0ab
Added squeak language, default to en
2018-08-23 22:42:40 -05:00
Eugen Rochko
a2cabf3f4a
Add admin custom CSS setting ( #8399 )
...
Fix #3894
2018-08-24 04:33:27 +02:00
asonix
1b2f5bf6d1
Merge branch 'v2.4.4-branch' of asonix/mastodon into asonix/changes
2018-08-23 21:58:42 +00:00
8ab0d203a3
Merge branch 'asonix/changes' into v2.4.4-branch
2018-08-23 16:52:46 -05:00
Eugen Rochko
23752639b2
Bump version to 2.5.0rc1 ( #8356 )
2018-08-23 23:30:57 +02:00
Eugen Rochko
2f34b747b3
Allow mods to disable login, improve message when login disabled ( #8329 )
...
* Allow moderators to disable/enable login
* Instead of rejecting login, show forbidden error when login disabled
Avoid confusion because when login is rejected, the message is that
the account is not activated, which is wrong.
* Fix tests
2018-08-23 23:26:29 +02:00
Eugen Rochko
9d58daac6c
Fix regression when suspending not from report ( #8400 )
...
Regression from #8353
2018-08-23 21:51:56 +02:00
ThibG
7786e1357b
Only display web push notifications after API call ( fixes #7902 ) ( #8396 )
...
* Only display web push notifications after API call (fixes #7902 )
* Decode then truncate instead of truncating then decoding in webpush serializer
2018-08-23 21:44:27 +02:00
Eugen Rochko
f9b23a5d62
Preserve hashtag casing in web UI hashtag history ( #8394 )
...
Fix #8241
2018-08-23 21:21:15 +02:00