mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-21 10:08:05 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,728 Commits 15 Branches 30 Tags 1.3 GiB
3162539c37
Commit Graph

22728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThatOneCalculator
91893ea5c7 chore: lint 2022-12-16 18:28:05 -08:00
chimiana
a8d2800504 Merge branch 'flatwebp' into develop 2022-12-17 02:27:43 +00:00
chimiana
41158e9224 Fix for #9194, converts webp to png instead of jpg, preserving transparency 2022-12-17 02:26:19 +00:00
chimiana
84eb341354 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
27b77cef80 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
edf7af790b Changed filenames and .gitignore to allow a working docker-compose next to the example provided 2022-12-17 00:25:46 +00:00
ThatOneCalculator
f0507efeb0 fix: use correct color for MkMoved 2022-12-16 14:52:43 -08:00
ThatOneCalculator
30fe02debb Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-16 14:38:25 -08:00
ThatOneCalculator
d52ceb0150 refactor: 👥 update cleo link 2022-12-16 14:38:18 -08:00
Kainoa Kanter
265314063d Update 'docker-README.md' 2022-12-16 22:34:27 +00:00
Kainoa Kanter
3451c500b9 fix-docker-env-path (#9241) 2022-12-16 22:25:45 +00:00
finner
ce7bebaeb7 Fixed path to docker.env on line 36 in docker-compose.yml. 2022-12-16 22:59:10 +01:00
ThatOneCalculator
e389d28b02 Fix spacing 2022-12-16 13:39:45 -08:00
ThatOneCalculator
ab4e3e188f docs: 📝 badges [CI Skip] 2022-12-16 13:36:50 -08:00
ThatOneCalculator
5f1a4c634d docs: 📝 more badges 2022-12-16 13:30:58 -08:00
ThatOneCalculator
37f3f79c29 Add cafkafk to patron list 2022-12-16 12:08:26 -08:00
ThatOneCalculator
d77db38d71 fix typo 2022-12-16 11:12:32 -08:00
Kainoa Kanter
56e370d779 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
11bf1a98d0 Fix logo icons 2022-12-16 10:50:26 -08:00
Kainoa Kanter
a4ee13cd14 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
d2e0dbfa73 refactor: rm .github folder 2022-12-16 10:44:09 -08:00
ThatOneCalculator
71f9378d35 fix: insert into correct textarea 2022-12-16 10:40:08 -08:00
ThatOneCalculator
b395874945 fix: css class match 2022-12-16 10:36:53 -08:00
ThatOneCalculator
2be8bf2078 feat: Insert text at cursor for caption 2022-12-16 10:25:05 -08:00
ThatOneCalculator
0494feb4ae fix: 🐛 fix inconsistent theming 2022-12-16 10:21:10 -08:00
Kainoa Kanter
2608c3d92b docs: 📝 fix badge position 2022-12-16 17:35:54 +00:00
Cleo
46b636fb4f 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
d7492ff36d its "main" 
Signed-off-by: Cleo <cutestnekoaqua@noreply.codeberg.org>
 2022-12-16 17:13:41 +00:00
Kainoa Kanter
991a65c0a1 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
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