Age | Commit message (Collapse) | Author |
|
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.
|
|
Port c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
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.
|
|
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port aa22b38fdbc1842549b6cbc0e0d948f85a71b92a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port SCSS changes from b9a8b38844278f26b9d1d1d53256e0781ba3575a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port d0c2c5278391b82ba7fa2f230bf237805ff61a0c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port SCSS changes from 9b6a5ed109e1986149c1f15a41d4f442ae8ae39c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
|
|
|
|
compensation
Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
|
|
Port JS changes from 4fb94c758e3bf2e1c0525e9075c2d5dedc14c666 to glitch-soc
|
|
Port 70801b850c78d7879182eeba4eae509af42fafeb to glitch-soc
|
|
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
|
|
|
|
Port f9afd06221baf7f635b346dfbe350652ba6ffbd0 to glitch-soc
|
|
Port 16fee0335f2b10b0ce54f71965d2f2acc0e24942 to glitch-soc
|
|
Port ff7941e652af1d54d9c991254556e7932a8b183c to glitch-soc
|
|
|
|
|