tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,031 Commits 5 Branches 0 Tags
Commit Graph

617 Commits

Author SHA1 Message Date
Claire
5cac4dfb5c Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream 2025-08-22 22:52:55 +02:00
Echo
f85f0eee1b
Composer quote improvements (#35835) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-08-21 14:07:31 +00:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
Echo
651e51a82e
Allow editing status quote policy (#35762) 2025-08-14 15:04:32 +00:00
Echo
7cf53dbf63
Redirect on success for standalone compose (#35763) 2025-08-13 13:52:29 +00:00
Claire
11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
 2025-08-09 23:02:43 +02:00
Echo
8ee4b3f906
Update Redux to handle quote posts (#35715) 2025-08-08 08:44:05 +00:00
Claire
235037a3b2 Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added an extension where glitch-soc had an extra one.
  Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
 2025-08-06 22:02:55 +02:00
Claire
4838085d66
Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon (#35700) 2025-08-06 14:54:03 +00:00
Claire
55a98580aa
Add UI for revoking quote posts (#35689) 2025-08-06 11:52:56 +00:00
Claire
a4c05c694f
Fix quote notification filtering and add settings (#35690) 2025-08-05 16:15:16 +00:00
Claire
63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
Eugen Rochko
14a781fa24
Add button to load new replies in web UI (#35210) 2025-07-23 13:42:07 +00:00
Claire
d8b0beb70d Merge commit 'b9b1500fc516ea31ab21441737c600f9b571a07d' into glitch-soc/merge-upstream 2025-06-24 21:44:33 +02:00
diondiondion
b9b1500fc5
fix: Update hashtags when (un)following a hashtag (#35101) 2025-06-23 11:44:59 +00:00
Claire
0bb83dfe7d Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream 2025-06-16 21:07:55 +02:00
Eugen Rochko
7c4393e719
Change order of items in navigation panel in web UI (#35029) 2025-06-16 15:06:33 +00:00
Claire
86a7a1ef3b Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream 2025-06-11 22:52:21 +02:00
Eugen Rochko
a13b33d851
Change navigation layout on small screens in web UI (#34910) 2025-06-11 11:55:43 +00:00
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
Echo
1fdcaaebbb
Add a way to easily unpin profiles from the featured account area (#34931) 2025-06-05 10:23:01 +00:00
Claire
06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
 2025-06-02 20:05:43 +02:00
Eugen Rochko
c77158c8b7
Fix nested buttons in search popout in web UI (#34871) 2025-06-02 12:21:31 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
diondiondion
97b9e8849d
Add rendering of quote posts in web UI (#34738) 2025-05-21 15:50:45 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
diondiondion
b135a831ea
feat: Add "Followers you know" widget to user profiles (#34652) 2025-05-13 06:38:18 +00:00
Claire
49e9a1fe4e Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream 
Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
 2025-05-06 16:30:33 +02:00
Claire
79931bf3ae
Merge commit from fork 
* Check scheme in account and post links

* Harden media attachments

* Client-side mitigation

* Client-side mitigation for media attachments
 2025-05-06 15:02:13 +02:00
Claire
ff07676aee Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream 2025-05-03 18:03:42 +02:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Eugen Rochko
79013c730d
Add endorsed accounts to profiles in web UI (#34568) 2025-04-29 12:14:22 +00:00
Eugen Rochko
17d8e2b6e3
Refactor context reducer to TypeScript (#34506) 2025-04-28 13:38:40 +00:00
Eugen Rochko
40157e063d
Add ability to feature and unfeature hashtags from web UI (#34490) 2025-04-28 11:44:01 +00:00
Claire
3628717595 Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream 2025-04-21 15:47:21 +02:00
Eugen Rochko
bed614d44e
Add option to remove account from followers in web UI (#34488) 2025-04-18 07:23:34 +00:00
Claire
300e9de24d Merge commit '498372fd06bfb0235b75888629ca5de0336ccd71' into glitch-soc/merge-upstream 2025-04-10 17:02:40 +02:00
Eugen Rochko
22d33244ee
Refactor <Dropdown> into TypeScript (#34357) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
 2025-04-08 19:22:19 +00:00
Claire
2e16be22bf Merge commit '0e5be63fb327403902076df602ec2dd410ada789' into glitch-soc/merge-upstream 2025-04-08 20:26:30 +02:00
Eugen Rochko
bdf9baa2e8
Refactor <FollowedTags> into TypeScript (#34355) 2025-04-08 16:06:23 +00:00
Claire
99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
Eugen Rochko
2c70c28bbb
Refactor <DomainBlocks> to TypeScript (#34347) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-02 12:31:39 +00:00
Claire
a3097e1e84 Merge commit '1bc28709ccde4106ab7d654ad5888a14c6bb1724' into glitch-soc/merge-upstream 2025-03-30 12:20:18 +02:00
Renaud Chaput
1bc28709cc
Convert the polls reducer to plain JS (#33263) 2025-03-29 20:17:27 +00:00
Claire
4ace929129 Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream 2025-03-25 21:12:37 +01:00
Eugen Rochko
94d71c992e
Refactor alerts to TypeScript, remove react-notification dependency (#34239) 2025-03-25 18:25:07 +00:00
Claire
dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
Claire
00dbefdbbf
Change web client settings to be saved earlier and more often (#34074) 2025-03-05 15:42:33 +00:00
Claire
e71fb450e0
Add optional delete_media parameter to DELETE /api/v1/statuses/:id (#33988) 2025-02-28 13:39:01 +00:00