github-actions[bot]
73ecc4de6e
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 16:26:51 +02:00
Claire
1e87575b70
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
2023-09-19 12:53:32 +02:00
github-actions[bot]
67eaaa4b90
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 10:41:48 +02:00
github-actions[bot]
1b4902fabf
New Crowdin Translations (automated) ( #26913 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-18 13:46:07 +02:00
Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Claire
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
github-actions[bot]
921c6fe654
New Crowdin Translations (automated) ( #26498 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-13 15:10:41 +02:00
Claire
9c1ef8302a
Add some information about Full-text search being disabled in search popout ( #26756 )
2023-09-06 17:23:58 +02:00
Eugen Rochko
5d20733d8d
Add infinite scrolling for search results in web UI ( #26784 )
2023-09-05 23:54:24 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
3c7dbf3a16
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Stanislas Signoud
40b69cc1cd
Add an explanation banner on switching to single column mode ( #26019 )
2023-08-31 12:18:46 +02:00
Eugen Rochko
bceb893159
Add search options to search popout in web UI ( #26662 )
2023-08-28 13:18:39 +02:00
Eugen Rochko
71641766f2
Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )
2023-08-25 22:03:04 +02:00
Claire
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Claire
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
Claire
0446394465
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
Claire
df6e719898
Add display of out-of-band hashtags in the web interface ( #26492 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 23:42:30 +02:00
github-actions[bot]
c452ccd913
New Crowdin Translations (automated) ( #26444 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-14 14:54:31 +02:00
Claire
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
github-actions[bot]
8cbf4a5296
New Crowdin Translations (automated) ( #26373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-10 09:47:42 +02:00
github-actions[bot]
d2dbaba407
New Crowdin Translations (automated) ( #26209 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-07 13:37:54 +02:00
Eugen Rochko
e325443b02
Change header of hashtag timelines in web UI ( #26362 )
2023-08-07 09:46:11 +02:00
CSDUMMI
120f5802c0
Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )
2023-08-03 16:43:15 +02:00
Claire
92fa9d34b0
Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
Small conflict due to our theming system.
- `streaming/index.js`:
Upstream refactored part of the streaming server.
We had some extra logic for handling local-only posts.
Applied the refactor.
2023-07-30 16:11:55 +02:00
Claire
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Claire
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Claire
a4ec187a20
Change the wording of the dismissable explore prompt ( #25917 )
2023-07-27 16:51:02 +02:00
Claire
b4e739ff0f
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
github-actions[bot]
b9adea9695
New Crowdin Translations (automated) ( #26072 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-26 13:46:16 +02:00
Eugen Rochko
6b2952d1dd
Change design of link previews in web UI ( #26136 )
2023-07-24 13:47:28 +02:00
наб
1b4cf0eba0
Favourits -> Favorites ( #26109 )
2023-07-21 21:13:20 +02:00
gunchleoc
217ef7f2af
Replace 'favourite' by 'favorite' for American English ( #26009 )
2023-07-21 19:09:13 +02:00
Claire
0092fe50ac
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
github-actions[bot]
47832a1ac0
New Crowdin Translations (automated) ( #26054 )
...
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 21:13:25 +02:00
Claire
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Stanislas Signoud
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Renaud Chaput
a7253075d1
Upgrade to typescript-eslint
v6 ( #25904 )
2023-07-13 11:49:16 +02:00
Claire
dd0002e1fe
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
2023-07-12 15:38:35 +02:00
Claire
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
Eugen Rochko
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
Eugen Rochko
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Claire
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Eugen Rochko
b7910bc751
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
Eugen Rochko
54a10523e2
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Claire
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
Claire
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Claire
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Eugen Rochko
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Claire
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Eugen Rochko
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Eugen Rochko
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Claire
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
Renaud Chaput
1cb4514d0e
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
Eugen Rochko
432a5d2d4b
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
Claire
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
Claire
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
Claire
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
Claire
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
Claire
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
Eugen Rochko
67d17ce194
Add legal
as report category ( #23941 )
2023-06-06 23:41:59 +02:00
Eugen Rochko
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
Claire
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
Darius Kazemi
bacb674921
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
Eugen Rochko
4a5464f360
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
2023-06-05 01:42:17 +02:00
Renaud Chaput
b0780cfeed
Fix /share
and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
Claire
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
Renaud Chaput
44cd88adc4
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
Claire
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
Claire
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
Renaud Chaput
e58c36d308
Update inconsistent defaultMessage
( #25114 )
2023-05-24 12:38:50 +02:00
Steven Munn
52d36f0f98
Fix spelling of "Lets" on the onboarding page after clicking the confirmation email ( #24959 )
...
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-15 22:42:07 +02:00
Eugen Rochko
3869e8c210
Change "Sign in" to "Login" ( #24942 )
2023-05-10 20:17:55 +02:00
Renaud Chaput
5eeb40bdbe
Add stricter ESLint rules for Typescript files ( #24926 )
2023-05-10 12:59:29 +02:00
Claire
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Eugen Rochko
0a08e9d3d3
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
Claire
12b935fadf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
Eugen Rochko
8979b70975
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
Eugen Rochko
7cf963eec2
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
Eugen Rochko
d4511f2a76
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
Eugen Rochko
c35e3cb6ac
Add more tips to onboarding flow in web UI ( #24646 )
2023-04-25 11:12:37 +02:00
Nick Schonning
2daa5a1549
Enable formatjs/prefer-pound-in-plural ( #24622 )
2023-04-24 08:07:19 +02:00
Nick Schonning
ef3675d688
Remove empty Kushubian (csb) local files ( #24151 )
2023-04-23 22:43:12 +02:00
Eugen Rochko
0461f83320
Add new onboarding flow to web UI ( #24619 )
2023-04-23 22:24:53 +02:00
Eugen Rochko
9d75b03ba4
New Crowdin updates ( #24517 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-22 19:37:41 +09:00
Claire
abfdafef1e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
Upstream removed a method close to a glitch-soc theming-related method.
Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
Claire
f9a9f9344b
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
Eugen Rochko
955ec252a4
Add client-side validation for taken username in sign-up form ( #24546 )
2023-04-16 02:10:48 +02:00
Ivan Rodriguez
f05fb51ecb
Fix status title for statuses without text ( #24359 )
2023-04-14 17:29:09 +02:00
Claire
8f0b0435ab
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2023-04-12 15:24:45 +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
Eugen Rochko
cee357d538
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
Claire
c11e69f33a
Move glitch-soc-only translation strings out of app/javascript/mastodono/locales
2023-04-09 15:53:45 +02: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
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
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +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
Eugen Rochko
2b11376411
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +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
Eugen Rochko
68a192e718
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +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
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
Eugen Rochko
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09: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
PauloVilarinho
8770473dbb
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +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
Eugen Rochko
2564117131
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09: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
Eugen Rochko
630975bf41
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09: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
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
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
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
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
Claire
3588fbc766
Fix confusing wording in the sign in banner ( #22490 )
...
* Fix confusing wording in the sign in banner
* Split into two sentences
2023-01-18 17:15:23 +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
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
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
n0toose
105e1f0ca6
Correct hashtag warning ( #22827 )
...
Posts with any visibility setting that is not 'Public' are prevented
from being listed under any hashtag.
2023-01-09 03:18:20 +01:00
Eugen Rochko
d11d15748c
New Crowdin updates ( #22901 )
...
* New translations en.json (Norwegian)
* New translations en.json (English, United Kingdom)
* New translations en.yml (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.yml (Norwegian)
* New translations simple_form.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations en.yml (Hebrew)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.yml (Finnish)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Bulgarian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Finnish)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.yml (Esperanto)
* New translations en.json (Estonian)
* 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 (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
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Dutch)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Indonesian)
* New translations en.json (Latvian)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Serbian (Latin))
* New translations simple_form.en.yml (Galician)
* New translations en.json (Danish)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.yml (Japanese)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-06 01:03:53 +09:00
Claire
6c20dad201
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, while we have a completely different one.
Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
Conflict because of glitch-soc's theming system.
Additionally, glitch-soc has different behavior regarding moved accounts.
Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05 14:16:25 +01:00
Sean Whalen
8cff96d94d
Replace hide toot with hide post ( #22385 )
...
* Change "Hide toot" to "Hide post"
* Update status_action_bar.js
Replace "Hide toot" with "Hide post"
2023-01-05 13:45:01 +01:00
Claire
b4aabf3cf1
Merge branch 'main' into glitch-soc/merge
2023-01-02 17:29:59 +01:00
Eugen Rochko
41fe7576bf
New Crowdin updates ( #22560 )
...
* New translations devise.en.yml (Slovak)
* New translations devise.en.yml (Slovenian)
* New translations devise.en.yml (Albanian)
* New translations devise.en.yml (Serbian (Cyrillic))
* New translations devise.en.yml (Swedish)
* New translations devise.en.yml (Turkish)
* New translations devise.en.yml (Ukrainian)
* New translations devise.en.yml (Chinese Simplified)
* New translations devise.en.yml (Chinese Traditional)
* New translations devise.en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Vietnamese)
* New translations devise.en.yml (Galician)
* New translations devise.en.yml (Icelandic)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Indonesian)
* New translations devise.en.yml (Persian)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Bengali)
* New translations devise.en.yml (Thai)
* New translations devise.en.yml (Croatian)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Kazakh)
* New translations devise.en.yml (Estonian)
* New translations devise.en.yml (Latvian)
* New translations devise.en.yml (Hindi)
* New translations devise.en.yml (Malay)
* New translations devise.en.yml (English, United Kingdom)
* New translations devise.en.yml (Welsh)
* New translations devise.en.yml (Faroese)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Tatar)
* New translations devise.en.yml (Malayalam)
* New translations devise.en.yml (Breton)
* New translations devise.en.yml (French, Quebec)
* New translations devise.en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations devise.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Asturian)
* New translations devise.en.yml (Aragonese)
* New translations devise.en.yml (Occitan)
* New translations devise.en.yml (Serbian (Latin))
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Scots)
* New translations devise.en.yml (Corsican)
* New translations devise.en.yml (Sardinian)
* New translations devise.en.yml (Kabyle)
* New translations devise.en.yml (Ido)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Spanish)
* New translations doorkeeper.en.yml (Afrikaans)
* New translations doorkeeper.en.yml (Arabic)
* New translations doorkeeper.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (Czech)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (Basque)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Irish)
* New translations doorkeeper.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Armenian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Georgian)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Portuguese)
* New translations doorkeeper.en.yml (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Galician)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Persian)
* New translations doorkeeper.en.yml (Tamil)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Marathi)
* New translations doorkeeper.en.yml (Thai)
* New translations doorkeeper.en.yml (Croatian)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Hindi)
* New translations doorkeeper.en.yml (Malay)
* New translations doorkeeper.en.yml (Welsh)
* New translations doorkeeper.en.yml (Faroese)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Tatar)
* New translations doorkeeper.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Breton)
* New translations doorkeeper.en.yml (French, Quebec)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Asturian)
* New translations doorkeeper.en.yml (Aragonese)
* New translations doorkeeper.en.yml (Occitan)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Scots)
* New translations doorkeeper.en.yml (Corsican)
* New translations doorkeeper.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Kannada)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.json (Italian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Arabic)
* New translations en.yml (Frisian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.yml (Estonian)
* New translations en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Asturian)
* New translations en.yml (Vietnamese)
* New translations en.json (Bulgarian)
* New translations en.json (Estonian)
* New translations en.json (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Bulgarian)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Catalan)
* New translations en.yml (Asturian)
* New translations en.json (Catalan)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations doorkeeper.en.yml (Latvian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.yml (Indonesian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.json (Latvian)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (Estonian)
* New translations en.json (Hebrew)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (German)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (German)
* New translations en.yml (Polish)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.yml (German)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.json (Taigi)
* New translations en.yml (Frisian)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Frisian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Frisian)
* New translations en.json (Vietnamese)
* New translations en.json (English, United Kingdom)
* New translations en.yml (Frisian)
* New translations en.yml (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations doorkeeper.en.yml (English, United Kingdom)
* New translations en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations simple_form.en.yml (French, Quebec)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations devise.en.yml (Vietnamese)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-01 21:31:53 +09:00
Claire
b248aa4d3e
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-21 15:59:39 +01:00
Eugen Rochko
de21695162
New Crowdin updates ( #22354 )
...
* 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 en.yml (Korean)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Galician)
* New translations en.json (Spanish)
* New translations en.json (Belarusian)
* New translations en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Greek)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Slovenian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.json (Spanish)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Estonian)
* New translations en.json (Welsh)
* New translations en.yml (Spanish)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.json (Faroese)
* New translations en.json (Latin)
* New translations en.json (Catalan)
* New translations en.json (Vietnamese)
* New translations en.yml (Bulgarian)
* New translations en.yml (Serbian (Latin))
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Latvian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Catalan)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (German)
* New translations en.json (German)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (German)
* New translations en.json (Latin)
* New translations simple_form.en.yml (Frisian)
* New translations en.json (French)
* New translations en.json (Hungarian)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Latin)
* New translations en.yml (Portuguese)
* New translations doorkeeper.en.yml (Portuguese)
* New translations en.json (Albanian)
* New translations en.yml (Hebrew)
* New translations en.yml (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations en.json (Norwegian)
* New translations en.json (Russian)
* New translations en.json (Thai)
* New translations en.yml (Bulgarian)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Thai)
* New translations en.json (Asturian)
* New translations en.yml (Norwegian)
* New translations en.json (Danish)
* New translations en.json (Finnish)
* New translations en.json (Occitan)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations en.yml (Thai)
* New translations en.json (Persian)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.yml (Bulgarian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.yml (Korean)
* New translations en.json (Japanese)
* New translations en.json (Turkish)
* New translations en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* New translations en.json (Czech)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Thai)
* New translations en.json (German)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Indonesian)
* New translations en.json (Estonian)
* New translations en.yml (Indonesian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Basque)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Estonian)
* New translations en.yml (Basque)
* New translations en.yml (Estonian)
* New translations en.json (French)
* New translations en.json (Estonian)
* New translations en.yml (French)
* New translations en.yml (Bulgarian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (German)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (Bengali)
* New translations en.json (Estonian)
* New translations en.yml (Swedish)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Swedish)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Bulgarian)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.yml (Bulgarian)
* New translations en.yml (Korean)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Japanese)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Japanese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Bulgarian)
* New translations en.yml (Thai)
* New translations en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Estonian)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Estonian)
* New translations en.json (Serbian (Latin))
* New translations en.yml (Polish)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.yml (Bulgarian)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Czech)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Frisian)
* New translations en.yml (Bulgarian)
* Normalize
* New translations en.yml (Serbian (Cyrillic))
* Normalize
* New translations en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations en.yml (Bulgarian)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-12-20 23:02:47 +09:00
Eugen Rochko
2889c68610
New Crowdin updates ( #22182 )
...
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Malayalam)
* New translations en.json (Breton)
* New translations simple_form.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations devise.en.yml (Breton)
* New translations doorkeeper.en.yml (Breton)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations simple_form.en.yml (French, Quebec)
* New translations activerecord.en.yml (French, Quebec)
* New translations devise.en.yml (French, Quebec)
* New translations doorkeeper.en.yml (French, Quebec)
* New translations en.json (Sinhala)
* New translations simple_form.en.yml (Sinhala)
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations devise.en.yml (Kannada)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations simple_form.en.yml (Aragonese)
* New translations activerecord.en.yml (Aragonese)
* New translations devise.en.yml (Aragonese)
* New translations doorkeeper.en.yml (Aragonese)
* New translations simple_form.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations doorkeeper.en.yml (Corsican)
* New translations en.json (Sardinian)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations simple_form.en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations devise.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Kabyle)
* New translations en.json (Ido)
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Punjabi)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Tamil)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Kazakh)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Burmese)
* New translations en.json (Uyghur)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Asturian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* 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 (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Arabic)
* New translations en.yml (Belarusian)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Greek)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.yml (Finnish)
* New translations en.yml (Hungarian)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Korean)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Portuguese)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* 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 (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Thai)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Malay)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Latin)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Aragonese)
* New translations en.yml (Occitan)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Latin)
* New translations simple_form.en.yml (French, Quebec)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Latin)
* New translations devise.en.yml (Frisian)
* New translations devise.en.yml (Latin)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Frisian)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Latin)
* New translations en.json (Belarusian)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.json (Finnish)
* New translations en.json (Turkish)
* New translations en.yml (Belarusian)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations doorkeeper.en.yml (Danish)
* Normalize locale files
* New translations en.json (German)
* New translations en.json (Swedish)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Welsh)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.yml (Latvian)
* 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 (Czech)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Estonian)
* New translations en.yml (Swedish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Catalan)
* New translations en.json (Slovenian)
* New translations en.json (Faroese)
* New translations en.json (Asturian)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Slovenian)
* New translations en.yml (Faroese)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Faroese)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (Greek)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-12-16 12:46:39 +09:00
Claire
f3a4d57be1
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
Holden Foreman
c761e7a5ef
Fix language surrounding disability in prompts for alt text and other media descriptions ( #20923 )
2022-12-15 18:46:13 +01:00
Francis Murillo
c50e9d078a
Render current day formats in the client timezone ( #21878 )
...
* Fix remaining plain %time to %time.formatted
* Add %time.relative-formatted to client format dates on the current day
* Add missing comma dangle to formats
* Use client side message format instead of the server
* Add fallback message to relatve_format.today
* Remove unused translation key and fix js lint issue
Co-authored-by: Effy Elden <effy@effy.space>
2022-12-15 16:35:25 +01:00
Yamagishi Kazutoshi
58200132d0
FormattedMessage
must be used directly (#20982 )
...
* `FormattedMessage` must be used directly
* rollback
2022-12-15 16:20:46 +01:00
Claire
e877bb47b8
Merge branch 'main' into glitch-soc/main
2022-12-09 16:48:55 +01:00
Eugen Rochko
97b6e38a7d
New Crowdin updates ( #21954 )
...
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations devise.en.yml (Serbian (Latin))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Chinese Traditional)
* New translations en.json (Serbian (Latin))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Icelandic)
* New translations en.json (Serbian (Latin))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.json (Malay)
* New translations en.json (Malay)
* New translations activerecord.en.yml (Malay)
* New translations devise.en.yml (Malay)
* New translations en.yml (Malay)
* New translations en.yml (Arabic)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Malay)
* New translations en.yml (Greek)
* New translations en.yml (Russian)
* New translations en.yml (Belarusian)
* New translations en.yml (Greek)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Greek)
* New translations en.json (Greek)
* New translations en.yml (Greek)
* New translations en.yml (Belarusian)
* New translations doorkeeper.en.yml (Greek)
* New translations en.yml (Greek)
* New translations en.yml (Malay)
* New translations simple_form.en.yml (Malay)
* New translations en.json (Esperanto)
* New translations en.yml (Malay)
* New translations en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.yml (Belarusian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Belarusian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Serbian (Latin))
* New translations en.json (Occitan)
* New translations en.json (Czech)
* New translations en.yml (Hebrew)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.json (German)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (German)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Thai)
* New translations activerecord.en.yml (Scots)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (Latvian)
* New translations en.json (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations devise.en.yml (Latvian)
* New translations en.yml (Turkish)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Danish)
* New translations en.yml (Thai)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Belarusian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Persian)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Belarusian)
* New translations en.yml (German)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Scots)
* New translations en.yml (Belarusian)
* New translations en.yml (Danish)
* New translations en.yml (Scots)
* New translations simple_form.en.yml (Scots)
* New translations en.json (Scots)
* New translations devise.en.yml (Scots)
* New translations doorkeeper.en.yml (Scots)
* New translations en.yml (Greek)
* New translations en.yml (Greek)
* New translations en.yml (Belarusian)
* New translations en.json (German)
* New translations en.yml (Belarusian)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.json (French)
* New translations en.yml (Esperanto)
* New translations en.yml (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Belarusian)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations activerecord.en.yml (Slovak)
* New translations devise.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.json (Lithuanian)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations en.json (Esperanto)
* New translations en.json (Vietnamese)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (Belarusian)
* New translations en.yml (Latvian)
* New translations en.yml (Belarusian)
* 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.json (Welsh)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Hebrew)
* New translations en.yml (Welsh)
* New translations en.yml (Hebrew)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Belarusian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Slovak)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* normalize
* New translations en.yml (Belarusian)
* normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-12-10 00:12:56 +09:00