Age | Commit message (Collapse) | Author |
|
light theme
Port 89a6b76f999635e077e9469efd9d94cd6c6d6222 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
ClearlyClaire/glitch-soc/fixes/not-recommended-label
Fix “not recommended” label being shown as “recommended”
|
|
Port SCSS changes from 546672e292dc3218e996048464c4c52e5d00f766 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Fixes #1914
|
|
|
|
web UI
Port ef582dc4f2fe53b08988faf8d51f567ac32e5b93 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d055d751720b7494ba990a43434b73e17596b5e8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 7bdb2433f1a6e0b6a5e4df068003ac6e2e296048 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 8fdbb4d00d371e7a900bec3a262216d95a784d52 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 16122761c5eca0f25f17968a208a24ddd99e073e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e37e8deb0ff207d36bb359ce395e2888dacc216d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 782b6835f786385c41c6455f2a251d1925b19eb5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
the top
Port 608343c135c087ab7fa9bd401dce8a705720fdb8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 0beb095a4bfbcce55acb016eaaa54b5e93a56023 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 622f603ac73e40a9e41c254fa90079eeecfe1e02 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
(#1902)
* Fix favourite modal styling in glitch-soc light theme
* Fix unnecessary difference between glitch-soc's light theme and upstream's
|
|
Port 4b7f32a2a668b7068ede7ac8eb2ac087883ba213 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port ffe735344bb47ad2af743ad97729db9ea9c11f60 to glitch-soc
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 34c269310d2017c3164d57c1e8631f9423092ee3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port 20aa8881dc98264e5875fa37fc2dbf18e3f2baac to glitch-soc
|
|
Port 1c3192df6bf48eb4c3613f2a8744c809f6eeeec0 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 2d9a85db6efe0c9ccfda1420551ce3d6025bc27e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
web UI
Port a442f481f850d857544eafdd0725142ed8656552 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 312d616371096235f1f317041300b8220c447613 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port bfafb114a2135b1f21ba7e6d54ee13e8da75b629 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 7c8e2b9859f2e206110accb74d19ec4591d79780 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e02812d5b63b4909fff9c0c7246e80745c4c703e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 887976814a2639a666896ae94b14c64e2834e26d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c95d9aab56dcde8c183f15d565cd1e8746d42c48 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 139ea4c981f563e51d80ec3ec407d6265e29cb70 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
is disabled (#19687)
Port cbb440bbc2de7c805f687c886b32ab7dbafde07f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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>
|