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

18191 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire
085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' 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
Renaud Chaput
333c28ce6d [Glitch] Fix /share and cleanup and reorganize frontend locale loading 
Port 29851c83bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:18:01 +02:00
Claire
3b87fe21fa Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' 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
S.H
7ccf99b652 [Glitch] Fix using Date.now() instead of intl.now() 
Port 4e28b89f51 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 15:21:04 +02:00
Claire
e6b6a0535e Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
Claire
fd0b9c9881 [Glitch] Add a confirmation screen when suspending a domain 
Port 8ee98cfd2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 15:10:24 +02:00
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
Claire
21f904b344 Add data-nosnippet so Google doesn't use trending posts in snippets for / (#25279) 2023-06-05 17:32:24 +02:00
Matt Jankowski
c74040abfa Rails 7 compatibility fix for Admin::Metrics::Dimension classes (#25277) 2023-06-05 16:52:33 +02:00
Daniel M Brasil
a274d79f58 Add test coverage for Mastodon::CLI::Accounts#cull (#25250) 2023-06-05 14:51:25 +02:00
S.H
94f9888d57 Fix not shown announcements in hometimeline. (#25251) 2023-06-05 14:49:51 +02:00
Nick Schonning
5846344977 Update kt-paperclip 7.2 from sha (#25274) 2023-06-05 14:40: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
4c2503d36c Fix design issues with recent react-intl upgrade (#25272) 2023-06-05 09:52:36 +02:00
Darius Kazemi
6debddcf89 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
Matt Jankowski
a04157e69f Add allow_other_host: true to backups controller (#25266) 2023-06-05 08:22:03 +02:00
Matt Jankowski
9c86b994db Add coverage for CLI::CanonicalEmailBlocks command (#25239) 2023-06-05 08:20:18 +02:00
Daniel M Brasil
427661c9eb Add test coverage for Mastodon::CLI::Accounts#merge (#25199) 2023-06-05 08:16:12 +02:00
Matt Jankowski
c671e23d28 Remove unmaintained nsa gem (#25265) 2023-06-05 01:57:05 +02:00
Eugen Rochko
c4426198c3 Change "Follow 7 people" to "Find at least 7 people to follow" in web UI (#24954) 2023-06-05 01:42:17 +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
Nick Schonning
749c9434d1 Cleanup old translationRunner (#25241) 2023-06-02 20:01:36 +02:00
Jed Fox
e24a587f84 Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
Claire
c7a8838bd7 Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
Claire
1c298d97c5 Change wording of “Content cache retention period” setting to highlight destructive implications (#23261) 2023-06-02 18:09:08 +02:00
Jed Fox
2d2750c6a9 Fix spacing of middle dots in the detailed status meta section (#25247) 2023-06-02 15:40:23 +02:00
Renaud Chaput
29851c83bd Fix /share and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
Claire
a82f036309 Fix overflow behavior of account rows (#25131) 2023-06-01 14:47:55 +02:00
Claire
572086c8ad Add support for importing lists (#25203) 2023-06-01 14:47:31 +02:00
dependabot[bot]
821f68fcd8 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>
 2023-06-01 14:39:43 +02:00
Matt Jankowski
a32c2b694f Extract verify options method in search cli (#25121) 2023-06-01 14:35:05 +02:00
Nick Schonning
f30caffb80 Update yarn.lock for audit issues (#25152) 2023-06-01 14:32:34 +02:00
Matt Jankowski
13dffb206b Add CLI area progress bar helper (#25208) 2023-06-01 14:31:24 +02:00
Daniel M Brasil
269812919e Add test coverage for Mastodon::CLI::Accounts#rotate (#25212) 2023-06-01 14:29:29 +02:00
dependabot[bot]
11fde72be9 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>
 2023-06-01 14:27:58 +02:00
S.H
4e28b89f51 Fix using Date.now() instead of intl.now() (#25234) 2023-06-01 13:46:19 +02:00
Renaud Chaput
f681f81cbf Allow carets in URL search params (#25216) 2023-06-01 12:14:49 +02:00
Claire
bf3227b5dd Bump workbox from 6.6.1 to 7.0.0 (#25232) 2023-06-01 10:24:11 +02:00
dependabot[bot]
0b46611cf7 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>
 2023-06-01 10:01:21 +02:00
Daniel M Brasil
6f0217d056 Add test coverage for Mastodon::CLI::Accounts#refresh (#25196) 2023-06-01 10:01:09 +02:00
Claire
ac0ecfa421 Add missing primary keys to accounts_tags and statuses_tags (#25210) 2023-06-01 09:49:06 +02:00