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
b31449cd77
Better singulars of account followers/toots. ( #8471 )
2018-08-26 21:30:53 +02:00
f3a12ddfd0
Make Api::V1::MutesController paginate properly ( #8472 )
...
Fixes #8463
2018-08-26 21:30:17 +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
cabdbb7f9c
Add CLI task for rotating keys ( #8466 )
...
* If an Update is signed with known key, skip re-following procedure
Because it means the remote actor did *not* lose their database
* Add CLI method for rotating keys
bin/tootctl accounts rotate [USERNAME]
Generates a new RSA key per account and sends out an Update activity
signed with the old key.
* Key rotation: Space out Update fan-outs every 5 minutes per 1000 accounts
* Skip suspended accounts in key rotation
2018-08-26 20:21:03 +02:00
8adf485c0f
Bump interactions count when a follow happens ( #8468 )
2018-08-26 20:02:45 +02:00
da13fa5021
Fix low-hanging rubocop gripes ( #8458 )
...
* rubocop: quit being so picky
* rubocop: miscellany
* rubocop: prefer present to blank
2018-08-26 19:22:46 +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
55c856c522
Delay e-mail notifications by 2 minutes ( #8438 )
...
Fix #8430
2018-08-26 16:53:19 +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
5eb3b8522e
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-26 14:39:16 +02:00
104d089df1
Update _bio.html.haml ( #8449 )
...
On my local instance (https://ruby.social ) we have a custom emoji for octocat (:octocat:). I would love to be able to use the emoji in the metadata for my profile. Instead of:
| github | https://github.com/phaedryx
It could be:
| :octocat: | https://github.com/phaedryx
(using a single emoji makes it easier to read the urls)
2018-08-26 14:33:59 +02:00
6c9be61f57
Fix regression from #8439 ( #8455 )
...
Missing no-reduce-motion/reduce-motion body class
2018-08-26 14:29:58 +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
b4ba4b1b5d
Spread out crawling randomly to avoid DDoSing the link ( #8445 )
...
* Spread out crawling randomly to avoid DDoSing the link
Fix #4486
* Remove trailing whitespace
2018-08-26 00:33:57 +02:00
df06f53f9b
Specify allowed media in upload button tooltip. ( #8443 )
2018-08-26 00:18:40 +02:00
22e46ebad8
Add theme identifier to body classes for easier custom CSS styling ( #8439 )
...
Add forgotten custom CSS admin setting strings
2018-08-25 22:55:25 +02:00
cd049454be
Wait until relationship is loaded before showing follow button ( #8440 )
...
Fix #8410
2018-08-25 22:46:59 +02:00
93537c5560
Disable retries on all scheduled tasks ( #8413 )
2018-08-25 13:28:07 +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
95bd0d4528
Support ActivityStreams’ summaryMap. ( #8422 )
...
In the same way as contentMap and nameMap.
2018-08-25 13:27:34 +02:00
29da56cf75
Hide reject media checkbox when not relevant. ( #8426 )
2018-08-25 13:26:17 +02:00
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
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
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
a2cabf3f4a
Add admin custom CSS setting ( #8399 )
...
Fix #3894
2018-08-24 04:33:27 +02:00
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
478f70a0e6
Update poylfills ( fixes #662 )
2018-08-23 22:58:25 +02:00
fce248810b
[Glitch] Update state when opened dropdown is unmounted
...
Port dcd3544d153dd2a3961bd0d2214ed01a902a66da to glitch-soc
2018-08-23 22:58:14 +02:00
9d58daac6c
Fix regression when suspending not from report ( #8400 )
...
Regression from #8353
2018-08-23 21:51:56 +02:00
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
f9b23a5d62
Preserve hashtag casing in web UI hashtag history ( #8394 )
...
Fix #8241
2018-08-23 21:21:15 +02:00
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
43b8df3228
Update state when opened dropdown is unmounted ( fixes #8397 ) ( #8398 )
2018-08-23 20:43:27 +02:00
5b5ae01824
Update light theme ( #8392 )
...
Fix #8209
Fix #7566
2018-08-23 19:20:49 +02:00
69ba8f063c
When registrations closed, link "Sign up" to joinmastodon.org ( #8395 )
...
Fix #8393
2018-08-23 19:11:41 +02:00
885711afb9
Fix off-by-one error in aria-posinset ( #8388 )
...
Fix #8191
2018-08-23 18:28:59 +02:00
66dbb59aa1
Add aria-label to column regions ( #8390 )
...
Fix #4485
2018-08-23 17:26:21 +02:00
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
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
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
42573b76f1
Do not crash if remote custom emoji does not define updated date ( fixes #8376 ) ( #8377 )
2018-08-23 00:27:58 +02:00
e70fc059a9
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-22 20:56:32 +02:00
56f882aed6
Avoid deleted attributes when building a Status from action log ( fixes #8371 ) ( #8373 )
2018-08-22 20:55:50 +02:00
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
M Somerville
Renato "Lond" Cerqueira
Jakub Mendyk
Marcin Mikołajczak
Eugen Rochko
Quint Guvernator
Tad Thorley
PatrickRWells
Yamagishi Kazutoshi
Sylvhem