Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,049 Commits 74 Branches 58 Tags
e8fe33f27384caf3da8da8a4d1697c387a1e15cf
Commit Graph

2051 Commits

Author SHA1 Message Date
Claire
e8fe33f273 Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.
 2025-08-25 22:15:28 +02:00
diondiondion
94ad088482 Fix broken custom radio buttons & checkboxes in modals (#35891) 2025-08-25 09:12:46 +00:00
Claire
5cac4dfb5c Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream 2025-08-22 22:52:55 +02: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
4df50b9c7e Visibility Modal fixes (#35865) 2025-08-22 12:34:37 +00:00
diondiondion
a1c7b853ec Improve feed item focus outlines (#35864) 2025-08-22 12:10:07 +00:00
diondiondion
118c30fbc7 Improvements for keyboard navigation in feeds (#35853) 2025-08-22 09:57:39 +00:00
diondiondion
511e10df34 Fix layout shift caused by "Who to follow" widget (#35861) 2025-08-22 09:44:10 +00:00
Emelia Smith
4f494781c1 Refactor to reuse the one status partial across moderation tools (#35644) 2025-08-21 14:51:11 +00: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
45ec4c93c0 Fix display of quotes in threads in WebUI (#35834) 2025-08-20 14:39:58 +00:00
Echo
8268323d7f Status quote button (#35822) 2025-08-20 10:09:57 +00:00
Claire
71cee3e472 Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency adjacent to one that is only in glitch-soc.
  Updated as upstream did.
 2025-08-19 18:46:12 +02:00
Echo
f16f8b51b8 Move language and visibility buttons above CW field (#35824) 2025-08-19 15:29:10 +00:00
Claire
4ffcf7f7ed Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream 2025-08-18 22:05:19 +02:00
Echo
d4b2e7f771 Composer Quote UI (#35805) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-08-18 16:52:28 +00:00
Alan
95111e88e3 Update color alpha blending to use Sass color functions (#35787) 2025-08-18 15:55:38 +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
renovate[bot]
ac0581fd22 Update devDependencies (non-major) (#35660) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-08-14 08:36:38 +00:00
Echo
49a6e4cbb5 Move composer buttons to top (#35749) 2025-08-13 14:09:45 +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
92bf55afd0 Change design of quote posts in web UI (#35584) 2025-07-30 15:53:42 +00:00
Claire
63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
diondiondion
d36236cbcd fix: Fix glitchy status keyboard navigation (#35455) 2025-07-23 07:39:36 +00:00
Claire
5ff0039d7b Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream 2025-07-22 23:17:48 +02:00
diondiondion
3771f9e04b fix: Fix quote posts styling on notifications page (#35411) 2025-07-17 17:28:30 +00:00
Claire
d6ce7de2d3 Merge commit '331599fa2b335a7b832adcab594a833f09b808f0' into glitch-soc/merge-upstream 
Conflicts:
- `.github/ISSUE_TEMPLATE/1.web_bug_report.yml`:
  We don't use the github features that upstream does, so kept our version.
- `.github/ISSUE_TEMPLATE/2.server_bug_report.yml`:
  We don't use the github features that upstream does, so kept our version.
 2025-07-16 21:31:28 +02:00
diondiondion
558b9c90a6 fix: Fix selected item in poll select menus is unreadable in Firefox (#35402) 2025-07-16 12:03:39 +00:00
Claire
eeffe580d8 Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream 2025-07-15 18:19:32 +02:00
diondiondion
74fc4dbacf refactor: Only remove pointer-events when necessary (#35390) 2025-07-15 15:57:31 +00:00
diondiondion
82a6ff091f fix: Improve Dropdown component accessibility (#35373) 2025-07-15 07:52:34 +00:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
diondiondion
3c0767f543 fix: Remove focus highlight when status is clicked in light mode (#35251) 2025-07-03 07:51:12 +00:00
Claire
98e90b7c1f Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream 2025-07-01 18:47:15 +02:00
diondiondion
e6e8974785 fix: Fix column header overlapping mobile menu on old Safari (#35225) 2025-07-01 08:53:43 +00:00
Claire
2eec4da8fc Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream 2025-06-30 17:52:22 +02:00
diondiondion
e8a603b18f fix: Fix popover/dialog backgrounds not blurred on older Webkit browsers (#35220) 2025-06-30 12:16:54 +00:00
Claire
f7b4580b49 Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a file, glitch-soc had extra files.
  Took upstream's changes and moved glitch-soc's additions at the end.
 2025-06-26 18:04:37 +02:00
diondiondion
c1ef1f62d5 fix: Prevent scrolling behind menus and modals in Safari iOS (#35183) 2025-06-25 19:22:11 +00:00
Claire
c9a1e27a49 Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
 2025-06-25 19:29:09 +02:00
diondiondion
8fa32ca8ba fix: Fix search icon overlapping text on Trending page (#35175) 2025-06-25 13:26:44 +00:00
diondiondion
c6dddbb66e fix: Prevent content scrolling behind main menu (part 1) (#35173) 2025-06-25 12:12:49 +00:00
Emelia Smith
72f2f35bfb Implement Instance Moderation Notes (#31529) 2025-06-25 08:15:44 +00:00
Claire
93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
 2025-06-24 22:43:43 +02:00
diondiondion
8ba1487f30 fix: Fix inaccessible "Clear search" button (#35152) 2025-06-24 14:36:05 +00:00
diondiondion
644da36336 feat: More obvious loading state when submitting a post (#35153) 2025-06-24 14:08:48 +00:00
diondiondion
fb5b8ae0a5 fix: Improve status focus indicators (#35150) 2025-06-24 09:34:43 +00:00
Claire
9cb5a77c3e Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream 2025-06-21 22:59:04 +02:00
diondiondion
3f743b1a07 fix: Fix SCSS lint warnings (#35102) 2025-06-21 08:58:12 +00:00