mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,814 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

21814 Commits (ef0154695739b0776dc9df64f777ad69f1fe4156)

Author SHA1 Message Date
Claire ef01546957
Merge pull request #2718 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b6fd14f0e2
 2024-05-23 22:41:09 +02:00
Renaud Chaput e32bfad88a [Glitch] Fix `createDataLoadingThunk` and related actions 
Port b6fd14f0e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:37:00 +02:00
Renaud Chaput 8d6058b40a [Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests 
Port 10ec421dd4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:33:05 +02:00
Claire 51631c785f Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Glitch-soc had changes to adjacent lines.
  Ported upstream's changes.
 2024-05-23 20:30:23 +02:00
Renaud Chaput b6fd14f0e2
Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
Renaud Chaput c465ef7560 [Glitch] Fix some API calls that should not use an API token 
Port 15d3070754 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:11:20 +02:00
Claire 0e8633f6c7 Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream 2024-05-23 20:11:12 +02:00
Claire 133d98fb25
Normalize language code of incoming posts (#30403) 2024-05-23 17:28:18 +00:00
Renaud Chaput 10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests (#30270) 2024-05-23 09:50:13 +00:00
Matt Jankowski 3a862439df
Remove unused account record in api/v2/admin/accounts spec (#30397) 2024-05-23 08:26:58 +00:00
github-actions[bot] 5b5a35cf96
New Crowdin Translations (automated) (#30402) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-23 08:26:29 +00:00
Renaud Chaput 15d3070754
Fix some API calls that should not use an API token (#30401) 2024-05-23 07:30:48 +00:00
Claire 6f884b6305
Merge pull request #2717 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2c5ab8f647
 2024-05-22 22:04:05 +02:00
Renaud Chaput 3e9298370d [Glitch] Remove the access token from Redux & context 
Port 2c5ab8f647 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-22 21:14:54 +02:00
Claire 22d12229b2 Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream 2024-05-22 21:05:19 +02:00
Renaud Chaput 2c5ab8f647
Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
Michael Stanclift 2c75cf8599
Add "Warning preset" link to admin navigation (#26199) 2024-05-22 09:05:33 +00:00
github-actions[bot] a2b4c29c8f
New Crowdin Translations (automated) (#30394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-22 07:57:51 +00:00
renovate[bot] d9d4ba1b6f
fix(deps): update dependency glob to v10.3.16 (#30392) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-22 07:47:49 +00:00
renovate[bot] 6e67ca73f3
fix(deps): update dependency axios to v1.7.2 (#30372) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-22 07:35:27 +00:00
Claire 65db9dec2e
Merge pull request #2716 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to cd0c547936
 2024-05-21 20:04:34 +02:00
David Lapshin dc35563f65 [Glitch] Fix announcements icon rotating like settings one 
Port cd0c547936 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-21 17:45:59 +02:00
Claire 5ab111554e Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream 2024-05-21 17:45:21 +02:00
Claire 40a3a3f3d8
Merge pull request #2715 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 89f89d738f
 2024-05-21 17:44:40 +02:00
David Lapshin cd0c547936
Fix announcements icon rotating like settings one (#30388) 2024-05-21 15:24:51 +00:00
Claire 32223863a5
Add coverage to `/admin/accounts/:id` (#30386) 2024-05-21 13:17:34 +00:00
Claire edf6ca56e3 Fix rubocop error and cleanup `Status.as_direct_timeline` a little 2024-05-21 13:12:46 +02:00
Claire d3136e6d58 Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream 2024-05-21 12:06:38 +02:00
Claire 89f89d738f
Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385) 2024-05-21 08:56:08 +00:00
github-actions[bot] eda2bdfc7a
New Crowdin Translations (automated) (#30383) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-21 08:48:36 +00:00
Claire e853355f24
Merge pull request #2714 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0a2110b9af
 2024-05-20 20:23:13 +02:00
renovate[bot] 0663c7d78d
fix(deps): update formatjs monorepo (#30359) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 17:14:10 +00:00
renovate[bot] 8c925dec79
chore(deps): update dependency rubocop-rails to v2.25.0 (#30341) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 17:04:21 +00:00
Claire 20fdf8e22c Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream 2024-05-20 17:47:48 +02:00
Claire 7b3eef4cb1
Merge pull request #2713 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to de4815afda
 2024-05-20 17:27:55 +02:00
Matt Jankowski 0a2110b9af
Add coverage for custom filters (#30347) 2024-05-20 15:00:09 +00:00
Claire 00cf8d3748
Change older Paperclip database migrations for consistency (#30204) 2024-05-20 14:59:27 +00:00
Claire 2bcbeed951
Add some error handling to OTP secret migration (#30344) 2024-05-20 14:59:23 +00:00
Renaud Chaput ca5955ed76 [Glitch] Use a modern React context for identity in the app 
Port a178ba7cd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-20 12:53:52 +02:00
Claire e46321e63d Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
Claire de4815afda
Add more tests for self-destruct mode (#30374) 2024-05-20 10:06:51 +00:00
Matt Jankowski def6b686ff
Fix `Rails/WhereRange` cop (#30343) 2024-05-20 09:37:36 +00:00
Matt Jankowski 70608f824e
Add coverage for `AdminMailer#auto_close_registrations` (#30349) 2024-05-20 08:03:39 +00:00
Renaud Chaput 9658d3e580
Use the job class as span name for Sidekiq root spans (#30353) 2024-05-20 08:01:04 +00:00
renovate[bot] 0ce22859a5
fix(deps): update dependency @rails/ujs to v7.1.3 (#30356) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:56:28 +00:00
github-actions[bot] 8b75d18371
New Crowdin Translations (automated) (#30358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-20 07:41:38 +00:00
renovate[bot] 814d00cf4b
chore(deps): update dependency @formatjs/cli to v6.2.12 (#30370) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:40:37 +00:00
renovate[bot] 778bd96a52
chore(deps): update dependency @types/lodash to v4.17.4 (#30371) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:40:20 +00:00
Renaud Chaput 990a0c19a9
Fix a warning when running JS Tests because of FakeIdentityContext using deprecated context API (#30368) 2024-05-20 07:29:27 +00:00
Nick Schonning 0f07e1cd4c
Fix yarn.lock diff (#30366) 2024-05-19 19:37:49 +00:00