Thibaut Girka
c13682bc0d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream modified code that we split between multiple files due
to glitch-soc's theming system.
Ported those changes.
2020-04-05 18:32:06 +02:00
Thibaut Girka
99fc46d023
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
d0a1423daf
[Glitch] Fix dates (without time) being rendered as datetimes in public pages
...
Port f7deab10a5
2020-02-06 21:41:50 +01:00
Thibaut Girka
6719b9daa5
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
Nolan Lawson
2030c85cfa
[Glitch] fix: support KaiOS arrow navigation on public pages
...
Port 425da2dbaa
2019-11-06 14:59:57 +01:00
Eugen Rochko
4fdae72eeb
[Glitch] Change single-column mode to scroll the whole page
...
Port de4ead8fc6
2019-10-05 22:53:20 +02:00
Thibaut Girka
254f94cb6b
Fix menu in settings/admin pages
2019-09-30 17:01:16 +02:00
Eugen Rochko
14e8ba0f07
[Glitch] Fix page body not being scrollable in admin layout
...
Port SCSS changes from 53ceb703b3
2019-09-30 15:58:29 +02:00
nzws✨
44a47b5324
[Glitch] Fix eslint error of import/no-extraneous-dependencies
...
Port 7bfef64877
2019-09-18 17:27:51 +02:00
ThibG
98df5f8fc2
[Glitch] Add public blocks to /about/blocks
...
Port SCSS changes from 867b9f3e9c
2019-08-19 21:56:25 +02:00
ThibG
b01e5e372f
[Glitch] Play animated custom emoji on hover
...
Port 99b3dd5b00
2019-07-23 16:24:21 +02:00
Thibaut Girka
9b89a7b2f2
Port upstream's javascript to the error page
2019-02-17 12:27:01 +01:00
Thibaut Girka
14c617983d
[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation
...
Port cbb8399df4
2019-01-20 11:56:21 +01:00
Thibaut Girka
456c0aa9cc
[Glitch] Add attachment list fallback to public pages
...
Port JS changes from bb2dbd681f
2019-01-13 14:42:50 +01:00
Thibaut Girka
c0c04cd2d4
[Glitch] Postpone scroll-to-detailed status after react components are loaded
...
Port f6a5894af6
2019-01-10 21:00:33 +01:00
Thibaut Girka
3793296fed
Port a few public.js changes from upstream, move some code around
...
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
2019-01-10 18:45:17 +01:00
Thibaut Girka
27be4fa311
Avoid loading rails-ujs twice on vanilla flavour
2018-07-16 16:42:52 +02:00
Thibaut Girka
1ea94fdaee
[Glitch] Combine similar components into one on public UI
...
Port fa7cdbeb67
2018-05-17 18:37:00 +02:00
Thibaut Girka
ef620dfadd
[Glitch] Show card modal on public pages
...
Port d006271514
2018-05-17 18:37:00 +02:00
Thibaut Girka
d6693f3ae3
[Glitch] Show media modal on public pages
...
Port 47d2277ef1
2018-04-20 15:58:36 +02:00
kibigo!
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
kibigo!
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
