Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,031 Commits 12 Branches 45 Tags 104 MiB
876d178daa
Commit Graph

1031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
876d178daa Add config and import dirs, so perms dont go funky 2022-03-02 05:11:11 +00:00
Zedifus
53b2b2ed4b Revert my last commit correctly 
Man these are so getting squashed
 2022-03-01 20:20:17 +00:00
Zedifus
b5f6e3587f Merge branch 'devops/userns-rootless-container' of https://gitlab.com/crafty-controller/crafty-commander into devops/userns-rootless-container 2022-03-01 20:15:53 +00:00
Zedifus
326f5aa78d Revert my last commit 2022-03-01 20:14:53 +00:00
Zedifus
98c0c403c9 Investigating a different approach of non root 
These commits are 100% getting squashed.
Just got to test this on my production machine.
Definitely not sure if this is the right way of doing it experimenting.
 2022-02-28 20:01:14 +00:00
Zedifus
44d36b84f2 Update pip in dep build 2022-02-27 21:25:44 +00:00
Zedifus
0bacad0245 Apply file perms from env in entrypoint 2022-02-27 20:55:31 +00:00
Zedifus
cef4fac823 Correct MC Serv Port range to 100 ports default 
To match Dockerfile
 2022-02-27 19:25:23 +00:00
Zedifus
31bf32c847 Merge branch 'dev' into devops/userns-rootless-container 2022-02-27 18:48:27 +00:00
Zedifus
0de6948b4c Rework rebased Dockerfile for an attempt at userns 2022-02-27 18:38:30 +00:00
Zedifus
a488802847 Add required userns env variables 
And missing TZ var
 2022-02-27 18:35:24 +00:00
Zedifus
a0e6822bf3 Remove unrequired files from image 2022-02-27 18:33:48 +00:00
Lukas ‎‎‎‎
67c76f1d1c Merge branch 'lukas-noinjection' into 'dev' 
Reduced the amount of injection in JavaScript.

See merge request crafty-controller/crafty-commander!170
 2022-02-27 18:17:06 +00:00
luukas
775c4d5c9f Fix this one little stupid bug 2022-02-27 20:14:14 +02:00
luukas
154b99792f Fix code quality :) 2022-02-27 19:45:32 +02:00
Andrew
8fb52c40b6 Merge branch 'pretzel-file-check' into 'dev' 
Add check to make sure server file is downloaded before attempting to start

See merge request crafty-controller/crafty-commander!169
 2022-02-27 17:29:57 +00:00
luukas
92c2af926a Reduced the amount of injection in JavaScript. 
* Moved file endpoints to file_handler.py
* Added a global `serverId` for some pages
* Fixed fi_FI translations
* Some other stuff I don't remember
 2022-02-27 19:26:54 +02:00
Andrew
dfed1cbedc Add check to make sure server file is downloaded before attempting to start 2022-02-27 12:22:52 -05:00
Andrew
2265adbf82 Merge branch 'pretzel-fixes' into 'dev' 
Bedrock support/chain reaction tasks / server re-ordering

See merge request crafty-controller/crafty-commander!166
 2022-02-27 12:46:40 +00:00
Andrew
6b5f4bcc21 Remove outdated exit code 2022-02-26 22:14:19 -05:00
Andrew
211214a38a Work around for servers not shutting down on crafty shutdown 2022-02-26 22:09:59 -05:00
Andrew
8826ba2c91 Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes 2022-02-26 21:11:42 -05:00
Andrew
71769d9d23 Appease the linter 2022-02-26 21:11:33 -05:00
Zedifus
59ddff16e3 Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes 2022-02-27 01:58:07 +00:00
Zedifus
c409efbe28 Add server imports mount 
To get foreign zips/servers into crafty...
(Better than I'm going to import servers into servers)
 2022-02-27 01:57:54 +00:00
Zedifus
d8a875f5d0 Rebase from Alpine back to ubuntu 
This makes me really sad but is necessary for bedrock support.
Bedrock is compiled for a different libc than alpine has. #sadifus
 2022-02-27 01:54:07 +00:00
Andrew
3b0fbc7e36 English translation for edit scheudles 2022-02-26 20:40:17 -05:00
Andrew
5fa04d5ccc Refactor tasks.html to schedules.html to match naming scheme 2022-02-26 20:23:20 -05:00
Andrew
f82241c96e Add check so you cannot drag and drop anchor tag in dashboard row 2022-02-26 20:02:10 -05:00
Andrew
76b243d695 Remove codeblock that would cause js to vomit 2022-02-26 18:24:03 -05:00
Andrew
09335fc3d9 Add ability to reorder servers based on user 2022-02-26 18:00:54 -05:00
Andrew
1ab4ffd8f7 Add execution command for bedrock server jar 2022-02-26 12:42:01 -05:00
Andrew
59ea0a326d Add a / for execution 2022-02-26 12:35:23 -05:00
Andrew
879197a3e9 Fix typo in server.py 2022-02-26 12:31:55 -05:00
Andrew
18e2ac8328 Change zip import execution string to the correct one 
Fix front end for bedrock imports
Add server type to details
 2022-02-26 12:29:07 -05:00
Andrew
c625781da8 Fix typo in main_controller 2022-02-26 12:14:41 -05:00
Andrew
f3d5f4f454 Fix Bedrock for linux 2022-02-26 12:12:02 -05:00
Andrew
733b5c9a2c Add the right env variable for bedrock on linux 2022-02-26 11:59:19 -05:00
Andrew
92f9bceaf9 Revert to original popen scheme 2022-02-26 11:51:28 -05:00
Andrew
b6b8a1c14a Add env parameter to popen 2022-02-26 11:29:36 -05:00
Andrew
e3669a2483 Add check for non-windows running bedrock to set env variable 2022-02-26 11:25:08 -05:00
Andrew
48b9963a27 Add check so chain-reaction schedule cannot be assigned to itself. 2022-02-25 21:18:15 -05:00
Andrew
96d52376f3 Fix bug where new schedules could not be created 2022-02-25 20:50:07 -05:00
Andrew
58c9321c8f fix bug where schedules would not be able to be created. 2022-02-25 20:43:33 -05:00
Andrew
45ae49e84e Add features to child tasks 2022-02-25 19:53:38 -05:00
Andrew
31cb2793fd Fix a couple bugs with chain reactions 2022-02-24 00:19:54 -05:00
Andrew
8b981f3f27 appease the linter 2022-02-23 23:47:10 -05:00
Andrew
a54a4780b3 fix typo in front end 2022-02-23 23:43:50 -05:00
Andrew
af16834419 Working chain reactions 2022-02-23 22:59:16 -05:00
Andrew
c1020ff3d1 Working chain reaction tasks 2022-02-23 22:58:48 -05:00