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
ThibG	f11e9d5524	[Glitch] Add confirmation modal when logging out from the web app Port `fd3d45d38f` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2019-08-29 17:32:22 +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

ThibG

f11e9d5524

[Glitch] Add confirmation modal when logging out from the web app

Port fd3d45d38f to glitch-soc

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

2019-08-29 17:32:22 +02:00

2 Commits (c47be5bd864a1f5244f35122ba7fae31a149c73d)