Age | Commit message (Collapse) | Author |
|
|
|
(#1867)
|
|
* [Glitch] Fix crash when failing to load emoji picker
Port bd3420b1398c4c4ab2e2f2850b6dd6eaff0d361b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Remove duplicate frequently used emojis
Port 98146281e1beaf994710b13ef70f6224e8588cba to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Harmon <Harmon758@gmail.com>
|
|
|
|
flavours/glitch/features/compose/containers/emoji_picker_dropdown_container
|
|
|
|
|
|
|
|
flavours/glitch/features/compose/util/
|
|
|
|
flavours/glitch/features/ui/util/
|
|
|
|
|
|
|
|
|
|
|
|
web UI
Port 0e41d360c068deb8655dc1b9facfa4c15985c271 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 99a43f0282d5115b75a564205ca7d2db31a3a945 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d2528b26b6da34f34b5d7a392e263428d3c09d69 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Cherry-picked d2528b26b6da34f34b5d7a392e263428d3c09d69
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream changed stuff, we had extra attributes.
Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
so updated that file by keeping our extra attributes, and took upstream's
version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
Took upstream's version.
|
|
Port 7fb738c8372a700e1b42534cb202005b8c73b946 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d4b0aa74500419730525025b05513235aa477841 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port part of e2b561e3a521ff893943c0e9e32952e35934ca54 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port fc3d248df770024b5ce0f33d93029d71f5051e43 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 216dbaedaf587db834cfdd53b896e9c7e1284d9c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port part of 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e623c302d5d4dfc05689eb8fb8e051e30fc38ec8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port fixes from e623c302d5d4dfc05689eb8fb8e051e30fc38ec8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port part of 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c8245e64c5173f34401c562fe32551dcab8e68b7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Partial port from 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port part of 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
Port f382192862893c48cf97f13e9fbfb85b80cdc97d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 8751c3c4954799aec24cecc1cae68df27d19ceee to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
layout in web UI (#17760)
Port fa47c37f13c7fa4d38edd83818f681cf99d6ea9c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e38a01c41add3dbbb0a9a7a68e591ce8313aa13a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e52085246f86809ec32f3edc5be226ce15b03457 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port remaining changes from dba4be1038063845a74e83aaa85d6ab08d5625dd to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 54d4ece7432a34a2ba24617851f04801e5a389d8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port cb2e198d89dfb86a81fff8e11eac531b658e9ef2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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 SCSS changes from 5b0e8cc92b9ca0ab0dc24366d95f67a88c470173
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
|
|
|
|
Fixes #1852
This was an oversight from last upstream merge, failing to account for
glitch-soc's theming system.
|
|
|