Age | Commit message (Collapse) | Author |
|
Port 74d40c7d8fac3ccc263af29c622f4481e18e8c59 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
|
|
|
|
Port ad83e64795361dc9d5990a9dae4f91a3642109a0 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 30ef11022487364256656efee3cee92db2c839b2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 55af04b253435ae771b69c8b7cfe3fc7e3b18033 to glitch-soc
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 5fa340931e2bd39a4bcccc9a97ad58e13a2d56ab to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 923f06a07c851b25b989412f341f87f8b8fff42f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d9d722d74b2cb9bf30fa4cc98af6ddbeca003ebc to glitch-soc
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 10922294ffd2c83e155f020896318d16f3764e8d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port 267978d4fe0eaee92f64d505df2a4a07d22f582c to glithc-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 5452af2188ba65c9f934280b65a2040c8cc9e718 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 7c152acb2cc545a87610de349a94e14f45fbed5d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 73de39e6323460792ef8982555e5cfdaefb5a29b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 23d367f544485eaeed888c707012a8282bbb5806 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port aefa9253d61def572396c18a8d2ac3cc706ffa2e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c55219efa811b3c6347774bec1b174d325e5f300 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 4c7b5fb6c1787438ef130d9aecd5d0a4d54d08a9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 9757c917da1753a706c4cd9e191e77059620b022 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 1fd6460b02d2e73c94e7c6b1fa8fdc4d2ae36241 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 2277913f3f01d3bdb9a1661f019221b1cb185fbb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d2eb726962187226c85ef7f2ee1886cb0767bbd1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 371d96940342b616723df36d54e6c2d1ab3ca827 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 8ebff0efcb91e8b2a0805ebd4583a274ad5f1a69 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port f8ca3bb2a1dd648f41e8fea5b5eb87b53bc8d521 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
notifications
Port dd76bbf8b7aef3aed6bb27a5c093211eebcdb24b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 3ad0a2ae3dcd36e4a9e0be5f72273f9c30df7548 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port a43a8237681187f6e56524aa3effcfc998a877de to glitch-soc
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 56efa8d22f041ca87efdfb2e95e80d213e72dde9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 73a48318a19a207c63f6d03ecea8ce35b7e2364a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
are disabled
Port 062b3c9090c6935d4bf754e7aeb37793a2aa7b68 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 5e908c5a95a64a4d48e35516723955ac61a15c4d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 74738b49933eeadb6e837711ef1a1d0718829b6c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 1b83040bd45770ff831ff697418aaa2468a1516a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
navigation in web UI
|
|
Port 839f893168ab221b08fa439012189e6c29a2721a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 9c7f4ab8e8d19d29a5b9367ebaec8fc8af70ab7f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 4c7b5fb6c1787438ef130d9aecd5d0a4d54d08a9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e02bdc14fdf9b811a241dbaec8605cc70cb2961c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 219c38b9217d6dbb1621c27f64e9bf86bf92ec19 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 1bd00036c284bcafb419eaf80347ba49d1b491d9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 7afc6a630c76fb071bd189af3ac1366efc82f819 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d7873433256746c9b453aeca31520d68c6de4975 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 3eef8a7a81512f283300d2371d5b743611cb0d27 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|