Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.

2020-01-20 18:31:11 +01:00

..

about.js

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

common.js

Avoid loading rails-ujs twice on vanilla flavour

2018-07-16 16:42:52 +02:00

error.js

Port upstream's javascript to the error page

2019-02-17 12:27:01 +01:00

home.js

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

public.js

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

2020-01-20 18:31:11 +01:00

settings.js

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

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

share.js

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00