Age | Commit message (Collapse) | Author |
|
|
|
Port 6b6a9d0ea362f4e301b56ae817f6c5d1761234b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c66403b2579587d8c1448be3ad30dc388d5f29c3 to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 8e96510b2528056e84cf8d0ed68d2e686e566180 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port b4a8400afd88a2ae8822757e5d30975494be2512 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 64154c5161d4d5c82877fba549d72068cc7f9e16 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
|
|
Port cc650bc023e00d07c5796b7602d86597bb437f45 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 5aff2a6957e861162d67c4610277e9bb2a6f8186 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
Web UI
Port 40d81620b00f6c4ed30b78f95b443a08e62ae8fa to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 3a1a21ad5725bed7f82b516b4174272c1e931223 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Fixes #1333
|
|
Port c9dcc2d39fb5bd945ecd999e50c08a86cce1aa3e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
account is muted
Port 92f85bea528c5eca97a2f075c53f7dcafdf5cb41 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 48503384d00525fe61a038bdb8a55868fdc1db92 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port af6d35627978047724612c027e60cb0a89cb2eef to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 26b08a3c54847f2816f78c3ac67ace001d3fea1f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c0b849bdfda8a2386bc85836d2d181890746de98 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port b8ba977497a53740e66d8db9938382b724283b3a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 77ec0875ea998072f4bb709bfb9b15e80669eeef to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0e362b7678e75cb71ce207fd45dd4dc0d955fdca to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
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>
|