Thibaut Girka
1295515bd4
[Glitch] Add missing video descriptions
...
Port 5b773a2c9c
to glitch-soc
6 years ago
Thibaut Girka
2f8583ce4a
[Glitch] Wait until relationship is loaded before showing follow button
...
Port 38f6a43960
to glitch-soc
6 years ago
Thibaut Girka
4f4908311d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
6 years ago
M Somerville
077dbaedf3
Include MOV in upload button tooltip. ( #8480 )
6 years ago
Renato "Lond" Cerqueira
c13f14b627
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
6 years ago
M Somerville
9fe24fbf4b
Better singulars of account followers/toots. ( #8471 )
6 years ago
Jakub Mendyk
9c11d260e1
Make Api::V1::MutesController paginate properly ( #8472 )
...
Fixes #8463
6 years ago
Marcin Mikołajczak
86d4f4cfa9
Add more hotkeys to legend ( #8469 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
Eugen Rochko
1d319c531e
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
6 years ago
Eugen Rochko
f9836d593c
Bump interactions count when a follow happens ( #8468 )
6 years ago
Quint Guvernator
476ba6e4f0
Fix low-hanging rubocop gripes ( #8458 )
...
* rubocop: quit being so picky
* rubocop: miscellany
* rubocop: prefer present to blank
6 years ago
Thibaut Girka
7e6a029f1b
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
d370fccf92
Add aria-label to notifications ( #8460 )
...
Fix #8192
6 years ago
Eugen Rochko
63859550d3
Delay e-mail notifications by 2 minutes ( #8438 )
...
Fix #8430
6 years ago
Jakub Mendyk
6fae7f6a04
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
6 years ago
Thibaut Girka
21641e9a82
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Tad Thorley
c0bfd1a830
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)
6 years ago
Eugen Rochko
f27c511e1c
Fix regression from #8439 ( #8455 )
...
Missing no-reduce-motion/reduce-motion body class
6 years ago
Thibaut Girka
ae4240d236
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.
6 years ago
PatrickRWells
f89bd5fca5
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
6 years ago
Eugen Rochko
3f59f13506
Spread out crawling randomly to avoid DDoSing the link ( #8445 )
...
* Spread out crawling randomly to avoid DDoSing the link
Fix #4486
* Remove trailing whitespace
6 years ago
M Somerville
a75f71380a
Specify allowed media in upload button tooltip. ( #8443 )
6 years ago
Eugen Rochko
660475198b
Add theme identifier to body classes for easier custom CSS styling ( #8439 )
...
Add forgotten custom CSS admin setting strings
6 years ago
Eugen Rochko
38f6a43960
Wait until relationship is loaded before showing follow button ( #8440 )
...
Fix #8410
6 years ago
Eugen Rochko
fddae332aa
Disable retries on all scheduled tasks ( #8413 )
6 years ago
Yamagishi Kazutoshi
db91d0dcc7
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
6 years ago
M Somerville
777e09500e
Support ActivityStreams’ summaryMap. ( #8422 )
...
In the same way as contentMap and nameMap.
6 years ago
M Somerville
f1a00fbbcf
Hide reject media checkbox when not relevant. ( #8426 )
6 years ago
Eugen Rochko
e6e845f74d
Add improved CLI interface for removing remote media ( #8411 )
...
./bin/tootctl media remove --days 7 --background
Make the old rake task point to it
6 years ago
M Somerville
5b773a2c9c
Add missing video descriptions ( #8416 )
...
* Pass through video description as necessary.
* Add title to video, matching aria-label.
6 years ago
Sylvhem
f48a255bde
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.
6 years ago
Thibaut Girka
69212ed0ad
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/application_controller.rb
Changed instance theme selection by instance flavour selection.
6 years ago
Eugen Rochko
94b7dddeac
Add admin custom CSS setting ( #8399 )
...
Fix #3894
6 years ago
Eugen Rochko
413a28499d
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
6 years ago
Thibaut Girka
d864885728
Update poylfills ( fixes #662 )
6 years ago
Thibaut Girka
c4a536917c
[Glitch] Update state when opened dropdown is unmounted
...
Port dcd3544d153dd2a3961bd0d2214ed01a902a66da to glitch-soc
6 years ago
Eugen Rochko
335b1520bb
Fix regression when suspending not from report ( #8400 )
...
Regression from #8353
6 years ago
ThibG
e4f3f34fb6
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
6 years ago
Eugen Rochko
81df5716b9
Preserve hashtag casing in web UI hashtag history ( #8394 )
...
Fix #8241
6 years ago
Eugen Rochko
f922c683ce
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
6 years ago
ThibG
b064ddccc5
Update state when opened dropdown is unmounted ( fixes #8397 ) ( #8398 )
6 years ago
Eugen Rochko
5cb55f486b
Update light theme ( #8392 )
...
Fix #8209
Fix #7566
6 years ago
Eugen Rochko
0c6c9b733a
When registrations closed, link "Sign up" to joinmastodon.org ( #8395 )
...
Fix #8393
6 years ago
Eugen Rochko
8793403289
Fix off-by-one error in aria-posinset ( #8388 )
...
Fix #8191
6 years ago
Eugen Rochko
f530792615
Add aria-label to column regions ( #8390 )
...
Fix #4485
6 years ago
ThibG
49f53047ff
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)
6 years ago
Jakub Mendyk
289b4f2838
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
6 years ago
Sylvhem
3e3de891ac
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
6 years ago
ThibG
5da13c3980
Do not crash if remote custom emoji does not define updated date ( fixes #8376 ) ( #8377 )
6 years ago
Thibaut Girka
86d2a9d480
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago