Leatherface/mastodon
0
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,339 Commits 75 Branches 73 Tags
8522ea1924276a17b3ab1a29aa41f25cbcfafce2
Commit Graph

217 Commits

Author SHA1 Message Date
Claire
04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
diondiondion
a505c2efd8 Fix mobile admin sidebar displaying under batch table toolbar (#37307) 2025-12-19 08:39:25 +00:00
Claire
13cf55c501 Merge commit '92278796c3d0fa43c08bd59f66815b196fb273a3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream removed the feature flag and refactored, while we have a slightly
  different theming system.
  Updated accordingly.
- `stylelint.config.js`:
  Upstream removed overrides for the temporary themes.
  Did the same.
 2025-12-02 20:45:10 +01:00
diondiondion
92278796c3 Remove theme_tokens feature flag & make new styles the default (#37056) 2025-11-28 15:58:46 +00:00
Claire
7a56972381 Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream 2025-11-19 21:49:09 +01:00
Claire
a4fd9b704a Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added an experimental feature flag to try out theme refactors.
  Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
  Ditto.
 2025-11-19 21:34:53 +01:00
diondiondion
72c582e7e5 Fix superfluous border & spacing in domains list on the Moderation > Federation page (#36915) 2025-11-17 12:07:44 +00:00
diondiondion
284b46fee7 Implement CSS theme tokens behind feature flag (#36861) 2025-11-17 09:44:55 +00:00
Claire
a7ba4ba446 Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream 2025-11-04 20:38:24 +01:00
Claire
4a9460f7bd Fix Skeleton placeholders being animated when setting to reduce animations is enabled (#36716) 2025-11-04 15:30:10 +00:00
Claire
4c0104084d Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream 2025-10-17 18:36:27 +02:00
Claire
323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
 2025-10-16 19:23:29 +02:00
diondiondion
20961c7538 Add keyboard shortcut info banner to the boosting preferences section (#36506) 2025-10-16 14:53:23 +00:00
Emelia Smith
210b389643 Implement quote posts in Moderator UI (#35964) 2025-10-16 13:40:24 +00:00
diondiondion
05244c335d Restructure appearance settings to introduce new Advanced settings section (#36496) 2025-10-16 09:44:24 +00:00
Claire
ef413ef713 Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream 2025-10-15 16:35:37 +02:00
Matt Jankowski
c6de46d12d Update stylelint-config-standard-scss to version 16.0.0 (#36429) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-15 11:30:09 +00:00
Claire
ee88f8550c Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream 2025-10-10 19:01:35 +02:00
Emelia Smith
8898f120dc Improve display of content warnings in Admin UI (#35935) 2025-10-10 08:55:41 +00:00
Emelia Smith
81350c7cfb Add support for displaying link previews for Admin UI (#35958) 2025-10-10 08:43:48 +00:00
Claire
17e0c745c6 Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream 2025-10-01 19:13:18 +02:00
metalhead
e4094d9fb2 Add support for dynamic viewport height (#36272) 
Co-authored-by: l <eh.chahkiev@smartics.ru>
 2025-10-01 08:53:29 +00:00
Claire
b15b07606c Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream 2025-09-24 18:26:13 +02:00
diondiondion
6cbc857ee0 Fix unfortunate action button wrapping in admin area (#36247) 2025-09-24 08:57:18 +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
Emelia Smith
15401e6988 Support displaying polls in Admin UI (#35933) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-01 14:59:03 +00:00
Claire
4ffcf7f7ed Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream 2025-08-18 22:05:19 +02:00
Alan
95111e88e3 Update color alpha blending to use Sass color functions (#35787) 2025-08-18 15:55:38 +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
Emelia Smith
72f2f35bfb Implement Instance Moderation Notes (#31529) 2025-06-25 08:15:44 +00:00
Claire
fc87ce7ca1 Merge commit '98f98249ffc3de0d020fa2ed9068b1cb82168984' into glitch-soc/merge-upstream 2025-06-17 18:56:38 +02:00
diondiondion
59dc0bd6f3 fix: Improve support for safe area insets (#35065) 2025-06-17 09:53:14 +00:00
Claire
86a7a1ef3b Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream 2025-06-11 22:52:21 +02:00
Claire
933ee420c3 Remove some unused CSS classes (#35012) 2025-06-11 13:17:07 +00:00
Claire
558c73a21e Use @/ absolute paths instead of relative paths in CSS (#34806) 2025-05-26 07:27:44 +00:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
Claire
d7cb6068b1 Add ability to reorder server rules from admin interface (#34737) 2025-05-20 12:49:11 +00:00
renovate[bot]
8ab2c4a9fc chore(deps): update dependency stylelint-config-standard-scss to v15 (#34658) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:46:11 +00:00
diondiondion
4372d17114 fix: Prevent long link names in admin sidebar from being truncated (#34727) 2025-05-19 12:36:46 +00:00
Claire
eb8dd42de0 Merge commit '8a3bed1933b7afdaa196639b753f41e743c4491a' into glitch-soc/merge-upstream 2025-03-27 20:31:48 +01:00
Echo
8a3bed1933 Fix SASS deprecation notices (#34278) 2025-03-27 13:09:42 +00:00
Claire
dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Eugen Rochko
cadda2f957 Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
Claire
0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
Eugen Rochko
30aa0df88c Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
Claire
f740611820 Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream 2024-11-24 18:56:15 +01:00
Eugen Rochko
62603508c7 Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Emelia Smith
ddfb3d123b Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00