e2net/iceshrimp-legacy
2
0
Fork 0
forked from mirrors/firefish
Code Issues Pull requests Packages Projects Releases Activity
22679 commits 4 branches 0 tags 373 MiB
Commit graph

22679 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chimiana 206223efd3 roll back changes to example.yml 2022-12-17 06:58:33 +00:00
ThatOneCalculator 9d3acc4786
chore: lint 2022-12-16 18:28:05 -08:00
chimiana 52070e788e Merge branch 'flatwebp' into develop 2022-12-17 02:27:43 +00:00
chimiana 3e9076045c Fix for #9194, converts webp to png instead of jpg, preserving transparency 2022-12-17 02:26:19 +00:00
chimiana 464a38cc70 update example.yml with container names specified in docker-compose, to support running either a dev or production containers off the same configs 2022-12-17 00:35:21 +00:00
chimiana 134a7af411 Changes to server admin docker-compose.yml to support having both a dev and a production docker-compose running off the same configs 2022-12-17 00:31:39 +00:00
chimiana 63f3849872 Changed filenames and .gitignore to allow a working docker-compose next to the example provided 2022-12-17 00:25:46 +00:00
ThatOneCalculator 9137698245
fix: use correct color for MkMoved 2022-12-16 14:52:43 -08:00
ThatOneCalculator b06b97b7c2
Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-16 14:38:25 -08:00
ThatOneCalculator 2abe0877e9
refactor: 👥 update cleo link 2022-12-16 14:38:18 -08:00
Kainoa Kanter e8bef30c0b Update 'docker-README.md' 2022-12-16 22:34:27 +00:00
Kainoa Kanter 92325b1743 fix-docker-env-path (#9241) 2022-12-16 22:25:45 +00:00
finner 82732b6532 Fixed path to docker.env on line 36 in docker-compose.yml. 2022-12-16 22:59:10 +01:00
ThatOneCalculator 003762fb24
Fix spacing 2022-12-16 13:39:45 -08:00
ThatOneCalculator eb0f42e53a
docs: 📝 badges [CI Skip] 2022-12-16 13:36:50 -08:00
ThatOneCalculator 6b4425e309
docs: 📝 more badges 2022-12-16 13:30:58 -08:00
ThatOneCalculator 4a21d43b77
Add cafkafk to patron list 2022-12-16 12:08:26 -08:00
ThatOneCalculator 17deb28670
fix typo 2022-12-16 11:12:32 -08:00
Kainoa Kanter fc3f7b7339 Merge pull request 'Fix logo icons' (#9240) from develop into main 
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9240
 2022-12-16 18:51:08 +00:00
ThatOneCalculator 028643a531
Fix logo icons 2022-12-16 10:50:26 -08:00
Kainoa Kanter 42fc3f083f Merge pull request 'develop' (#9239) from develop into main 
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9239
 2022-12-16 18:44:50 +00:00
ThatOneCalculator af2f878990
refactor: rm .github folder 2022-12-16 10:44:09 -08:00
ThatOneCalculator 1fb3f16f37
fix: insert into correct textarea 2022-12-16 10:40:08 -08:00
ThatOneCalculator eecf0ccce3
fix: css class match 2022-12-16 10:36:53 -08:00
ThatOneCalculator 7e076cff75
feat: Insert text at cursor for caption 2022-12-16 10:25:05 -08:00
ThatOneCalculator e2dbed7ec7
fix: 🐛 fix inconsistent theming 2022-12-16 10:21:10 -08:00
Kainoa Kanter 114e1fa371 docs: 📝 fix badge position 2022-12-16 17:35:54 +00:00
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
PK 83c7abd9b4
Make indentation not completely suck 2022-12-15 18:09:00 -06: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