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

22385 Commits (d999fc52ba7f7ce10d1320b081231eae37965e71)

Author SHA1 Message Date
Claire d999fc52ba Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
Claire 44caf314b8
Merge pull request #2791 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to cd0ca4b994
 2024-07-24 20:07:23 +02:00
renovate[bot] 06f070d86d
fix(deps): update dependency fuzzysort to v3 (#30315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-07-24 08:13:09 +00:00
Claire e507d17520 [Glitch] Widen the clickable area for statuses in grouped notifications 
Port a8330be93e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-23 20:28:22 +02:00
Nick Schonning 977337f2d2 [Glitch] Update Prettier to 3.3.3 
Port 9a015a2a15 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-23 20:28:22 +02:00
Claire 838ea5f9cd [Glitch] Fix keyboard shortcuts and navigation in grouped notifications 
Port af06d74574 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-23 20:28:22 +02:00
Claire 68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Michael Stanclift 8b7f93cc7f
Recolor Preferences/Admin UI to better match main design (#31034) 2024-07-23 15:30:45 +00:00
Adam Niedzielski cd0ca4b994
Select correct self link when parsing Webfinger response (#31110) 2024-07-23 14:42:31 +00:00
Claire a8330be93e
Widen the clickable area for statuses in grouped notifications (#31111) 2024-07-23 12:11:08 +00:00
Claire 2656381656
Merge pull request #2789 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 55705d8191
 2024-07-23 14:03:56 +02:00
renovate[bot] 871b6197df
chore(deps): update dependency public_suffix to v6.0.1 (#31109) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-23 08:59:18 +00:00
Emelia Smith bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Matt Jankowski 1b839d2cba
Fix `mastodon:stats` decoration of stats rake task (#31104) 2024-07-23 06:51:57 +00:00
Nick Schonning 9a015a2a15
Update Prettier to 3.3.3 (#31106) 2024-07-23 06:46:09 +00:00
renovate[bot] 44bdfe1fed
chore(deps): update dependency opentelemetry-instrumentation-active_job to v0.7.3 (#31107) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-23 06:42:28 +00:00
Claire af06d74574
Fix keyboard shortcuts and navigation in grouped notifications (#31076) 2024-07-23 06:20:17 +00:00
Claire cbf25634a9 [Glitch] Fix reblogging after refactor 
Port 55705d8191 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire 643b1ef3e9 [Glitch] Refactor CW handling in an action 
Port 9cb9427133 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire f13a231b39 [Glitch] Refactor code for reblogging and favouriting 
Port 03dea64b79 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire dcfcfdcb14 Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream 2024-07-22 21:41:31 +02:00
Claire 55705d8191
Fix reblogging after refactor (#31105) 2024-07-22 19:30:06 +00:00
Claire ddc1f7ee44
Merge pull request #2788 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 80d9bff6df
 2024-07-22 19:38:53 +02:00
Claire 9cb9427133
Refactor CW handling in an action (#31103) 2024-07-22 16:03:58 +00:00
Claire 03dea64b79
Refactor code for reblogging and favouriting (#31102) 2024-07-22 15:45:07 +00:00
Claire 2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
 2024-07-22 17:38:30 +02:00
renovate[bot] 80d9bff6df
fix(deps): update dependency immutable to v4.3.7 (#31100) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 13:39:37 +00:00
Claire ced5e853c7
Fix duplicate `orderedItems` in user archive's `outbox.json` (#31099) 2024-07-22 08:56:05 +00:00
Matt Jankowski 6e4305de69
Fix spec descriptions around configurable limit values (#31079) 2024-07-22 08:02:31 +00:00
github-actions[bot] 5a60a3b80c
New Crowdin Translations (automated) (#31087) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-22 08:01:24 +00:00
Matt Jankowski ef796446e5
Ignore manifest JS parse/interrupt error on CI (#31080) 2024-07-22 07:46:41 +00:00
renovate[bot] 6ee5d3b559
fix(deps): update dependency jsdom to v24.1.1 (#31088) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 07:39:56 +00:00
renovate[bot] 22d2fba279
chore(deps): update definitelytyped types (non-major) (#31095) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 07:39:38 +00:00
renovate[bot] 77ec5e11e4
chore(deps): update dependency email_spec to v2.3.0 (#31097) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 07:38:52 +00:00
Claire 2774980589
Fix syntax error in grouped notifications CTE on some PostgreSQL versions (#31098) 2024-07-22 07:37:27 +00:00
Claire c72b6e03ec
Merge pull request #2786 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0397df9bef
 2024-07-19 18:57:05 +02:00
Claire 95984b729a [Glitch] Remove routerHistory parameters from composer actions 
Port e768b23aa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-19 18:06:35 +02:00
Michael Stanclift 9f05a06dee [Glitch] Fix double border on column filter on narrow screens 
Port 784e088533 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-19 17:46:56 +02:00
Claire f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
Matt Jankowski 0397df9bef
Resolve `TODO` in `api/v1/admin/domain_*` controllers (#31067) 2024-07-19 15:32:42 +00:00
renovate[bot] 65a8dc7869
chore(deps): update dependency selenium-webdriver to v4.23.0 (#31073) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-19 15:32:06 +00:00
kyori19 3a00f89aa1
Respect `Account::DISPLAY_NAME_LENGTH_LIMIT` in account spec correctly (#31075) 2024-07-19 15:31:48 +00:00
Claire e768b23aa9
Remove routerHistory parameters from composer actions (#31077) 2024-07-19 15:26:44 +00:00
Claire 2e63e802b3
Fix inconsistent padding in glitch-soc's grouped notifications (#2784) 2024-07-19 12:13:50 +02:00
Matt Jankowski adadfdbc03
Update `strong_migrations` to version 2.0.0 (#31061) 2024-07-19 08:32:43 +00:00
Matt Jankowski 05342529dd
Reduce factory creation in AP activity move spec (#31064) 2024-07-19 08:31:34 +00:00
Michael Stanclift 784e088533
Fix double border on column filter on narrow screens (#31068) 2024-07-19 08:30:26 +00:00
github-actions[bot] 8e0aed8ac7
New Crowdin Translations (automated) (#31072) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-19 08:21:09 +00:00
Claire d55ecf4145
Merge pull request #2782 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 82344342c1
 2024-07-18 20:42:27 +02:00
Renaud Chaput 7224e24054 [Glitch] Grouped Notifications UI 
Port f587ff643f to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-18 19:55:02 +02:00