tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,519 Commits 5 Branches 0 Tags
Commit Graph

21 Commits

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
fe9a124f5a [Glitch] Fix dates (without time) being rendered as datetimes in public pages 
Port c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-06 21:41:50 +01:00
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
Nolan Lawson
ec567337dc [Glitch] fix: support KaiOS arrow navigation on public pages 
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:59:57 +01:00
Eugen Rochko
9e2e623ebe [Glitch] Change single-column mode to scroll the whole page 
Port aa22b38fdbc1842549b6cbc0e0d948f85a71b92a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-10-05 22:53:20 +02:00
Thibaut Girka
14f797873d Fix menu in settings/admin pages 2019-09-30 17:01:16 +02:00
Eugen Rochko
27f922168a [Glitch] Fix page body not being scrollable in admin layout 
Port SCSS changes from b9a8b38844278f26b9d1d1d53256e0781ba3575a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-30 15:58:29 +02:00
nzws✨
2ecc7106d7 [Glitch] Fix eslint error of import/no-extraneous-dependencies 
Port d0c2c5278391b82ba7fa2f230bf237805ff61a0c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-18 17:27:51 +02:00
ThibG
5971ea7466 [Glitch] Add public blocks to /about/blocks 
Port SCSS changes from 9b6a5ed109e1986149c1f15a41d4f442ae8ae39c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
c1231a846a [Glitch] Play animated custom emoji on hover 
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
 2019-07-23 16:24:21 +02:00
Thibaut Girka
9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Thibaut Girka
5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka
278ff1318f [Glitch] Add attachment list fallback to public pages 
Port JS changes from 4fb94c758e3bf2e1c0525e9075c2d5dedc14c666 to glitch-soc
 2019-01-13 14:42:50 +01:00
Thibaut Girka
394525e329 [Glitch] Postpone scroll-to-detailed status after react components are loaded 
Port 70801b850c78d7879182eeba4eae509af42fafeb to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka
d1da0a1086 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
bcf157a1a9 Avoid loading rails-ujs twice on vanilla flavour 2018-07-16 16:42:52 +02:00
Thibaut Girka
94db024e4c [Glitch] Combine similar components into one on public UI 
Port f9afd06221baf7f635b346dfbe350652ba6ffbd0 to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka
dd1d98f9cf [Glitch] Show card modal on public pages 
Port 16fee0335f2b10b0ce54f71965d2f2acc0e24942 to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka
7a68079b3f [Glitch] Show media modal on public pages 
Port ff7941e652af1d54d9c991254556e7932a8b183c to glitch-soc
 2018-04-20 15:58:36 +02:00
kibigo!
bdca1614d5 Screenshot support for themes 2017-12-10 20:32:28 -08:00
kibigo!
bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00