Commit Graph

22544 Commits

Author SHA1 Message Date
CherryKitten ad38dd201b
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 c433aca4a4
Add contact method 2022-12-12 22:03:22 -08:00
ThatOneCalculator 42fd714379
❤️ Use Contributor Covenant for COC, given project is rising in popularity 2022-12-12 22:01:24 -08:00
ThatOneCalculator 35ebb8bcf2
feat: customizable max note length 2022-12-12 15:07:38 -08:00
ThatOneCalculator 08874b97d3
open page in window if deck 2022-12-12 14:39:21 -08:00
ThatOneCalculator aae8e278a1
signup instead of view details 2022-12-12 14:35:01 -08:00
cutestnekoaqua 5a2bd3d379 add local move follower migration 2022-12-12 21:09:51 +01:00
cutestnekoaqua 25fc88afd6 federation 💀 2022-12-12 21:09:51 +01:00
ThatOneCalculator 0a9208ddea
Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-12 12:08:06 -08:00
ThatOneCalculator c050ff5580
cat styling 2022-12-12 12:07:53 -08:00
cutestnekoaqua a9058697be send moved user object back :3 2022-12-12 20:45:10 +01:00
cutestnekoaqua bf04ca4969 POV: coding at 3am bad 2022-12-12 20:44:11 +01:00
ThatOneCalculator 4922aefb49
beta5 2022-12-12 11:27:39 -08:00
ThatOneCalculator 1f9ad0f61b
fix alsoKnownAs federation 2022-12-12 11:25:28 -08:00
ThatOneCalculator 6e9c62a1a2
better invite icon, fix conditional 2022-12-12 10:55:01 -08:00
ThatOneCalculator 851d2b0f66
Only show admin settings to admins 2022-12-12 10:54:24 -08:00
ThatOneCalculator fa18993057
fix locale 2022-12-12 10:46:42 -08:00
cutestnekoaqua 5e6091989d fix calckey-js | fix migration url 2022-12-12 19:36:25 +01:00
ThatOneCalculator 3a05623e87
fix calckeyjs 2022-12-12 10:19:18 -08:00
ThatOneCalculator a2ea56a35b
Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-12 10:05:06 -08:00
ThatOneCalculator 7509f9c502
fix ckjs 2022-12-12 10:04:57 -08:00
Cleo bd4d0ce84e Fix link to Calckey.js 2022-12-12 14:34:15 +00:00
ThatOneCalculator 50cb7c6de1
Bug fixes, use calckey.js 2022-12-11 19:24:12 -08:00
ThatOneCalculator 75bf6bd557
serverDisconnectedBehavior default to nothing 2022-12-11 18:37:36 -08:00
ThatOneCalculator 97bf2f2bf1
3 move per day (to allow for failures) 2022-12-11 18:34:46 -08:00
ThatOneCalculator cfb5832e24
Fix UI, beta versioning 2022-12-11 18:32:19 -08:00
ThatOneCalculator 43a7891e4f
remove unused import 2022-12-11 18:27:58 -08:00
ThatOneCalculator 1ab74a7a2e
more descriptive errors 2022-12-11 18:27:44 -08:00
ThatOneCalculator 920a91756e
typo 2022-12-11 18:24:11 -08:00
ThatOneCalculator 60505740d5
use actual ID 2022-12-11 18:19:25 -08:00
ThatOneCalculator bc97bbe360
Fix move endpoint 2022-12-11 18:18:07 -08:00
ThatOneCalculator 70ddfb6a25
more clear instructions in labels 2022-12-11 18:05:46 -08:00
ThatOneCalculator 7ce7df6947
fix: label 2022-12-11 18:00:39 -08:00
Kainoa Kanter c03b4f8cfb 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 3374f5946a
docs: 📝 account migration 2022-12-11 17:53:09 -08:00
Kainoa Kanter ed02d089ed Merge branch 'develop' into account_migration 2022-12-12 01:51:17 +00:00
ThatOneCalculator 0efeeb8fd7
tag: 🔖 v13 rc 2022-12-11 17:50:11 -08:00
ThatOneCalculator 1ee6a52a8a
final cleanup 2022-12-11 17:49:14 -08:00
ThatOneCalculator 44a457b308
fix: migration labels 2022-12-11 17:40:10 -08:00
ThatOneCalculator 4adc936fc1
fix viewing basic federaion info 2022-12-11 17:36:24 -08:00
ThatOneCalculator 14b632a828
fix: call functions properly 2022-12-11 17:33:45 -08:00
ThatOneCalculator 177eacbceb
fix unicode weirdness 2022-12-11 17:30:18 -08:00
ThatOneCalculator 7f677cbc66
Pop-up to confirm migration 2022-12-11 17:28:11 -08:00
ThatOneCalculator f2506160be
locale 2022-12-11 17:19:33 -08:00
cutestnekoaqua d613c5d9de Add admin and account locked error. 2022-12-12 02:17:07 +01:00
ThatOneCalculator f9615f233f
Reserve merge conflict 2022-12-11 17:07:57 -08:00
cutestnekoaqua 792fcc9f9c Change Version to release candidate 1 2022-12-12 02:00:28 +01:00
cutestnekoaqua 91e39fa829 integrate migration ui and api backend 2022-12-12 01:54:44 +01:00
chimiana 06746e73b5 Update Dockerfile with python3 dependency required for docker-compose build step to succeed 2022-12-12 01:54:44 +01:00
Kainoa Kanter 8c882c2698 docs: 📝 scylla will be optional 2022-12-12 01:54:44 +01:00