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.
5 years ago
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.
5 years ago
ThibG
d0a1423daf
[Glitch] Fix dates (without time) being rendered as datetimes in public pages
...
Port f7deab10a5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
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.
5 years ago
Nolan Lawson
2030c85cfa
[Glitch] fix: support KaiOS arrow navigation on public pages
...
Port 425da2dbaa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Eugen Rochko
4fdae72eeb
[Glitch] Change single-column mode to scroll the whole page
...
Port de4ead8fc6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Eugen Rochko
14e8ba0f07
[Glitch] Fix page body not being scrollable in admin layout
...
Port SCSS changes from 53ceb703b3
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
nzws✨
44a47b5324
[Glitch] Fix eslint error of import/no-extraneous-dependencies
...
Port 7bfef64877
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
98df5f8fc2
[Glitch] Add public blocks to /about/blocks
...
Port SCSS changes from 867b9f3e9c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
b01e5e372f
[Glitch] Play animated custom emoji on hover
...
Port 99b3dd5b00
to glitch-soc
5 years ago
Thibaut Girka
14c617983d
[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation
...
Port cbb8399df4
to glitch-soc
6 years ago
Thibaut Girka
456c0aa9cc
[Glitch] Add attachment list fallback to public pages
...
Port JS changes from bb2dbd681f
to glitch-soc
6 years ago
Thibaut Girka
c0c04cd2d4
[Glitch] Postpone scroll-to-detailed status after react components are loaded
...
Port f6a5894af6
to glitch-soc
6 years ago
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
6 years ago
Thibaut Girka
1ea94fdaee
[Glitch] Combine similar components into one on public UI
...
Port fa7cdbeb67
to glitch-soc
7 years ago
Thibaut Girka
ef620dfadd
[Glitch] Show card modal on public pages
...
Port d006271514
to glitch-soc
7 years ago
Thibaut Girka
d6693f3ae3
[Glitch] Show media modal on public pages
...
Port 47d2277ef1
to glitch-soc
7 years ago
kibigo!
882055afd0
Rename themes -> flavours ? ?
7 years ago