Jeremy Kescher
|
7318b74ebf
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
# app/models/notification.rb
# config/locales/simple_form.de.yml
|
2023-03-05 12:34:16 +01:00 |
|
Renaud Chaput
|
81ef21a0c8
|
[Glitch] Rename JSX files with proper .jsx extension
Port 44a7d87cb1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-25 14:35:31 +01:00 |
|
Jeremy Kescher
|
0e634397c3
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
|
2023-02-21 00:40:08 +01:00 |
|
Nick Schonning
|
6fdd596cc8
|
[Glitch] Enable ESLint Promise plugin defaults
Port 5e1c0c3d94 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-19 10:53:18 +01:00 |
|
Jeremy Kescher
|
4a6cc45f9d
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
|
2023-02-18 22:38:53 +01:00 |
|
Nick Schonning
|
7e64eef73b
|
[Glitch] Enable ESLint no-useless-escape
Port db2c58d47a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-18 16:02:12 +01:00 |
|
Jeremy Kescher
|
8de39432a9
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
# app/javascript/flavours/glitch/actions/interactions.js
# config/initializers/rack_attack.rb
# config/locales/en_GB.yml
|
2023-02-17 00:26:21 +01:00 |
|
Claire
|
3c451cf88f
|
[Glitch] Fix useless regular-expression character escape detected by CodeQL
|
2023-02-03 21:14:41 +01:00 |
|
Claire
|
155424e52f
|
[Glitch] Run eslint --fix
I don't like it changing files this way, but it's basically what
c49213f0ea and a few others did.
|
2023-02-03 20:52:07 +01:00 |
|
Jeremy Kescher
|
7f6215984b
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# .github/workflows/build-image.yml
|
2022-10-31 21:37:48 +01:00 |
|
Eugen Rochko
|
2d731dbde6
|
[Glitch] Add ability to view previous edits of a status in admin UI
Port f8ca3bb2a1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Jeremy Kescher
|
b153ef2672
|
Merge remote-tracking branch 'upstream/main' into develop
|
2022-10-12 07:25:19 +02:00 |
|
Claire
|
b728b25c10
|
Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji
|
2022-10-11 12:43:19 +02:00 |
|
Claire
|
b75bf336bd
|
Move more modules from flavours/glitch/utils to flavours/glitch
|
2022-10-11 12:25:45 +02:00 |
|
Claire
|
2535ec4fcb
|
Remove unused redux_helpers module
|
2022-10-11 12:15:29 +02:00 |
|
Claire
|
0f4a4d7527
|
Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/
|
2022-10-11 12:15:08 +02:00 |
|
Claire
|
7097a459be
|
Move flavours/glitch/utils/ready to flavours/glitch/ready
|
2022-10-11 11:31:11 +02:00 |
|
Claire
|
015e798394
|
Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/ui/util/
|
2022-10-11 11:31:11 +02:00 |
|
Claire
|
d3879c07b1
|
Rename flavours/glitch/util into flavours/glitch/utils
|
2022-10-11 11:31:11 +02:00 |
|