Age | Commit message (Collapse) | Author |
|
Port a1347f456e47e085ef1031b607cabd0683c496c2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port b55fc883b6181fb8080fbafd53bc7a9f1896b295 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
|
|
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
|
|
Merge upstream changes
|
|
Port d3eefead3014175b264cb56f6f4cb552cbaaeac6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
Codespaces (#23872)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
|
|
|
|
|
|
|
|
|
|
could be sent (#21957)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
interface (#23574)
|
|
|
|
|
|
(#23787)
|
|
|
|
destructive than it claims (#23805)
|
|
|
|
|
|
|
|
|
|
|