Commit graph

22545 commits

Author SHA1 Message Date
CherryKitten
f793b9ecd7 Delete empty locales 2022-12-13 12:03:12 +01:00
CherryKitten
cf9124cb41 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	CALCKEY.md
#	package.json
#	push-docker.sh
2022-12-13 11:47:44 +01:00
ThatOneCalculator
9e84ac2dff Add contact method 2022-12-12 22:03:22 -08:00
ThatOneCalculator
996df38b19 ❤️ Use Contributor Covenant for COC, given project is rising in popularity 2022-12-12 22:01:24 -08:00
ThatOneCalculator
5f62a449a7 feat: customizable max note length 2022-12-12 15:07:38 -08:00
ThatOneCalculator
fa2e17dc93 open page in window if deck 2022-12-12 14:39:21 -08:00
ThatOneCalculator
51c96e127a signup instead of view details 2022-12-12 14:35:01 -08:00
cutestnekoaqua
f31bd5fe48 add local move follower migration 2022-12-12 21:09:51 +01:00
cutestnekoaqua
f91f89bd1d federation 💀 2022-12-12 21:09:51 +01:00
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
d30464ee45 beta5 2022-12-12 11:27:39 -08: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
ThatOneCalculator
c438b6b918 fix locale 2022-12-12 10:46:42 -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
a30f494ed2 Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-12 10:05:06 -08:00
ThatOneCalculator
5a4c74b6ad fix ckjs 2022-12-12 10:04:57 -08:00
Cleo
4fdd3099f1 Fix link to Calckey.js 2022-12-12 14:34:15 +00: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
c8c652dc6c more clear instructions in labels 2022-12-11 18:05:46 -08:00
ThatOneCalculator
e9f36ffb8f fix: label 2022-12-11 18:00:39 -08:00
Kainoa Kanter
44a784e8e1 Merge pull request 'Add account migration' (#9186) from account_migration into develop
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9186
2022-12-12 01:53:38 +00:00
ThatOneCalculator
1303f4f746 docs: 📝 account migration 2022-12-11 17:53:09 -08:00
Kainoa Kanter
01f463ff7a Merge branch 'develop' into account_migration 2022-12-12 01:51:17 +00:00
ThatOneCalculator
d6d7e2fbf1 tag: 🔖 v13 rc 2022-12-11 17:50:11 -08: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
02a94d88aa fix unicode weirdness 2022-12-11 17:30:18 -08:00
ThatOneCalculator
49b41cd412 Pop-up to confirm migration 2022-12-11 17:28:11 -08:00
ThatOneCalculator
3181d7571c locale 2022-12-11 17:19:33 -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
745a6124a8 Change Version to release candidate 1 2022-12-12 02:00:28 +01:00
cutestnekoaqua
0219ed2c1d integrate migration ui and api backend 2022-12-12 01:54:44 +01:00
chimiana
f4625da99a Update Dockerfile with python3 dependency required for docker-compose build step to succeed 2022-12-12 01:54:44 +01:00