mastodon

Author SHA1 Message Date

Author	SHA1	Message	Date
Thibaut Girka	9abb227250	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	2020-03-22 16:10:44 +01:00
Nolan Lawson	ec567337dc	[Glitch] fix: support KaiOS arrow navigation on public pages Port `1e232e455c` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2019-11-06 14:59:57 +01:00
Thibaut Girka	14f797873d	Fix menu in settings/admin pages	2019-09-30 17:01:16 +02:00

Thibaut Girka

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.

2020-03-22 16:10:44 +01:00

Nolan Lawson

ec567337dc

[Glitch] fix: support KaiOS arrow navigation on public pages

Port 1e232e455c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

2019-11-06 14:59:57 +01:00

Thibaut Girka 14f797873d Fix menu in settings/admin pages 2019-09-30 17:01:16 +02:00

3 Commits (7a74e46b770d4120890daafee51b36d1a3fa2db9)