Eugen Rochko
e5c0b16735
Add progress indicator to sign-up flow ( #24545 )
2023-04-16 07:01:24 +02:00
Eugen Rochko
c5eba06d8c
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12 20:21:32 +09:00
Claire
ce12934f5b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Claire
ff168ef202
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
Claire
10469a0b85
Move locale-data back to app/javascript/mastodon/locales/locale-data
( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
Eugen Rochko
c9f3438efe
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
Claire
02d5c69404
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
Claire
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
Claire
5c499f54e3
Change root Chewy strategy to emit a warning instead of erroring out in production mode ( #24327 )
2023-04-03 15:05:39 +02:00
Eugen Rochko
4909c2e718
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
fusagiko / takayamaki
4520e6473a
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
Claire
01d6f7529f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
Nick Schonning
500d6f93be
Autofix Rubocop Style/IdenticalConditionalBranches ( #24322 )
2023-03-31 09:33:52 +02:00
Eugen Rochko
a9b5598c97
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
Claire
e084b5b82d
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )
2023-03-27 17:07:37 +02:00
Eugen Rochko
cf12621e37
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
Claire
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
Simon Elvery
148c3d5894
Update profile link verification instructions ( #19723 )
...
Co-authored-by: Effy Elden <effy@effy.space>
2023-03-22 11:22:35 +01:00
Matt Jankowski
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
Eugen Rochko
0ca54a4105
Remove Permissions-Policy
header from all responses ( #24124 )
2023-03-20 20:02:09 +01:00
Plastikmensch
02ac94490a
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19 17:26:02 +01:00
Claire
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
Jean byroot Boussier
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17 14:37:30 +01:00
CSDUMMI
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
Claire
193250556c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
Claire
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
Eugen Rochko
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
Eugen Rochko
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
Christian Schmidt
bd047acc35
Replace Status#translatable?
with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
Eugen Rochko
630436ab2d
Refactor monkey-patching of PrivateAddressCheck
( #24122 )
2023-03-16 04:33:38 +01:00
Eugen Rochko
f0e727f958
Add cache headers to static files served through Rails ( #24120 )
2023-03-16 02:55:54 +01:00
Eugen Rochko
8cb2543ee5
Add SENDFILE_HEADER
environment variable ( #24123 )
2023-03-16 02:55:13 +01:00
Eugen Rochko
6fa81ca17e
Remove bullet
and active_record_query_trace
gems ( #24121 )
2023-03-16 02:53:55 +01:00
Claire
3ef5f62abf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
CSDUMMI
5dee40b5f5
Support the PROXY protocol through the PROXY_PROTO_V1 env variable ( #24064 )
2023-03-14 14:47:57 +01:00
Claire
f432db7b9f
Fix sidekiq jobs not triggering Elasticsearch index updates ( #24046 )
2023-03-12 23:47:55 +01:00
Nick Schonning
e594bb7d50
Convert CircleCI to GitHub Actions ( #23608 )
2023-03-07 04:49:43 +01:00
Claire
59b24c3688
Fix /api/v1/streaming
sub-paths not being redirected ( #23988 )
2023-03-06 17:44:55 +01:00
Claire
21db91a0a8
Remove sidebar dead code ( #23984 )
2023-03-06 16:25:35 +01:00
Claire
7f96391eae
Normalize translations
2023-03-05 21:31:45 +01:00
Claire
7623e18124
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
Claire
bb4e211c86
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
Eugen Rochko
dfa9843ac8
Fix pgBouncer resetting application name on every transaction ( #23958 )
2023-03-05 01:52:42 +01:00
Matt Jankowski
14f0b48fb6
Update browser gem to version 5.3.1 ( #23945 )
2023-03-05 00:33:08 +01:00
Jean byroot Boussier
922837dc96
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-04 16:38:28 +01:00
Jamie Hoyle
de137e6bb0
Added support for specifying S3 storage classes in environment ( #22480 )
2023-03-03 20:53:37 +01:00
Claire
02c6bad3ca
Change unintended SMTP read timeout from 5 seconds to 20 seconds ( #23750 )
2023-03-03 20:37:22 +01:00
Claire
f8bb4d0d6b
Fix server error when failing to follow back followers from /relationships
( #23787 )
2023-03-03 20:36:18 +01:00
Claire
276c1d32d6
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
Eugen Rochko
cb97ba7a2f
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
Claire
4ed09276d5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end of the file, while glitch-soc had its own
extra lines.
Took upstream's change.
- `CONTRIBUTING.md`:
We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
Ported upstream changes.
- `app/controllers/application_controller.rb`:
Upstream made code style changes in a method that is entirely replaced
in glitch-soc.
Ignored the change.
- `app/models/account.rb`:
Code style changes textually close to glitch-soc-specific changes.
Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream code style changes.
Ignored them.
2023-02-25 14:00:40 +01:00
Matt Jankowski
730bb3e211
Remove unused HTML Validator ( #23866 )
2023-02-24 20:06:32 +01:00
Eugen Rochko
2564117131
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00
Renaud Chaput
44a7d87cb1
Rename JSX files with proper .jsx
extension ( #23733 )
2023-02-20 03:20:59 +01:00
Claire
7452a95998
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
2023-02-19 10:42:55 +01:00
AcesFullOfKings
fef6c59b3a
Grammar fix ( #23634 )
2023-02-19 07:12:32 +01:00
Claire
4c68189d2b
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
Nick Schonning
7e215b3bda
Check for missing i18n strings in CI ( #23368 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-18 12:46:44 +01:00
Claire
2be88d1930
New Crowdin updates ( #2111 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
2023-02-18 11:16:30 +01:00
Eugen Rochko
630975bf41
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
Thijs Kinkhorst
d15a9df6fe
Fix paths with url-encoded @ to redirect to the correct path ( #23593 )
2023-02-14 19:05:57 +01:00
Claire
ce84d163cc
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end, glitch-soc had extra entries at the end.
Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
Not a real conflict, upstream added a parameter (`allowed_mentions`) where
glitch-soc already had an extra one (`content_type`).
Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
2023-02-13 19:35:35 +01:00
Nick Schonning
db2c58d47a
Enable ESLint no-useless-escape ( #23311 )
2023-02-13 15:12:14 +01:00
dependabot[bot]
31352f0d2c
Bump sidekiq-scheduler from 4.0.3 to 5.0.0 ( #23212 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13 13:31:42 +01:00
Claire
8eb74c88ec
New Crowdin updates ( #2100 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
2023-02-12 18:16:08 +01:00
Claire
87419f9307
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
Eugen Rochko
71ae17e8f5
New Crowdin updates ( #23413 )
...
* New translations en.json (Esperanto)
* New translations en.yml (Slovak)
* New translations en.json (Burmese)
* New translations en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.json (Burmese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Catalan)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Belarusian)
* New translations en.json (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Silesian)
* New translations en.yml (Occitan)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Occitan)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* Normalize
* Remove unused locales
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-11 05:42:08 +09:00
Claire
4ceadc65b0
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 13:48:21 +01:00
Nick Schonning
f23d30100a
Cleanup unused i18n strings ( #23426 )
...
* Remove partial 422/500 error translations
* Add missing siblings for i18n unused warnings
* Enable i18n unused string checking for all locales
2023-02-09 22:46:42 +09:00
Claire
85558a5e18
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Minor upstream change, our README is completely different.
Kept ours.
- `lib/tasks/assets.rake`:
glitch-soc has extra code to deal with its theming system,
upstream changed a line that exists in glitch-soc.
Applied upstream changes.
2023-02-09 12:46:12 +01:00
Eugen Rochko
e2207af3d7
New Crowdin updates ( #23393 )
...
* New translations en.yml (Portuguese)
* New translations en.yml (Romanian)
* New translations en.yml (Spanish)
* New translations en.yml (Afrikaans)
* New translations en.yml (Arabic)
* New translations en.yml (Belarusian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Basque)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Italian)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Georgian)
* New translations en.yml (Korean)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Punjabi)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Thai)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Burmese)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Uyghur)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hebrew)
* New translations en.json (Japanese)
* New translations en.json (Romanian)
* New translations en.json (Afrikaans)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Latin)
* New translations en.yml (Bosnian)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Aragonese)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Igbo)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations en.json (Kashubian)
* New translations en.yml (Kashubian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Galician)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Burmese)
* New translations en.json (Faroese)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Korean)
* New translations en.json (Portuguese)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.yml (German)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (German)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Albanian)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (French)
* New translations en.json (Czech)
* New translations simple_form.en.yml (French)
* New translations en.json (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.json (German)
* New translations en.json (English, United Kingdom)
* New translations en.json (Esperanto)
* New translations en.yml (German)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (German)
* New translations en.json (Spanish)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations en.json (Basque)
* New translations en.json (Belarusian)
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Faroese)
* New translations en.json (Faroese)
* New translations en.json (Korean)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Polish)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations activerecord.en.yml (French)
* New translations devise.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Icelandic)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Frisian)
* New translations en.json (Frisian)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-07 02:41:31 +09:00
Eugen Rochko
8651ef751e
New Crowdin updates ( #23356 )
...
* New translations en.json (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Korean)
* New translations en.yml (Esperanto)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Korean)
* New translations en.json (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (Danish)
* New translations en.yml (Slovak)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Faroese)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (French, Quebec)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Aragonese)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Scots)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Spanish, Mexico)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-04 15:46:08 +09:00
Eugen Rochko
8f590b0a21
Add setting for status page URL ( #23390 )
2023-02-04 04:56:06 +01:00
Claire
aeacebb3d7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream updated `docker/build-push-action`, and we a different config
for `docker/metadata-action` so the lines directly above were different,
but it's not a real conflict.
Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Upstream changed the codestyle near a line we had modified to accommodate
configurable character count.
Kept our change.
2023-02-03 19:23:27 +01:00
Nick Schonning
6a5e447753
Address check-i18n warnings ( #23313 )
...
* Address check-i18n warnings
* Add language names to language helpers
2023-02-02 10:14:19 +09:00
Eugen Rochko
c6ef56fd5e
Change rate limits to 1,500/5m per user, 300/5m per app ( #23347 )
2023-02-02 00:07:49 +01:00
Eugen Rochko
b8c31f8110
New Crowdin updates ( #23221 )
...
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Thai)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Burmese)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Latin)
* New translations en.yml (Bosnian)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Aragonese)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Igbo)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Finnish)
* New translations en.json (Albanian)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Faroese)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.json (Finnish)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Japanese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Korean)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Latvian)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Galician)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Galician)
* New translations en.yml (German)
* New translations en.yml (Faroese)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations en.json (Italian)
* New translations en.yml (German)
* New translations en.yml (Italian)
* New translations en.yml (Finnish)
* New translations en.yml (Hebrew)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Frisian)
* New translations en.yml (Finnish)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Italian)
* New translations en.yml (Finnish)
* New translations en.yml (Turkish)
* New translations en.yml (Estonian)
* New translations en.yml (German)
* New translations en.yml (Estonian)
* New translations en.yml (Turkish)
* New translations en.yml (Thai)
* New translations en.json (Czech)
* New translations en.json (Armenian)
* New translations en.json (Thai)
* New translations doorkeeper.en.yml (Armenian)
* New translations en.yml (Basque)
* New translations en.yml (Armenian)
* New translations en.yml (Thai)
* New translations en.yml (Basque)
* New translations en.yml (Belarusian)
* New translations en.yml (Hungarian)
* New translations en.json (Kazakh)
* New translations en.yml (Slovenian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations simple_form.en.yml (Uzbek)
* New translations activerecord.en.yml (Uzbek)
* New translations devise.en.yml (Uzbek)
* New translations doorkeeper.en.yml (Uzbek)
* New translations en.json (Kashubian)
* New translations en.yml (Kashubian)
* New translations simple_form.en.yml (Kashubian)
* New translations activerecord.en.yml (Kashubian)
* New translations devise.en.yml (Kashubian)
* New translations doorkeeper.en.yml (Kashubian)
* New translations en.json (Uzbek)
* New translations en.json (Uzbek)
* New translations en.yml (Polish)
* New translations en.json (Uzbek)
* New translations activerecord.en.yml (Uzbek)
* New translations en.json (Catalan)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations en.json (Catalan)
* New translations activerecord.en.yml (Catalan)
* New translations en.json (Uzbek)
* New translations devise.en.yml (Uzbek)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.yml (Czech)
* New translations en.yml (Slovak)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.yml (Slovenian)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.json (English, United Kingdom)
* New translations en.json (Vietnamese)
* New translations en.yml (French)
* New translations en.yml (Italian)
* New translations en.yml (French)
* New translations en.json (Catalan)
* New translations en.json (Belarusian)
* New translations en.yml (Dutch)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Basque)
* New translations doorkeeper.en.yml (Basque)
* New translations en.yml (Basque)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations activerecord.en.yml (Korean)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Spanish)
* New translations en.yml (Basque)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Slovak)
* New translations en.json (Korean)
* New translations en.json (Indonesian)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Korean)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Uzbek)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (English, United Kingdom)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Bulgarian)
* New translations en.json (Korean)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Bulgarian)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-01 19:59:31 +09:00
Claire
3074338d79
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-24 20:32:31 +01:00
Claire
dd58db64d8
Change email address input to be disabled for logged-in users when requesting a new confirmation e-mail ( #23247 )
...
Fixes #23093
2023-01-24 20:18:25 +01:00
Eugen Rochko
958955cda4
New Crowdin updates ( #23150 )
...
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations en.json (Spanish)
* New translations en.json (German)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Italian)
* New translations en.json (Polish)
* New translations en.json (Slovak)
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Faroese)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations en.json (Slovenian)
* New translations en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.json (Danish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Korean)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Hindi)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Galician)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Estonian)
* New translations en.json (Hebrew)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Portuguese)
* New translations en.yml (Slovak)
* New translations en.json (Hungarian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (French)
* New translations en.json (Slovak)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Slovak)
* New translations en.yml (Esperanto)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Norwegian)
* New translations en.json (Thai)
* New translations en.json (Basque)
* New translations en.json (Tatar)
* New translations en.json (Estonian)
* New translations en.json (Finnish)
* New translations en.json (Estonian)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Basque)
* New translations en.json (Basque)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.yml (Basque)
* New translations en.json (Arabic)
* New translations en.json (Slovak)
* New translations en.json (Kabyle)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Kabyle)
* New translations en.json (German)
* New translations en.json (Japanese)
* New translations en.json (German)
* New translations en.json (Tatar)
* New translations en.json (Occitan)
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations simple_form.en.yml (Occitan)
* New translations en.json (Tatar)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (English, United Kingdom)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Croatian)
* New translations en.json (Portuguese)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.yml (Galician)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.yml (Japanese)
* New translations en.json (Bulgarian)
* New translations en.yml (Japanese)
* New translations devise.en.yml (Bulgarian)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-24 00:37:35 +09:00
Claire
3fd3e88b25
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-21 14:58:15 +01:00
Eugen Rochko
a3f176423f
New Crowdin updates ( #23052 )
...
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Italian)
* New translations en.json (German)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.json (Portuguese)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Thai)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Thai)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Galician)
* New translations en.json (Portuguese)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Polish)
* New translations en.yml (Italian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Aragonese)
* New translations doorkeeper.en.yml (Aragonese)
* New translations en.yml (Aragonese)
* New translations simple_form.en.yml (Aragonese)
* New translations en.yml (German)
* New translations en.yml (Hebrew)
* New translations simple_form.en.yml (German)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations devise.en.yml (German)
* New translations en.yml (German)
* New translations en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Portuguese)
* New translations en.yml (Galician)
* New translations en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (Hungarian)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Thai)
* New translations en.yml (Finnish)
* New translations en.yml (Latvian)
* New translations en.yml (Portuguese)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.json (Kazakh)
* New translations en.yml (Frisian)
* New translations simple_form.en.yml (Frisian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations simple_form.en.yml (Irish)
* New translations devise.en.yml (Irish)
* New translations en.json (Persian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Welsh)
* New translations en.json (Spanish, Argentina)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (German)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.json (Latin)
* New translations en.yml (Slovak)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations en.json (Estonian)
* New translations en.yml (Belarusian)
* New translations en.json (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations en.yml (Belarusian)
* New translations en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations en.json (Asturian)
* New translations en.json (Hindi)
* New translations en.yml (Dutch)
* New translations en.yml (Swedish)
* New translations en.yml (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.yml (Slovak)
* Normalize
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-19 02:31:13 +09:00
Claire
60abcb3c4c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/i18n-tasks.yml`:
Upstream added new ignored strings, glitch-soc has extra ignored strings
because of the theming system.
Added upstream's changes.
2023-01-18 17:38:11 +01:00
Connor Shea
30e895299c
Add listing of followed hashtags ( #21773 )
...
* Add followed_tags route.
This at least gets us to the point where the page can actually be
rendered, although it doesn't display any hashtags (yet?).
Attempting to implement #20763 .
* Fix minor issues.
* I've got the followed tags data partially working
But the Hashtag component errors for some reason. Something about the
value of the history attribute being invalid.
* Fix a mistake in the code
* Minor change.
* Get the followed hashtags list fully working.
Still need to add the Follow/Unfollow buttons, though.
* Resolve JS linter issues.
* Add pagination logic to followed tags list view.
However, it currently loads further pages immediately on page load, so
that's not ideal. Need to figure that one out.
* Appease the linter.
* Apply suggestions from code review
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fixes and resolve some other feedback.
* Use set/update instead of setIn/updateIn.
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 16:44:33 +01:00
Claire
3970a6f433
Add option to make the landing page be /about even when trends are enabled ( #20808 )
...
* Add option to make the landing page be /about even when trends are enabled
* Restablish /explore as landing page by default
2023-01-18 16:43:58 +01:00
Claire
343e1fe8e9
Add confirmation screen when handling reports ( #22375 )
...
* Add confirmation screen on moderation actions
* Add flash notice when a report has been processed
* Refactor tests
* Add tests
2023-01-18 16:40:09 +01:00
Claire
fcc4c9b34a
Change domain block CSV parsing to be more robust and handle more lists ( #21470 )
...
* Change domain block CSV parsing to be more robust and handle more lists
* Add some tests
* Improve domain block import validation and reporting
2023-01-18 16:20:52 +01:00
Claire
472fd4307f
New Crowdin updates ( #2069 )
...
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]
* New translations simple_form.en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French, Quebec)
[ci skip]
* Fix pt-BR key
2023-01-18 15:50:50 +01:00
Claire
ab59743c13
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/mailer.html.haml`:
Upstream removed a line close to one modified by glitch-soc.
Removed the line as upstream did.
2023-01-14 22:34:09 +01:00
Jeong Arm
d66dfc7b3c
Change confirm prompt for relationships management ( #19411 )
...
* Change confirm prompt for relationships management
* Add Korean translations
* Apply suggestions from code review
Co-authored-by: TobyWilkes <tobylwilkes@gmail.com>
Co-authored-by: TobyWilkes <tobylwilkes@gmail.com>
2023-01-14 14:00:23 +01:00
Darius Kazemi
507e1d22f5
Allow admins to toggle public statistics API ( #22833 )
...
* Allow admins to toggle public statistics API
* Normalize i18n
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13 17:14:39 +01:00
Darius Kazemi
d35fe3d5e3
Add peers API endpoint toggle to Server Settings ( #22810 )
...
* Add peers endpoint toggle to Server Settings
This places the toggle under "Discovery" and expands the hint text to explain further what the endpoint is used for. Added a "Recommended" tag since it was recommended in v3 before it was removed.
Fixes https://github.com/mastodon/mastodon/issues/22222
* i18n normalize step
2023-01-13 16:43:17 +01:00
Claire
f79c200f7e
Change wording of admin report handling actions ( #18388 )
...
* Change admin report handling UI to display appropriate text for remote reports
Change from “Decide which action to take to resolve this report. If you take a
punitive action against the reported account, an e-mail notification will be
sent to them, except when the Spam category is selected.” to “Decide which
action to take to resolve this report. This will only affect how your server
communicates with this remote account and handle its content.”
* Reword admin actions descriptions to make clear which admin actions close reports
2023-01-13 11:03:14 +01:00
Claire
cef87ba86c
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-12 17:47:42 +01:00
Claire
ebe2c10932
Change wording of the OAuth scopes descriptions ( #22491 )
...
- change `all` from “Everything” to “Full access to your Mastodon account”
- change `follow` from “Relationships” to “Follows, Mutes and Blocks”
2023-01-12 14:11:55 +01:00
Claire
3e63fcd4f0
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Minor upstream refactor moved hook definitions around,
and glitch-soc has an extra `before_create`.
Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
Minor upstream refactor changed a block in which glitch-soc
had one extra call to handle direct timelines.
Adapted changes to keep glitch-soc's extra call.
2023-01-12 10:15:46 +01:00
Eugen Rochko
f6e34ca134
New Crowdin updates ( #22953 )
...
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.json (Belarusian)
* New translations en.json (Vietnamese)
* New translations en.json (Asturian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Danish)
* New translations en.json (Arabic)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Galician)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Hungarian)
* New translations en.yml (Russian)
* New translations en.json (Turkish)
* New translations devise.en.yml (Estonian)
* New translations en.json (Catalan)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Occitan)
* New translations en.yml (Occitan)
* New translations en.json (Finnish)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Czech)
* New translations en.json (Thai)
* New translations en.json (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Finnish)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Irish)
* New translations en.json (Korean)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Irish)
* New translations en.json (Latvian)
* New translations en.json (Spanish)
* New translations en.json (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Belarusian)
* New translations en.json (Catalan)
* New translations en.json (Finnish)
* New translations en.json (Faroese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Czech)
* New translations en.json (Frisian)
* New translations en.json (Finnish)
* New translations en.json (Dutch)
* New translations en.json (Polish)
* New translations en.json (Icelandic)
* New translations en.json (German)
* New translations en.json (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Portuguese)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Thai)
* New translations en.json (Estonian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Bulgarian)
* New translations en.json (Swedish)
* New translations en.json (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Portuguese)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Danish)
* New translations en.json (French)
* New translations en.json (Albanian)
* New translations en.yml (French)
* New translations en.yml (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Portuguese)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations en.json (Belarusian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Vietnamese)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Norwegian)
* New translations en.json (Norwegian Nynorsk)
* New translations devise.en.yml (Bulgarian)
* New translations en.yml (Galician)
* New translations en.json (Slovak)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Welsh)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Croatian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.yml (Portuguese)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Bulgarian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-11 21:41:34 +09:00
Claire
a7bf439cfd
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-10 14:43:38 +01:00
Claire
cff7d967f9
Fix CSRF protection ( #23037 )
...
Fix regression from #23014
2023-01-10 14:33:40 +01:00
Claire
9765d2b3f8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream changed headers, and we have different ones.
Ported upstream's change.
2023-01-10 09:39:15 +01:00