| Age | Commit message (Collapse) | Author |
|---|
|
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.
|
|
|
|
|
|
|
|
Port CSS and JS for Server-Side Rendered pages from 02851848e964675bb59919fa5fd1bdee2c1c29db
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
incorrectly hidden
Port 00b45b967e0c92714e1ec54a2d5c924f8b1dd38b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 4c45b43cb8a3d902c130729d36d559ec9de23d3e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
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.
|
|
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
