Commit Graph

22438 Commits

Author SHA1 Message Date
Cleo 06861d0efe Merge pull request 'its "main"' (#9238) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9238
2022-12-16 17:14:28 +00:00
Cleo 77b916c627 its "main"
Signed-off-by: Cleo <cutestnekoaqua@noreply.codeberg.org>
2022-12-16 17:13:41 +00:00
Kainoa Kanter 0f411c3616 Merge pull request 'develop' (#9237) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9237
2022-12-16 17:07:51 +00:00
Kainoa Kanter 4e7e643bd5 Merge pull request 'Add FK abuse_user_report.targetUserId -> user.id (closes #9227)' (#9236) from undefined/calckey:add_fk_abuse_user_report_target_user_id into develop
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9236
2022-12-16 17:02:20 +00:00
Cleo 49626f54a8 Merge pull request 'v13' (#9235) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9235
2022-12-16 16:59:54 +00:00
Undefined 7ed2a4a84f
Add FK abuse_user_report.targetUserId -> user.id (closes #9227) 2022-12-16 17:15:53 +01:00
cutestnekoaqua 3507138c77
v13🔖🚀 2022-12-16 16:36:13 +01:00
cutestnekoaqua 2b6f25e15d
Language changes 2022-12-16 16:33:48 +01:00
cutestnekoaqua 988bbedbfa
Release Candidate 1. If no furter changes
this will be v13
2022-12-16 02:09:22 +01:00
cutestnekoaqua 48b6d50e34
lsat CI fixes 2022-12-16 01:54:40 +01:00
cutestnekoaqua 2182d8f3ec
its ready for his return.. which hopefully happens 2022-12-16 01:52:17 +01:00
cutestnekoaqua ffe59d4bde
fix docker ci 2022-12-16 01:40:30 +01:00
cutestnekoaqua 0ad5ec427d
upgrade CI 2022-12-16 01:33:09 +01:00
cutestnekoaqua 3cdcc207b9
Finalise POST-Move 2022-12-16 01:06:30 +01:00
cutestnekoaqua 8ba9380743
Add CI Link to Docs 2022-12-16 01:06:30 +01:00
Cleo 24306676c2 Merge pull request 'Docker compose changes ' (#9204) from chimiana/calckey:develop into develop
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9204
2022-12-15 23:19:01 +00:00
chimiana a226995589 Moved 'docker for development' stanza from root README.md to docker-README.md 2022-12-15 23:19:04 +00:00
chimiana 5aeda4635f Update to docker-compose for development section of README 2022-12-15 23:19:04 +00:00
chimiana badaf77657 Tweaks to docker-README.md to reflect its new relative path 2022-12-15 23:19:04 +00:00
chimiana b7477a26fb Attempting to fix link in docs 2022-12-15 23:19:04 +00:00
chimiana f8736ebfe0 Updated README.md with link to docker-README.md instead of link to Docker Hub 2022-12-15 23:19:04 +00:00
chimiana 1930c23cd5 Fixed issues with relative paths in dev/docker-compose.yml caused by moving it to a subdirectory 2022-12-15 23:19:04 +00:00
chimiana c1ae61551e Moved dev docker-compose.yml to dev/, instance admin docker-compose.yml to /, removed new example files, moved docs to root and adjusted them to reflect file changes 2022-12-15 23:19:04 +00:00
chimiana d4f8ba118a Made the docs much shorter 2022-12-15 23:19:04 +00:00
chimiana 08b727874f Fixed error in swag configuration stanza 2022-12-15 23:19:04 +00:00
chimiana 20be880f51 Added README.md to docker/ with instructions on running a server instance with docker-compose 2022-12-15 23:19:04 +00:00
chimiana 23ce63e49f instance server admin docker-compose files and docs 2022-12-15 23:19:04 +00:00
chimiana e85aa145bb Added _button class to nav items that were missing it 2022-12-15 23:19:04 +00:00
chimiana 0adf713f85 Removed tap-highlight-color from style.scsss as it is not a valid css property 2022-12-15 23:19:04 +00:00
chimiana 058a4db835 Updated autosize dependency to 5.0.2. This fixes #9040 as it was a bug in the dependency. 2022-12-15 23:19:03 +00:00
chimiana b851ed48ad Corrections to README.md
A spelling mistake and remove a docker command that does not work
2022-12-15 23:19:03 +00:00
cutestnekoaqua 8705cb8251
User Page redesign 2022-12-15 19:13:36 +01:00
cutestnekoaqua 58fa02059d
add check for already moved 2022-12-15 17:39:28 +01:00
cutestnekoaqua ccdbe15b68
set move ratelimit to graceful 5 times. 2022-12-15 16:59:11 +01:00
cutestnekoaqua c17755e109
create local uri out of ID [CI SKIP] 2022-12-15 16:55:22 +01:00
cutestnekoaqua ae27aabbef
change error msg [CI SKIP] 2022-12-15 16:40:13 +01:00
cutestnekoaqua af61a1243e
revert url to uri 2022-12-15 16:33:08 +01:00
cutestnekoaqua e67afc66f3
Beta 8! 2022-12-15 13:39:42 +01:00
cutestnekoaqua d0ceb4cd70
Unfinished refactor of User Layout 2022-12-14 21:17:06 +01:00
cutestnekoaqua 785ace95a4
Add Rebuild Option [CI Skip] 2022-12-14 18:09:58 +01:00
cutestnekoaqua 8a7da9eaa0
fix federation of moved to to pleroma
because it expects it to be non-existant if its null.
2022-12-14 17:19:31 +01:00
cutestnekoaqua 5bbf30bc71
fix redis in ci 2022-12-14 00:11:09 +01:00
cutestnekoaqua 20eee1f83c
make enviroment mutable 2022-12-13 23:37:24 +01:00
cutestnekoaqua c67fb64e4a
Add simple Commit CI 2022-12-13 23:32:28 +01:00
cutestnekoaqua ed0b585fe9
Add Calckey copyright 2022-12-13 20:23:58 +01:00
Kainoa Kanter 75b1155453 Merge pull request 'Delete empty locale files & Fetch locales regardless of version' (#9223) from CherryKitten/calckey:develop into develop
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9223
2022-12-13 19:17:53 +00:00
CherryKitten b65da99eaa Merge branch 'develop' into develop 2022-12-13 19:07:43 +00:00
CherryKitten cceaef1956 Merge branch 'develop' into develop 2022-12-13 19:07:12 +00:00
ThatOneCalculator 75427d9767
Add griff to patron list 2022-12-13 11:07:02 -08:00
CherryKitten c6aad324a0
Always fetch locales when initiating client 2022-12-13 20:04:29 +01:00