tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,670 Commits 5 Branches 0 Tags
3a973e4dddef4e459d0efb2cd0ebee7b09cacd62
Commit Graph
96 Commits
Author SHA1 Message Date
Claire f8fb62193a Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6 2026-07-03 18:14:36 +02:00
Claire f4cdbb9015 Add “Update available” navigation item at top of navbar when new Mastodon versions are available (#39705) 2026-07-03 14:38:32 +02:00
Claire 3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
Echo adede83c7c Updates to latest Material Icons (#38171) 2026-03-12 11:17:43 +00:00
Echoanddiondiondion 420136e83b Profile editing: Edit image menu (#38156) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-03-12 10:42:29 +00:00
Claire a4af7a531d Merge commit 'eb848d082afc8864b2aa15858f414e4867902c65' into glitch-soc/merge-upstream 2026-03-07 17:29:09 +01:00
Echo eb848d082a Profile editing: Rearranging and adding fields (#38083) 2026-03-06 12:57:06 +00:00
Claire 0a989af8c6 Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream 2026-03-05 18:21:07 +01:00
diondiondion 748dbf3217 Add "Collections" link to main navigation (#38065) 2026-03-05 09:01:08 +00:00
Claire b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
diondiondion 488e0b2617 Add collection detail page (#37897) 2026-02-18 13:19:39 +00:00
Claire d89db37e93 Merge commit 'fb89198460f9cebf624cc5ca0b139563ae4fd120' into glitch-soc/merge-upstream 2026-02-10 18:02:15 +01:00
Echo fb89198460 Profile redesign: Quality pass (#37766) 2026-02-10 10:56:03 +00:00
Claire 13499168f8 Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream 2026-02-03 15:44:04 +01:00
Echo 346ca87ee8 Profile redesign: Follow button and menu reorg (#37707) 2026-02-03 11:33:20 +00:00
Claire 5a45a3203a Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream 2026-01-27 18:03:27 +01:00
Echo c0616bcab6 Profile redesign: Username update (#37627) 2026-01-27 15:03:52 +00:00
Claire 8b95254883 Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream 2026-01-23 17:57:20 +01:00
Echo c1414f1161 Callout component (#37590) 2026-01-23 15:53:48 +00:00
Echo 42b2fdb0ac Re-download Material Icons (#37571) 2026-01-22 12:04:15 +00:00
Claire 58b29be439 Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream 2025-11-06 12:35:04 +01:00
Echo 987104f435 Add default visualizer for audio upload without poster (#36734) 2025-11-05 15:33:26 +00:00
Claire d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.
 2025-09-02 19:07:51 +02:00
Claire 5d9a9c76fb Change icon variant for quotes (#35991) 2025-09-02 13:52:09 +00:00
Claire 02134172f1 Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Glitch-soc had different overrides, but upstream simply disabled the rules.
  Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
  Not really a conflict, again because of a rubocop comment.
 2025-08-22 22:33:11 +02:00
Echo 8268323d7f Status quote button (#35822) 2025-08-20 10:09:57 +00:00
Claire 53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Claire 081d38679f Add quote notifications to WebUI (#35653) 2025-08-04 18:12:37 +00:00
Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
Eugen Rochko 20bbd20ef1 Add ability to block words in usernames (#35407) 2025-07-29 10:19:15 +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 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
Claire b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
diondiondion 79ccba1758 Add visual indicator & link to nested quote posts (#34766) 2025-05-22 10:39:45 +00:00
Claire d7cb6068b1 Add ability to reorder server rules from admin interface (#34737) 2025-05-20 12:49:11 +00:00
Claire 68bb158c84 Merge commit '8b34daf2541c6afdb5ade19e4531373ef7b05bc0' into glitch-soc/merge-upstream 2025-05-03 18:28:25 +02:00
Eugen Rochko b4394ec129 Change design of audio player in web UI (#34520) 2025-05-02 16:15:00 +00:00
Claire f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire c06527cf5d Merge commit 'e5fd61a84eb3a919c1e53f688e424df9d0f20924' into glitch-soc/merge-upstream 2025-03-28 20:48:53 +01:00
David Roetzel 97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Eugen Rochko e5fd61a84e Refactor <Video> to TypeScript (#34284) 2025-03-28 12:15:43 +00:00
Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Eugen Rochko 0885c31633 Add information about alt text to alt text modal in web UI (#33702) 2025-01-23 13:01:11 +00:00
Claire f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Eugen Rochko d6349c0e9a Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
Emelia Smith c5f0da98e4 Add detection and download of material_symbol icons in config/navigation.rb (#31366) 2024-10-01 12:49:04 +00:00