Commit graph

6 commits

Author SHA1 Message Date
Jeremy Kescher
722b6697d7
Merge remote-tracking branch 'upstream/main' into develop 2023-03-28 17:31:34 +02:00
neatchee
8215df76c0 [Glitch] Remove legacy decorators syntax
Port d1b057a0ac to glitch-soc
2023-03-27 08:51:57 +02:00
Jeremy Kescher
2cb88f5baa
Merge remote-tracking branch 'upstream/main' into develop
Conflicts:
- .github/workflows/build-image.yml
  We don't use GitHub Actions for building Docker images.
- Gemfile.lock
  Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.
2023-03-19 01:57:28 +01:00
Christian Schmidt
8f97ffe91e [Glitch] Replace Status#translatable? with language matrix in separate endpoint
Port bd047acc35 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-16 23:21:08 +01:00
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
Renamed from app/javascript/flavours/glitch/features/ui/index.js (Browse further)