Commit graph

2272 commits

Author SHA1 Message Date
ThatOneCalculator
33e12d047f Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-12 12:08:06 -08:00
ThatOneCalculator
2078f07fe1 cat styling 2022-12-12 12:07:53 -08:00
cutestnekoaqua
072d14df95 send moved user object back :3 2022-12-12 20:45:10 +01:00
cutestnekoaqua
9455dedd6d POV: coding at 3am bad 2022-12-12 20:44:11 +01:00
ThatOneCalculator
353537662b fix alsoKnownAs federation 2022-12-12 11:25:28 -08:00
ThatOneCalculator
7019968a3a better invite icon, fix conditional 2022-12-12 10:55:01 -08:00
ThatOneCalculator
fa21a9e489 Only show admin settings to admins 2022-12-12 10:54:24 -08:00
cutestnekoaqua
db7cc867c5 fix calckey-js | fix migration url 2022-12-12 19:36:25 +01:00
ThatOneCalculator
7a8ab8b381 fix calckeyjs 2022-12-12 10:19:18 -08:00
ThatOneCalculator
5a4c74b6ad fix ckjs 2022-12-12 10:04:57 -08:00
ThatOneCalculator
804224f92c Bug fixes, use calckey.js 2022-12-11 19:24:12 -08:00
ThatOneCalculator
3cf540e11d serverDisconnectedBehavior default to nothing 2022-12-11 18:37:36 -08:00
ThatOneCalculator
06951e7e36 3 move per day (to allow for failures) 2022-12-11 18:34:46 -08:00
ThatOneCalculator
4f9dfbc3c6 Fix UI, beta versioning 2022-12-11 18:32:19 -08:00
ThatOneCalculator
578f787e49 remove unused import 2022-12-11 18:27:58 -08:00
ThatOneCalculator
71d0a5c9ea more descriptive errors 2022-12-11 18:27:44 -08:00
ThatOneCalculator
53644b6877 typo 2022-12-11 18:24:11 -08:00
ThatOneCalculator
2039e70177 use actual ID 2022-12-11 18:19:25 -08:00
ThatOneCalculator
367e19727e Fix move endpoint 2022-12-11 18:18:07 -08:00
ThatOneCalculator
e9f36ffb8f fix: label 2022-12-11 18:00:39 -08:00
Kainoa Kanter
01f463ff7a Merge branch 'develop' into account_migration 2022-12-12 01:51:17 +00:00
ThatOneCalculator
1516e24365 final cleanup 2022-12-11 17:49:14 -08:00
ThatOneCalculator
70a953a7d8 fix: migration labels 2022-12-11 17:40:10 -08:00
ThatOneCalculator
7bba1a3e57 fix viewing basic federaion info 2022-12-11 17:36:24 -08:00
ThatOneCalculator
89eed3127e fix: call functions properly 2022-12-11 17:33:45 -08:00
ThatOneCalculator
49b41cd412 Pop-up to confirm migration 2022-12-11 17:28:11 -08:00
cutestnekoaqua
3abebba245 Add admin and account locked error. 2022-12-12 02:17:07 +01:00
ThatOneCalculator
6e283ef5e6 Reserve merge conflict 2022-12-11 17:07:57 -08:00
cutestnekoaqua
0219ed2c1d integrate migration ui and api backend 2022-12-12 01:54:44 +01:00
ThatOneCalculator
9499737cd8 fix path 2022-12-12 01:54:43 +01:00
ThatOneCalculator
f4da4b7ebb Initial migration UI
b6

Style improvements to moved
2022-12-12 01:54:43 +01:00
cutestnekoaqua
7b7752fb48 fix queue?
maybe pls

debug log

fixed stupidness again

fix ??

fix import

im a idiot lol

make remote mig work
2022-12-12 01:54:41 +01:00
cutestnekoaqua
0814b60964 change move sql query 2022-12-12 01:54:41 +01:00
cutestnekoaqua
542fb00660 WIP move api call
forgot to merge this
2022-12-12 01:54:36 +01:00
cutestnekoaqua
245e1bf935 fix remote move queue 2022-12-12 01:54:36 +01:00
ThatOneCalculator
fea278fbf4 Fix icons + formatting
fix more icons
2022-12-12 01:54:23 +01:00
ThatOneCalculator
08cd73e403 fix?? 2022-12-11 15:19:41 -08:00
ThatOneCalculator
114d554747 remove like confirmation 2022-12-11 15:09:04 -08:00
ThatOneCalculator
f500fb6a52 fix liked pages endpoint 2022-12-11 14:50:16 -08:00
ThatOneCalculator
8548ec47a9 fix liked pages 2022-12-11 14:31:30 -08:00
ThatOneCalculator
e160e0f804 fix path 2022-12-10 11:23:57 -08:00
ThatOneCalculator
f1cddf33bd Style improvements to moved 2022-12-10 10:56:45 -08:00
ThatOneCalculator
fd831572f1 Initial migration UI 2022-12-09 14:28:50 -08:00
cutestnekoaqua
d582aae655 make remote mig work 2022-12-09 01:57:15 +01:00
cutestnekoaqua
fd9c4761e5 im a idiot lol 2022-12-09 01:35:15 +01:00
cutestnekoaqua
dd3a0f2fbe fix import 2022-12-09 01:20:30 +01:00
cutestnekoaqua
8cd54ef940 fix ?? 2022-12-09 01:17:31 +01:00
cutestnekoaqua
9395ff7cfa fixed stupidness again 2022-12-09 00:11:37 +01:00
cutestnekoaqua
2ce9f10707 debug log 2022-12-09 00:08:33 +01:00
cutestnekoaqua
002d614f25 maybe pls 2022-12-08 20:02:55 +01:00