Commit Graph

7440 Commits

Author SHA1 Message Date
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
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
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
Thibaut Girka
246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
Eugen Rochko
a2cabf3f4a
Add admin custom CSS setting (#8399)
Fix #3894
2018-08-24 04:33:27 +02: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
Thibaut Girka
0ddf439999 Only apply CSP in production mode 2018-08-23 22:58:40 +02:00
Thibaut Girka
48db3b3c99 Tighten CSP while allowing CDN hosts 2018-08-23 22:58:40 +02:00
Thibaut Girka
478f70a0e6 Update poylfills (fixes #662) 2018-08-23 22:58:25 +02:00
Thibaut Girka
fce248810b [Glitch] Update state when opened dropdown is unmounted
Port dcd3544d153dd2a3961bd0d2214ed01a902a66da to glitch-soc
2018-08-23 22:58:14 +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
Eugen Rochko
248df68c36
Give focused status a sensible aria-label for screen readers (#8387)
* Give focused status a sensible aria-label for screen readers

Fix #8192

* Use content warning in aria-label unless expanded
2018-08-23 20:56:57 +02:00
ThibG
43b8df3228 Update state when opened dropdown is unmounted (fixes #8397) (#8398) 2018-08-23 20:43:27 +02:00
Eugen Rochko
5b5ae01824
Update light theme (#8392)
Fix #8209
Fix #7566
2018-08-23 19:20:49 +02:00
Eugen Rochko
69ba8f063c
When registrations closed, link "Sign up" to joinmastodon.org (#8395)
Fix #8393
2018-08-23 19:11:41 +02:00
Eugen Rochko
885711afb9
Fix off-by-one error in aria-posinset (#8388)
Fix #8191
2018-08-23 18:28:59 +02:00
Eugen Rochko
66dbb59aa1
Add aria-label to column regions (#8390)
Fix #4485
2018-08-23 17:26:21 +02:00
ThibG
63484ee17a Do not check for file existence when serializing ActivityPub actor (#8386)
When serializing an ActivityPub actor, Mastodon checks for the existence
of the avatar/header files. This is not necessary, only check if avatar/header
is set.

fd8bf49d38/README.md (checking-a-file-exists)
2018-08-23 16:39:22 +02:00
Jakub Mendyk
6cb3514d64 Add ability to change an instance default theme from the administration panel (#7092) (#8381)
* Add default_settings class method to ScopedSettings

ScopedSettings was extended to use value of unscoped setting instead of
only using defaults set in config/settings.yml for selected settings.
This adds possibility for admins to set default values of users' settings,
for example default theme (as requested in #7092).

* Add ability to change an instance default theme

Closes #7092
2018-08-23 14:17:35 +02:00
Sylvhem
d1c2c917d9 Major update for the French translation (#8348)
* Corrige la traduction des filtres

Corrige les erreurs de traduction présentes sur l’écran de contrôle des filtres.

Fix the translation mistakes made on the filters' control screen.

* Remplace « malvoyants » par « malvoyant·e·s »

Harmonise la traduction en remplaçant « malvoyants » par sa forme épicène.

Harmonize the translation by replacing "malvoyants" (visually impaired) by its epicene form.

* Remplace « interface-utilisateur » par « interface utilisateur·ice »

Corrige une erreur d’orthographe et harmonise la traduction en utilisant la forme épicène.

Fix a spelling mistake and harmonize the translation by using the epicen form.

* Traduction de chaînes manquantes

Traduits des chaînes manquantes.

Translate missing strings.

* Diverses corrections

Diverses corrections concernant l’orthographe, les formulations employées et les conventions utilisées.

Various fix regarding spelling, used wordings and used conventions.

* Remplace « ' » par « ’ »

Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était jusqu’ici incohérente et utilisait les deux.

Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.

* Remplace « ... » par « … »

Remplace les séries de trois points par le caractère dédié « … » (U+2026).

Replace all the series of three dots by the dedicated character "…" (U+2026).

* Ajout d’espaces insécables

Ajoute des espaces insécables suivant les régles nécessaires en typographie française.

Add non-breaking spaces following rules of French typography.

* Traduction de la nouvelle politique de confidentialité

Traduction de la nouvelle politique de confidentalité.

Translation of the new privacy policy.

* Modifications basées sur les retours

Modifie la traduction en se basant sur les premiers retours. Diverses corrections orthographiques et typographiques.

Fix the translation based on feedback. Various modifications both on spelling and typography.

* Change « non-listé » en « non listé »

Renome le niveau de confidentialité en « non listé ».

Rename the confidentiality level to "non listé".

* Modifications basées sur les retours

Modifie la traduction en se basant sur les premiers retours. Diverses corrections orthographiques et typographiques.

Fix the translation based on feedback. Various modifications both on spelling and typography.

* i18n-tasks normalize
2018-08-23 19:43:03 +09:00
Marcin Mikołajczak
b48e67fe1d i18n: fix Polish translation (#8380) 2018-08-23 19:06:02 +09:00
Marcin Mikołajczak
3cf0cc7435 i18n: Update Polish translation (#8378)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-23 00:28:23 +02:00
ThibG
42573b76f1 Do not crash if remote custom emoji does not define updated date (fixes #8376) (#8377) 2018-08-23 00:27:58 +02:00
ThibG
8aa58e34bb
Merge pull request #665 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-08-22 21:35:07 +02:00
Thibaut Girka
e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
ThibG
56f882aed6 Avoid deleted attributes when building a Status from action log (fixes #8371) (#8373) 2018-08-22 20:55:50 +02:00
Eugen Rochko
802cf6a4c5
Improve federated ID validation (#8372)
* Fix URI not being sufficiently validated with prefetched JSON

* Add additional id validation to OStatus documents, when possible
2018-08-22 20:55:14 +02:00
Thibaut Girka
628fca50e2 Override CSP setting in the embed controller to allow frames 2018-08-22 20:39:33 +02:00
Thibaut Girka
e7a72439f1 Move CSP headers to the appropriate Rails configuration
Also drop dev-static.glitch.social reference.
2018-08-22 20:39:33 +02:00
Thibaut Girka
f34616eec1 Fix locale packs loading in embed layout 2018-08-22 20:39:33 +02:00
Thibaut Girka
3c49daeb8d Add glitch-soc local setting to display reply counters
Defaults to false.
2018-08-22 20:29:55 +02:00
Thibaut Girka
d62ea55d51 Move layout options to their own section 2018-08-22 20:29:55 +02:00
Thibaut Girka
87ad942d76 [Glitch] Display replies count in web UI
Port 4df9cabb22 to glitch-soc
2018-08-22 20:29:55 +02:00
M Somerville
ad41806e53 Allow use of plurals on about page stats. (#8363) 2018-08-22 19:42:47 +02:00
Eugen Rochko
1b282299df
Add favourites to archive takeout (#8351)
Remove experimental key export
2018-08-22 19:33:10 +02:00
Thibaut Girka
801919fc9b Add hashtag trendline support to glitch-soc flavour
Port Mastodon's hashtag stats thing to glitch-soc.
This doesn't change how hashtags are ordered, and doesn't add a trending
hashtags section, but it does change how hashtag searches are rendered,
displaying a trend line alongside each hashtag.
2018-08-22 19:27:06 +02:00
Thibaut Girka
360fbf1bd4 Add pinned accounts editor 2018-08-22 16:18:23 +02:00
Thibaut Girka
9fbaaefe59 Split list editor into components and containers 2018-08-22 16:18:23 +02:00
Thibaut Girka
d69f045681 Fix ColumnLink keys in getting_started_misc 2018-08-22 16:18:23 +02:00
masarakki
4bdab203ac exclude-other-silenced-accounts (#7528) 2018-08-22 13:20:50 +02:00
Eugen Rochko
2374a00c10
Add confirmation step to account suspensions (#8353)
* Add confirmation page for suspensions

* Suspension confirmation closes reports, linked from report UI

* Fix tests
2018-08-22 11:53:41 +02:00
Eugen Rochko
28de046b8b
Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00