Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
27,916 Commits 75 Branches 73 Tags
d7d102e68fecf16e9bc11b87c476ee5526cc73b2
Commit Graph

27916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
d7d102e68f Merge commit 'e24737c612730fd865f62905484dbfa25b82d27e' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream removed it, replaced by `.oxfmtrc.json`.
  We had glitch-specific files in there.
  Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
  Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
  Glitch-soc had extra code in there.
  Reformatted appropriately.
- `eslint.config.mjs`:
  Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
  glitch-soc had slightly different configuration.
  Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
  Upstream changed script definitions textually adjacent to one that we have modified.
  Applied upstream's change, keeping the textually adjacent modified script intact.
 2026-02-20 20:32:58 +01:00
Claire
754ad33640 Merge pull request #3410 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8e7c3973dc
 2026-02-19 23:31:51 +01:00
Echo
d7bbe9c451 [Glitch] Remove conditional check for timeline data 
Port 8e7c3973dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:04:28 +01:00
diondiondion
5c47ed2d47 [Glitch] Only suggest discoverable accounts in collection account editor 
Port 39ff07bc89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:04:05 +01:00
diondiondion
79fba522e1 [Glitch] Merge collection settings into single editor page 
Port c118ff708f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:02:44 +01:00
Echo
3ac5b10dec [Glitch] Profile editing: Name and bio 
Port ed4787c1b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 21:53:24 +01:00
Claire
eebed16f59 Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream 2026-02-19 21:52:23 +01:00
Renaud Chaput
e24737c612 Replace prettier with oxfmt (#37893) 2026-02-19 18:04:25 +00:00
Echo
8e7c3973dc Remove conditional check for timeline data (#37922) 2026-02-19 17:20:33 +00:00
diondiondion
39ff07bc89 Only suggest discoverable accounts in collection account editor (#37920) 2026-02-19 16:43:31 +00:00
github-actions[bot]
7eb4b907eb New Crowdin Translations (automated) (#37918) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 14:42:24 +00:00
Matt Jankowski
2a9de97cb6 Use validation matchers for UserEmailValidator spec (#37908) 2026-02-19 14:25:58 +00:00
diondiondion
c118ff708f Merge collection settings into single editor page (#37916) 2026-02-19 14:09:52 +00:00
Echo
ed4787c1b1 Profile editing: Name and bio (#37907) 2026-02-19 13:53:29 +00:00
Matt Jankowski
157583659a Use validation matchers for UniqueUsernameValidator spec (#37909) 2026-02-19 13:14:12 +00:00
Matt Jankowski
40f92f3af8 Use validation matchers for UnreservedUsernameValidator spec (#37910) 2026-02-19 12:50:09 +00:00
David Roetzel
e288bf6516 Show reported collections in moderation interface (#37898) 2026-02-19 12:46:38 +00:00
renovate[bot]
6f859364fb Update dependency rack to v3.2.5 (#37895) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-19 12:46:32 +00:00
renovate[bot]
238d0f8e1d Update dependency devise to v5.0.2 (#37903) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-19 11:12:08 +00:00
Matt Jankowski
f48a299004 Use validation matchers for UrlValidator spec (#37911) 2026-02-19 11:11:46 +00:00
github-actions[bot]
093528ef17 New Crowdin Translations (automated) (#37915) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 11:11:41 +00:00
github-actions[bot]
b6917961d5 New Crowdin translations (#3407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-18 20:15:57 +01:00
Claire
4977fb1570 Merge pull request #3409 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3df8fb8fe9
 2026-02-18 20:15:48 +01:00
diondiondion
312c77fdd0 [Glitch] Fix visibility of video overlay controls in light mode 
Port 3df8fb8fe9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:59:21 +01:00
diondiondion
93b7678555 [Glitch] Add collection detail page 
Port 488e0b2617 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:58:57 +01:00
Echo
d67cdcb0b3 [Glitch] Profile redesign: Design fixes 
Port 079f8615fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:55:34 +01:00
Echo
b8b1d3a934 [Glitch] Profile editing: Add initial route 
Port 4b1f66418b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:53:23 +01:00
Claire
925d1ffde5 Fix Ruby linting for glitch-soc code 2026-02-18 18:47:21 +01:00
Claire
b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
diondiondion
3df8fb8fe9 Fix visibility of video overlay controls in light mode (#37906) 2026-02-18 15:28:49 +00:00
Matt Jankowski
66052e3ddd Use validation matchers for StatusLengthValidator spec (#37905) 2026-02-18 15:22:22 +00:00
Matt Jankowski
e8ecf1719c Use validation matchers for StatusPinValidator spec (#37904) 2026-02-18 15:09:38 +00:00
Matt Jankowski
a411b7eccb Use validation matchers for PollOptionsValidator spec (#37901) 2026-02-18 13:44:59 +00:00
Matt Jankowski
9e40d3ef37 Use validation matchers for ReactionValidator spec (#37900) 2026-02-18 13:43:21 +00:00
diondiondion
488e0b2617 Add collection detail page (#37897) 2026-02-18 13:19:39 +00:00
Claire
bd64ca2583 Add new profile settings (#37890) 2026-02-18 13:18:44 +00:00
Echo
079f8615fe Profile redesign: Design fixes (#37892) 2026-02-18 12:05:02 +00:00
github-actions[bot]
b62ba9e29e New Crowdin Translations (automated) (#37896) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-18 10:33:31 +00:00
Matt Jankowski
f95cd68667 Use validation matchers for NoteLengthValidator spec (#37891) 2026-02-18 10:33:26 +00:00
renovate[bot]
61b9bc4fac Update dependency rspec-rails to v8.0.3 (#37888) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-18 10:26:47 +00:00
Claire
7b4c22214a Merge pull request #3408 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0b66e74426
 2026-02-17 20:51:59 +01:00
Matt Jankowski
3c3a1b1684 Use separate rules with same groupName for playwright updates (#37809) 2026-02-17 17:49:19 +00:00
Echo
4b1f66418b Profile editing: Add initial route (#37885) 2026-02-17 15:45:24 +00:00
Matt Jankowski
371946fa80 Use validation matchers for LanguageValidator spec (#37886) 2026-02-17 14:59:31 +00:00
Nicholas La Roux
438602c488 Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795) 2026-02-17 14:56:46 +00:00
diondiondion
9abfde6189 [Glitch] Allow managing collection accounts 
Port a644a4a762 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-17 12:15:31 +01:00
Claire
f47e2937cf Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream 2026-02-17 12:11:33 +01:00
Claire
13dafeed41 Merge pull request #3406 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to cff25c186b
 2026-02-17 12:10:41 +01:00
Claire
0b66e74426 Add GET /api/v1/donation_campaigns (#37880) 2026-02-17 10:54:21 +00:00
Claire
4a6d17ad7b Fix hashtag matching by replacing negative lookbehind with positive lookbehind (#37684) 2026-02-17 10:27:36 +00:00