Age | Commit message (Collapse) | Author |
|
Port d4592bbfcd091c4eaef8c8f24c47d5c2ce1bacd3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 18ca4e0e9a3f74a6f21d329882b429f8f5227b0f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 36f4c32a38ed85e5e658b34d36eac40a6147bc0c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Caused by using JSX features without importing React
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 81e1cc5fece9a431c28ca648c2dd4b1b5f643f13 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 50487db1224851a49ee523bbc013d5f8686a7a55 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port front-end changes from 44b2ee3485ba0845e5910cefcb4b1e2f84f34470 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 0cdb07757050825725cac76f1c9cf11cf64acc0a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
* Use Mastodon server-side settings for automatically expanding toots with CWs
* Add modal warning about settings changes
* Use Mastodon server-side settings for disabling swiping
|
|
Port 0ec695e036dab45d57598f451266bd0b176df9fd to glitch-soc
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port fd3a45e3482e86dad3c1dfc069144864c4ff0b0b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port front-end changes from 14f436c457560862fafabd753eb314c8b8a8e674 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 52e5c07948c4c91b73062846e1f19ea278ec0e24 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port 7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port f6088922c06f3da02e9051b39f3a7111f19298dd to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port abd7b4636a4bda2454f1d30e7f87843d0c06dcbe to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
in web UI
Port bf903dc51070f952ab64e43918e803fdaaa15e4d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port front-end changes from e78d06eecfb21de6aedf39fd7c63d9aa68f7033c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 65db2625508c220fd3c0a1f37cdd2e13b6e02987 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port a8139ab0160096d09d83e8d3f9c7849129be1aa8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port acf1842896682674d9ab4d0f87ec04c6174468fa to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 1f564051b6b447e3663852c482982b3ff5a2f238 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port a2da02626ef7a026dc7f6ec4219fbb839f4c2721 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port d8d43a427a549cf063de3f6b3c22a08a06f53ffa to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port e16b0fb15a7ef2607f080e8c0b884c1cf37e5ebb to glitch-soc
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f54ca3d08e068af07a5b7a8b139e7658b3236db8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 4c45b43cb8a3d902c130729d36d559ec9de23d3e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 91eecd1b3c95807be00535b58ebfd85e549d77e0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port JS change from f0b6ddd97948d9c443cd155cb8ccc497e0608117 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 9669557be1d9c8577564242861bdbad9b821906a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
connection
Ported ef057584fd2714d94666f9ffef4aa89147eda72c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port cb2adaaf9d6c3147de9060132b69933df734d5dc to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port b1484cf3ceebe1f1f083e4c06872493dc0a68511 to glitch-soc
Co-authored-by: ThibG <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port be637146f310d7ec3a49d01e850959514e9e4964 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 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
|