me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18149 commits 2 branches 0 tags 429 MiB
Commit graph

18149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire
13b84da439 Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream 2023-06-10 15:09:19 +02:00
Renaud Chaput
5715cd6b8a [Glitch] Fix prev/next buttons color in media viewer 
Port 40e756f291 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:48:41 +02:00
Christian Schmidt
8b958c0858 [Glitch] Translate CW, poll options and media descriptions 
Port 971eafc709 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:48:41 +02:00
Claire
447b44a5d6 Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' 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`.
 2023-06-10 14:38:04 +02:00
Renaud Chaput
b428d82286 [Glitch] Upgrade react-intl 
Port 76960f128a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:37:08 +02:00
Claire
c22b032483 Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' 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
Claire
ef10e189ed Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 68296cfb32
 2023-06-05 20:49:35 +02:00
dependabot[bot]
d6feba366b [Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 
Port 9ba1135000 to glitch-soc

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:31:45 +02:00
Claire
cd107b054d [Glitch] Fix null signUp URL in various places 
Port 75ebb60ef6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:28:22 +02:00
y.takahashi
e7cb0dc83b [Glitch] Handle Surrogate Pairs in truncate() 
Port 5c744a5d7d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:28:02 +02:00
Claire
bda5be1406 Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
 2023-06-05 13:25:22 +02:00
Claire
85e0bd73cf Fix closeModal invocation (#2239) 
Fixes #2238

Some call sites where missed in 62f386d44e
 2023-06-04 22:05:45 +02:00
Claire
8ee98cfd2b Add a confirmation screen when suspending a domain (#25144) 2023-06-01 09:37:38 +02:00
Claire
135bd452c7 Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-01 09:25:26 +02:00
Claire
52b4e33d7f Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component (#25018) 2023-06-01 09:23:28 +02:00
Claire
3d550b5712 Fix multiple N+1s in ConversationsController (#25134) 2023-06-01 02:41:51 +02:00
Renaud Chaput
40e756f291 Fix prev/next buttons color in media viewer (#25231) 2023-06-01 02:25:38 +02:00
Nick Schonning
3b664f9b19 Add fix/lint helper dev targets (#23561) 2023-06-01 02:25:13 +02:00
Christian Schmidt
971eafc709 Translate CW, poll options and media descriptions (#24175) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-01 00:10:21 +02:00
Renaud Chaput
76960f128a Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
Matt Jankowski
68296cfb32 Remove unused Settings::Extend module (#25214) 2023-05-31 23:34:48 +02:00
Renaud Chaput
8bd9ce4d09 Disable some metrics cops (#25215) 2023-05-31 23:33:10 +02:00
Matt Jankowski
3b2e804a83 Silence output to stdout during cli specs (#25211) 2023-05-31 20:01:11 +02:00
Matt Jankowski
d59a2b5b8e Use thor methods instead of tty prompt in maintenance cli (#25207) 2023-05-31 19:40:16 +02:00
Daniel M Brasil
fc30a59e10 Add test coverage for Mastodon::CLI::Accounts#backup (#25163) 2023-05-31 15:32:37 +02:00
Matt Jankowski
216298a400 Add specs for admin/webhooks CRUD actions (#25133) 2023-05-31 15:23:49 +02:00
Matt Jankowski
93f7408c10 Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules (#25192) 2023-05-31 10:23:32 +02:00
dependabot[bot]
146e123a3c Bump @babel/core and @types/babel__core (#25183) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-31 09:57:48 +02:00
Claire
654f5c9cdc Fix inconsistent naming of Instance.by_domain_and_subdomain (#25159) 2023-05-31 09:57:24 +02:00
dependabot[bot]
e6b6217534 Bump @babel/plugin-transform-runtime from 7.21.4 to 7.22.4 (#25173) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-31 09:51:35 +02:00
dependabot[bot]
28b9bf054e Bump @babel/preset-react from 7.18.6 to 7.22.3 (#25171) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-31 09:42:14 +02:00
dependabot[bot]
4ac0377394 Bump @babel/runtime from 7.21.5 to 7.22.3 (#25170) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-31 09:39:35 +02:00
dependabot[bot]
58c565ae55 Bump @babel/preset-env from 7.21.5 to 7.22.4 (#25167) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-31 09:36:43 +02:00
Daniel M Brasil
ac9089805f Add test coverage for Mastodon::CLI::Accounts#unfollow (#25162) 2023-05-31 09:33:57 +02:00
Renaud Chaput
8b69a60257 Upgrade Workbox to 6.6.0 (#25197) 2023-05-31 09:29:16 +02:00
dependabot[bot]
9ba1135000 Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-05-31 09:27:21 +02:00
Renaud Chaput
e3d64f03a6 Drop support for Node.js 14 (#25198) 2023-05-31 08:42:40 +02:00
Claire
75ebb60ef6 Fix null signUp URL in various places (#25190) 2023-05-30 19:01:42 +02:00
Matt Jankowski
8cb57d28a6 Fix FormatStringToken cop in CLI (#25122) 2023-05-30 16:21:53 +02:00
Daniel M Brasil
66b7c04b62 Add test coverage for Mastodon::CLI::Accounts#follow (#25161) 2023-05-30 16:13:29 +02:00
Matt Jankowski
87ff2507fc Fix Rails/WhereExists cop in CLI (#25123) 2023-05-30 16:09:57 +02:00
Matt Jankowski
dccd813e6c Extract helper method for error report in cli/accounts command (#25119) 2023-05-30 16:09:15 +02:00
Matt Jankowski
35e1c074e3 Increment index which was previously not used in maintenance CLI loop (#25118) 2023-05-30 16:08:47 +02:00
Matt Jankowski
9ee55e469c Consistent usage of CLI dry_run? method (#25116) 2023-05-30 16:07:44 +02:00
Daniel M Brasil
0c652b4b6d Add test coverage for Mastodon::CLI::Accounts#approve (#25160) 2023-05-30 15:00:21 +02:00
Daniel M Brasil
ba924d4642 Add test coverage for Mastodon::CLI::Accounts#delete (#25146) 2023-05-30 11:59:17 +02:00
dependabot[bot]
3a71f78b1d Bump @types/react from 18.2.6 to 18.2.7 (#25166) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-30 09:58:55 +02:00
dependabot[bot]
9f982d4e27 Bump jsdom from 22.0.0 to 22.1.0 (#25178) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-30 09:43:20 +02:00
dependabot[bot]
af0d843ffc Bump nokogiri from 1.14.3 to 1.15.2 (#25177) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-30 09:42:41 +02:00
dependabot[bot]
85bc8d5da7 Bump @types/react-motion from 0.0.33 to 0.0.34 (#25185) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-30 09:40:22 +02:00