Commit graph

22849 commits

Author SHA1 Message Date
Kainoa Kanter
1f497468f4 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
5a676912fb 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
29ea572c59 Add FK abuse_user_report.targetUserId -> user.id (closes #9227) 2022-12-16 17:15:53 +01:00
cutestnekoaqua
c060af47b0 v13🔖🚀 2022-12-16 16:36:13 +01:00
cutestnekoaqua
780a945060 Language changes 2022-12-16 16:33:48 +01:00
cutestnekoaqua
d353077aee Release Candidate 1. If no furter changes
this will be v13
2022-12-16 02:09:22 +01:00
cutestnekoaqua
ba831d07dc lsat CI fixes 2022-12-16 01:54:40 +01:00
cutestnekoaqua
da44d19ab0 its ready for his return.. which hopefully happens 2022-12-16 01:52:17 +01:00
cutestnekoaqua
6b4fffa611 fix docker ci 2022-12-16 01:40:30 +01:00
cutestnekoaqua
cb67cd9288 upgrade CI 2022-12-16 01:33:09 +01:00
PK
54c3d43ccf Make indentation not completely suck 2022-12-15 18:09:00 -06:00
cutestnekoaqua
5002f0aa2b Finalise POST-Move 2022-12-16 01:06:30 +01:00
cutestnekoaqua
01d14d6f04 Add CI Link to Docs 2022-12-16 01:06:30 +01:00
Cleo
c489863090 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
95d26bfc7f Moved 'docker for development' stanza from root README.md to docker-README.md 2022-12-15 23:19:04 +00:00
chimiana
cfc604565c Update to docker-compose for development section of README 2022-12-15 23:19:04 +00:00
chimiana
772c117760 Tweaks to docker-README.md to reflect its new relative path 2022-12-15 23:19:04 +00:00
chimiana
a510411339 Attempting to fix link in docs 2022-12-15 23:19:04 +00:00
chimiana
a335ff0f9e Updated README.md with link to docker-README.md instead of link to Docker Hub 2022-12-15 23:19:04 +00:00
chimiana
6c0a4992f2 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
5308e799dd 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
5d86ab0011 Made the docs much shorter 2022-12-15 23:19:04 +00:00
chimiana
185cf5821c Fixed error in swag configuration stanza 2022-12-15 23:19:04 +00:00
chimiana
0288feb906 Added README.md to docker/ with instructions on running a server instance with docker-compose 2022-12-15 23:19:04 +00:00
chimiana
4771ef7720 instance server admin docker-compose files and docs 2022-12-15 23:19:04 +00:00
chimiana
75b9d27494 Added _button class to nav items that were missing it 2022-12-15 23:19:04 +00:00
chimiana
e676692175 Removed tap-highlight-color from style.scsss as it is not a valid css property 2022-12-15 23:19:04 +00:00
chimiana
6cef7f5568 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
37ebadb6eb Corrections to README.md
A spelling mistake and remove a docker command that does not work
2022-12-15 23:19:03 +00:00
PK
2285812a88 Formatting 2022-12-15 16:13:48 -06:00
PK
52cc014e4d Translate portions of backend/src/remote/activitypub, the suspend-user service, and the boot process.
Some of these weren't translated so I thought I'd do 'em cause why not ¯\_(ツ)_/¯
2022-12-15 12:44:03 -06:00
cutestnekoaqua
49e4cd53a0 User Page redesign 2022-12-15 19:13:36 +01:00
cutestnekoaqua
32fac2c2c8 add check for already moved 2022-12-15 17:39:28 +01:00
cutestnekoaqua
ff9500b9e5 set move ratelimit to graceful 5 times. 2022-12-15 16:59:11 +01:00
cutestnekoaqua
8998bc7836 create local uri out of ID [CI SKIP] 2022-12-15 16:55:22 +01:00
cutestnekoaqua
3be1975b15 change error msg [CI SKIP] 2022-12-15 16:40:13 +01:00
cutestnekoaqua
a93990bbab revert url to uri 2022-12-15 16:33:08 +01:00
cutestnekoaqua
e84ced28ec Beta 8! 2022-12-15 13:39:42 +01:00
cutestnekoaqua
ae95540deb Unfinished refactor of User Layout 2022-12-14 21:17:06 +01:00
cutestnekoaqua
5b622ce273 Add Rebuild Option [CI Skip] 2022-12-14 18:09:58 +01:00
cutestnekoaqua
e26724b01e 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
745160adfe fix redis in ci 2022-12-14 00:11:09 +01:00
cutestnekoaqua
1b5a100bc7 make enviroment mutable 2022-12-13 23:37:24 +01:00
cutestnekoaqua
11798cd98b Add simple Commit CI 2022-12-13 23:32:28 +01:00
cutestnekoaqua
6e050e43f9 Add Calckey copyright 2022-12-13 20:23:58 +01:00
Kainoa Kanter
1103d08332 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
7af2c971f4 Merge branch 'develop' into develop 2022-12-13 19:07:43 +00:00
CherryKitten
bdd4e28073 Merge branch 'develop' into develop 2022-12-13 19:07:12 +00:00
ThatOneCalculator
a22079b136 Add griff to patron list 2022-12-13 11:07:02 -08:00
CherryKitten
e875bfc5d7 Always fetch locales when initiating client 2022-12-13 20:04:29 +01:00