1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 07:09:03 +09:00
Commit Graph

11 Commits

Author SHA1 Message Date
Nick Schonning
0f62451424 [Glitch] HTML string attributes set as booleans
Port a425915ce7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 11:56:02 +02:00
Claire
eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2022-10-30 18:15:28 +01:00
Claire
b75bf336bd Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
Claire
7097a459be Move flavours/glitch/utils/ready to flavours/glitch/ready 2022-10-11 11:31:11 +02:00
Claire
d3879c07b1 Rename flavours/glitch/util into flavours/glitch/utils 2022-10-11 11:31:11 +02:00
Claire
f218e633b4 [Glitch] [SSR only] Revamp post filtering system
Port CSS and JS for Server-Side Rendered pages from 02851848e9

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-06-28 11:35:28 +02:00
Claire
d70e4e3da0 [Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden
Port 00b45b967e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 11:04:13 +01:00
ThibG
813c84cd6c [Glitch] Change how CDN_HOST is passed down to make assets build reproducible
Port 4c45b43cb8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:28:47 +02:00
Thibaut Girka
9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
Nolan Lawson
ec567337dc [Glitch] fix: support KaiOS arrow navigation on public pages
Port 1e232e455c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:59:57 +01:00
Thibaut Girka
14f797873d Fix menu in settings/admin pages 2019-09-30 17:01:16 +02:00