Age | Commit message (Collapse) | Author |
|
Port 44a7d87cb1f5df953b6c14c16c59e2e4ead1bcb9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c50e9d078aa3c353afc140669f1cedcd354ee53e to glitch-soc
Co-authored-by: Effy Elden <effy@effy.space>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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 839f893168ab221b08fa439012189e6c29a2721a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
web UI
Port 02ba9cfa35c7b2285950955619ae3431391e9625 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
|
|
|
|
Port fc3d248df770024b5ce0f33d93029d71f5051e43 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 216dbaedaf587db834cfdd53b896e9c7e1284d9c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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 66baa629ea1c3890d5c631099d41e6af14974d7e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
Port 07341e7aa60fe7c7d4f298136af99276820940e7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 49eb4d4ddf61e25c5aaab89aa630ddd3c7f3c23d to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 4c45b43cb8a3d902c130729d36d559ec9de23d3e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 7dc4c742650ac69ec9a4459b656e172283511e4c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port d70c3ab4c39e642d41138ab693af77dd6c258e8c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `app/controllers/statuses_controller.rb`:
Upstream disabled the embed controller for reblogs.
Not a real conflict, but glitch-soc has an extra line to deal
with its theming system.
Ported upstream changes.
- `app/javascript/packs/public.js`:
Upstream made changes to get rid of most inline CSS, this changes
javascript for public pages, which in glitch are split between
different files. Ported those changes.
- `app/models/status.rb`:
Upstream changed the block check in `Status#permitted_for` to
include domain-block checks. Not a real conflict with glitch-soc,
but our scope is slightly different, as our scope for
unauthenticated access do not include instance-local toots.
Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
Not a real conflict, upstream added a new field to the instance
serializer, the conflict is one line above since we added more of
that.
Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
Upstream got rid of most inline CSS and moved hidden elements
to data attributes in the process, in fields were we have
different values.
Ported upstream changes while keeping our glitch-specific
values.
- `app/views/statuses/_simple_status.html.haml`:
Upstream got rid of inline CSS on an HAML line we treat
differently, stripping empty text nodes.
Ported upstream changes to the style attribute, keeping
the empty text node stripping behavior.
|
|
Conflicts:
- `app/javascript/packs/public.js`:
Upstream modified code that we split between multiple files due
to glitch-soc's theming system.
Ported those changes.
|
|
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 c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `app/javascript/packs/public.js`:
Upstream removed an unused function in code that has
been refactored a bit. Removed that function in the corresponding
places.
|
|
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port aa22b38fdbc1842549b6cbc0e0d948f85a71b92a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port SCSS changes from b9a8b38844278f26b9d1d1d53256e0781ba3575a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port d0c2c5278391b82ba7fa2f230bf237805ff61a0c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port SCSS changes from 9b6a5ed109e1986149c1f15a41d4f442ae8ae39c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
|
|
|
|
compensation
Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
|
|
Port JS changes from 4fb94c758e3bf2e1c0525e9075c2d5dedc14c666 to glitch-soc
|
|
Port 70801b850c78d7879182eeba4eae509af42fafeb to glitch-soc
|
|
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
|
|
|
|
Port f9afd06221baf7f635b346dfbe350652ba6ffbd0 to glitch-soc
|
|
Port 16fee0335f2b10b0ce54f71965d2f2acc0e24942 to glitch-soc
|
|
Port ff7941e652af1d54d9c991254556e7932a8b183c to glitch-soc
|
|
|
|
|