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.
|
|
|
|
confirmation dialog
|
|
Fixes #1298
|
|
web UI
Port aa67036b41d37935210c8b5094ac20c153a62011 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 5e4b6496557b5ef167518dbc6015307158e30ccf to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port fd76955f3942bbd7ec830ab535bc31621cac14a4 to glitch-soc
* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 4063f9f27805de0a12904071e521094122b9f725 to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
clickable in web UI
Port 2e18b1a2a2976f04f84e92d187b0620223a64fa6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 503eab1c1f101e92f163ed4f8457cac9a6193ffc to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
web UI
Port e69a3f54a10e58d32d7e46c494d98be948dde4b3 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
in web UI
Port 39453de232e068f58a711b2c052fe74fdd0c40b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 036ba3f51065a96cb9203a9ac5aa71d7d6edeebe to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0f07218e53bf581127cdcf5fbf12d9c207ace8d7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port ff3a11d01d262c0a37cc1e33db2013b19729fb9d to glitch-soc
|
|
web UI
Port 1314bba68a5f2d271312bad08f108e1ff56c2c00 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
empty
|
|
|
|
in web UI
Port 90f04ea06425d5774c200818caf08219c172b6f8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 02236332bab7c5cc4ddf4a3a778fd956f6851322 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 5711899c59147252a01e21371994ca6a60418628 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port 3adc722d1cdd28d87d2724b8952d7ec52d241b52 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 50cd73e5d7e39600203c9c3f591f04289f41e297 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port bba0269d9741c8c4daaa9048c265a1321d93fbba to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
|
|
Port 305abc9e05ddb2db6a40a6eda01578e01e58791f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0fcc4b1c566e4365e07ce5a1c87743db76c07fe6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 10e209d8e0601ded06e05df573e76935e175cb1c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port dd4eec6bf647a082b9bac2bed09a0105fe14c733 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 42d2a915e4aa31533032e37aaa46354cee2386da to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 2f8c3c17ee26dc21ce94959b0ea18984e7bc5560 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port b9d74d407673a6dbdc87c3310618b22c85358c85 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 389e3f6094bfcc4d0338947d29434113320c8142 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
announcements
Port 90b13ffd009a431dbe98c37bc92ee59a6f0535f2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
reaction twice
Port c06d2ff43718af5940987e219379094f1a2de180 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 48c55b6392661cde8e28cf076c3d132c22d17a0f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f816da9c6474ddf437681fbf7f5346672436ccdf to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 76f1ed834efd3b58b6ebc8e951b661bbc1b7bf9b to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port b89e6cfe7071901a43d1bfbde9dc7b872443e1b2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 1268e3b5726b0650afda20410a714995aa9aeae7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
upstream
|
|
Port front-end changes from 0dfba0884e8885cf242010e0d9da6b328b3560a6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|