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.
1 year ago
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
1 year ago
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
1 year ago
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
1 year ago
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
1 year ago
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
1 year ago
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
1 year ago
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
1 year ago
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
1 year ago
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.
1 year ago
d907e79140
Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 00c222377d
1 year ago
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
1 year ago
5e876c2901
[Glitch] Fix `null` signUp URL in various places
...
Port 14bb6bb29a
1 year ago
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
1 year ago
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
1 year ago
b0780cfeed
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
5fae2de454
Fix overflow behavior of account rows ( #25131 )
1 year ago
8884d1ece0
Add support for importing lists ( #25203 )
1 year ago
d91607feee
Bump sidekiq-scheduler from 5.0.2 to 5.0.3 ( #25228 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
cd4f0feab8
Extract verify options method in search cli ( #25121 )
1 year ago
b489c200a6
Update yarn.lock for audit issues ( #25152 )
1 year ago
35c1c3e57a
Add CLI area progress bar helper ( #25208 )
1 year ago
2a353200ad
Add test coverage for `Mastodon::CLI::Accounts#rotate` ( #25212 )
1 year ago
3182ecc24c
Bump puma from 6.2.2 to 6.3.0 ( #25229 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
1 year ago
942d850b0a
Allow carets in URL search params ( #25216 )
1 year ago
dac460f43f
Bump workbox from 6.6.1 to 7.0.0 ( #25232 )
1 year ago
c15c8c7aa8
Bump rspec-rails from 6.0.2 to 6.0.3 ( #25223 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
f906e21a4f
Add test coverage for `Mastodon::CLI::Accounts#refresh` ( #25196 )
1 year ago
fe84f7e323
Add missing primary keys to `accounts_tags` and `statuses_tags` ( #25210 )
1 year ago
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
1 year ago
e7e1b46ce8
Bump aws-sdk-s3 from 1.122.0 to 1.123.0 ( #25230 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
5a50983654
Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 ( #25222 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
b05bbd91d0
Bump @types/jest from 29.5.1 to 29.5.2 ( #25220 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
fca2dff2e2
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
1 year ago
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
1 year ago
d39bce963f
Add fix/lint helper dev targets ( #23561 )
1 year ago
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
44cd88adc4
Upgrade react-intl ( #24906 )
1 year ago
00c222377d
Remove unused Settings::Extend module ( #25214 )
1 year ago
b7d995cb00
Disable some metrics cops ( #25215 )
1 year ago
b0104e4c33
Silence output to stdout during cli specs ( #25211 )
1 year ago
dc26140d54
Use thor methods instead of tty prompt in maintenance cli ( #25207 )
1 year ago
3c41547f49
Add test coverage for `Mastodon::CLI::Accounts#backup` ( #25163 )
1 year ago
8b1bfaed3e
Add specs for admin/webhooks CRUD actions ( #25133 )
1 year ago
665bb237a8
Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules ( #25192 )
1 year ago
Claire
S.H
Renaud Chaput
Christian Schmidt
dependabot[bot]
y.takahashi
Matt Jankowski
Nick Schonning
Daniel M Brasil