Age | Commit message (Collapse) | Author |
|
Port ad9c7aefe6618a70c69991b7daf100573a7e27b9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 04eb59986461bc802d4432fe4131e09eadd070c0 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.
|
|
Port be637146f310d7ec3a49d01e850959514e9e4964 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c955f98d36868e85b0f1939a3a1c58c00babd4e8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c5c8f680317a182c4794505007ef227a4294a18e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 80182eda622e1317bffb6729259b8a81d84251a2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port emoji_map.json changes from 29f5353f8b7af331d6dddea4ee1888913361a545 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port front-end changes from 2c7128c7f0ee3073acb9897cda88255982368193 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port a1ce9cbb67facf705379355b9c8ec19c521b419c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port e12a5635da7de5a1c3b08b2ce420ee8a56ae4aff to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port ab8d7c0680d7f75826277be4c8eea1ebd396be8a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
blocks and mutes lists
Port ec31b1b75244c030bb4fb0ccabac7ff8b626db92 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
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.
|
|
Port d3ff06a3205130fa10ffc5d736e8206a9725b5df to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f65568f1d400be2e101bd8b533a1b53807f5c757 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 37b3985bfac5ffdc8e452f92869dcdefb5c92594 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port part of 1fb92037e432913902a5e5c8a5b673b036d84cb8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
enabling/disabling CW
Port cf1fa73347c9ca2b1c4f14521e990feba7509e2e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port be2f1597cf6b010a7ea0ffdc45550f87a7ae9dad to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port front-end changes from 0d117c106aa72f78dd5cdd371849dd8ce3120198 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 858d0dd168b737a77506d6aa00f6ed582d0e33c6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port beb80adb5150e50717852b39db7b534bc0da9534 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 8758221e7344645bc1357578ec1789aa7d46da08 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 90f3a0006243250ced6e7e192f81513d6b731b33 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 310d729745ad34b1b039f2ec611b9bda5b73f252 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
asynchronously
Port front-end part of 9660aa4543deff41c60d131e081137f84e771499 to glitch-soc
[API] This makes use of a new media posting API (/api/v2/media), supporting
background processing of uploaded files. For Pleroma's purposes, this could
be handled the same as /api/v1/media since afaik Pleroma doesn't do any
transcoding.
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.
|
|
|
|
confirmation dialog
|
|
Fixes #1298
|
|
web UI
Port aa67036b41d37935210c8b5094ac20c153a62011 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 5e4b6496557b5ef167518dbc6015307158e30ccf to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port fd76955f3942bbd7ec830ab535bc31621cac14a4 to glitch-soc
* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 4063f9f27805de0a12904071e521094122b9f725 to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
clickable in web UI
Port 2e18b1a2a2976f04f84e92d187b0620223a64fa6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 503eab1c1f101e92f163ed4f8457cac9a6193ffc to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
web UI
Port e69a3f54a10e58d32d7e46c494d98be948dde4b3 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
in web UI
Port 39453de232e068f58a711b2c052fe74fdd0c40b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 036ba3f51065a96cb9203a9ac5aa71d7d6edeebe to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0f07218e53bf581127cdcf5fbf12d9c207ace8d7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port ff3a11d01d262c0a37cc1e33db2013b19729fb9d to glitch-soc
|
|
web UI
Port 1314bba68a5f2d271312bad08f108e1ff56c2c00 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
empty
|
|
|
|
in web UI
Port 90f04ea06425d5774c200818caf08219c172b6f8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|