Age | Commit message (Collapse) | Author |
|
Port emoji_map.json changes from 29f5353f8b7af331d6dddea4ee1888913361a545 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port a1ce9cbb67facf705379355b9c8ec19c521b419c 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 0f07218e53bf581127cdcf5fbf12d9c207ace8d7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
web UI
Port 1314bba68a5f2d271312bad08f108e1ff56c2c00 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port front-end changes from 0dfba0884e8885cf242010e0d9da6b328b3560a6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 619da5a4dc00e51d28b29bfe5230125a78c1fac9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0e8c0287d01d270238aeb7f25c6337b2bcb8afba to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f92ed32df4489210ab0ef557f1df90bc5e97d8e6 to glitch-soc
Co-authored-by: hina <hina@hinaloe.net>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Have to investigate as to whether it was actually needed on mobile, doesn't
seem to be the case from Firefox's Responsive Design Mode
|
|
Port 0a49b26793d467589be09305e15ff9cc97cdd200 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 9027bfff0c25a6da1bcef7ce880e5d8211062d1d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0d2b60ab8b13a28e99a83e1104e7208de2025304 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port e974d4923fabd887416609bc6c8ca81ce81d0ff2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 9072fe5ab6464cc9c7a871d388464c7afcf41cd0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port cb447b28c403c7db32e3e3d7c2510004287edfda to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 4190e31626907059aebf32b1be66715dacb989a9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port fd3d45d38f289815bed0adc7eaa3b15894ddb8fb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port dfe60598899738250fc707db91048b871ab09282 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f178a01c11a4af077926dd035a0c4c44f6b3985c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0e9668051e58b2ff4e48b82fa7cc17d385c7a5c9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Fixes #647
The option is found in `/settings` (because that was easier to write it this
way) but only affects the glitch-soc front-end.
|
|
blocked
Port 111a0628fc161df4d76967d7dc7116b8a43fe8e2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
|
|
Port 729723f857d11434c0f78d63fe16537d77f1c77c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port 84ff3938426da348e31651dfad376d83a9784343 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port front-end changes from e64e6a03dd1e0978fee48f0596dcfbc7fd29958f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 3086c645fde2345d34e401bdf3e2f19f19da3294 to glitch-soc
|
|
Port 5b20284f6f7ebb2514d81fb27fcaa40f8edf14ff to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
Port 1e5532e693d9533ee37f553aeb191e284178fa52 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
|
|
|
|
|
|
This reverts commit 49bea8c46b006d8c86285c8b1158cd700dc2eb45.
|
|
Port 68f2211f00dfa3f823ad780ed748c1af0078a0cf to glitch-soc
|
|
Port db06b25376ac7e844e86fb9890fa9f1c2edd2d60 to glitch-soc
|
|
mounted
Port be1c634b2b4372a525d304d2ff830392f04c5cc5 to glitch-soc
|
|
Also does not enable polls if no limits are provided by the server
|
|
Port 5092d17f2936146fa26e5d8a9b9e391f77010f28 to glitch-soc
|
|
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
|
|
Port compatibility changes from 8f5fdab5bf681ff45a07965940bc45c9061a2f89 to glitch-soc
|
|
Port 2ee779dcd3aaec4f1384400ba68e2422ea878156 to glitch-soc
|
|
Port relevant parts of 9d4541c612b506889675c4c19ced5cd17ad3710f to glitch-soc
|
|
|