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
510 Commits 12 Branches 45 Tags 104 MiB
02358f189b
Commit Graph

510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silversthorn
02358f189b Unique Name at Server Creation 2021-09-27 21:34:54 +02:00
Silversthorn
e059e7166c Fixing undefined controller on Upload 2021-09-26 01:02:05 +02:00
Silversthorn
85878382b7 Fixing Starting Servers 2021-09-26 00:25:24 +02:00
Silversthorn
057379d888 Fixing Remove Roles when Removing a Server 2021-09-26 00:17:06 +02:00
Silversthorn
eb3b86641d Fixing Server Deletion Error 2021-09-25 23:59:01 +02:00
Silversthorn
eee9796428 Move out_buf in the try method 2021-09-25 23:08:40 +02:00
Silversthorn
05ced7610e Correction of undefined db_helper following merge 2021-09-25 23:05:49 +02:00
Silversthorn
e381ebe239 Merge branch 'dev' into dev-Silversthorn-MVC 2021-09-25 22:58:01 +02:00
Andrew
d17e17e38b Fixes issue where user would be disabled after changing password if no servers existed. 2021-09-25 15:41:25 -04:00
Andrew
74f4bf748e Adds support for a friendlier splashscreen when no servers are created. 
Users can go to an empty dashboard instead of a wall of text.
 2021-09-25 15:07:39 -04:00
Andrew
28f46a6f01 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2021-09-25 13:26:46 -04:00
computergeek125
f10db73fa5 Set TCP timeout to a more reasonable value 2021-09-25 12:26:10 -05:00
Andrew
aa24782b5b Fixes error thrown on initial server creation for waiting_start. 2021-09-25 13:26:06 -04:00
Andrew
959b02f58f Adds exception to page_data for initial server creation. 2021-09-25 11:56:12 -04:00
Iain Powrie
b75d8fd69f Exclude classes recursively 
(I hope)
 2021-09-24 22:17:50 +00:00
Iain Powrie
047ce7f8b0 Exclude unnecessary classes from win-build 2021-09-24 22:10:43 +00:00
Zedifus
3a62456c62 Add excludes for unnecessary files from docker img 
Also test bread's runner build to see if successful
 2021-09-24 22:43:35 +01:00
Zedifus
d93038a70d Fix unhandled exception with port check function 2021-09-24 22:20:13 +01:00
Iain Powrie
3e84df601f Revert troubleshooting changes, add archive download comments 
Issue is runner's build deps not being present in breaded datacentre node, this will be updated tonight.
 2021-09-24 12:34:00 +00:00
Iain Powrie
378a5d0e4b Fix Runner incompatibility 2021-09-23 03:32:31 +00:00
Iain Powrie
3137419a5f Fix Runner incompatibility 2021-09-23 03:30:29 +00:00
Iain Powrie
9223404603 Update .gitlab-ci.yml file 2021-09-23 03:28:46 +00:00
Iain Powrie
65add452ab Update .gitlab-ci.yml file 2021-09-23 03:26:57 +00:00
Iain Powrie
9e87282302 Patch bugfix for runner 2021-09-23 02:34:15 +00:00
Iain Powrie
3e1198a7f2 Merge branch 'feature/ci-windows-pipeline' into 'dev' 
cicd windows build pipeline

See merge request crafty-controller/crafty-commander!76
 2021-09-23 02:06:03 +00:00
Iain Powrie
e05803598a Add pyinstaller icon 2021-09-23 02:05:29 +00:00
Zedifus
5fc1b58d11 Add pyinstaller pipes 2021-09-23 02:59:55 +01:00
Iain Powrie
fa78cd4c95 Merge branch 'tweak/ci-improvements' into 'dev' 
Apply pipeline improvements

See merge request crafty-controller/crafty-commander!75
 2021-09-22 18:04:41 +00:00
Zedifus
1fd257f361 Fix yml indentation 2021-09-22 19:02:28 +01:00
Zedifus
9837413a4f Tidy up after_script output 2021-09-22 18:53:00 +01:00
Zedifus
ad31b38f7c Remove buildx build step as can curl pre-built 2021-09-22 18:42:14 +01:00
Zedifus
35bd368e1e Fix builder instance not closing after build 2021-09-22 18:35:36 +01:00
Silversthorn
5146a490df Merge dev to dev-MVC 2021-09-21 21:13:17 +02:00
Silversthorn
186dcdc616 Merge branch 'dev-Silversthorn' into dev-Silversthorn-MVC 2021-09-21 21:12:56 +02:00
Silversthorn
813ce1c73b Merge branch 'dev' into dev-Silversthorn 2021-09-21 21:01:40 +02:00
Iain Powrie
0e040059a2 Update .gitlab-ci.yml 2021-09-21 00:52:18 +00:00
Andrew
0cac7fcd1e Merge branch 'dev-staging' into 'dev' 
Fix notify.html to properly check for superuser

See merge request crafty-controller/crafty-commander!73
 2021-09-20 22:40:06 +00:00
Andrew
44478939db Merge branch 'wait_start' into 'dev-staging' 
Wait start

See merge request crafty-controller/crafty-commander!72
 2021-09-20 22:32:19 +00:00
Andrew
6e54089890 Adds delayed start status for auto-launching servers when crafty starts. 2021-09-20 18:30:17 -04:00
Andrew
6561eaa1ed Merge branch 'auto-backup-fix' into 'dev-staging' 
Fixes bug where you cannot disable auto backup

See merge request crafty-controller/crafty-commander!71
 2021-09-20 19:59:56 +00:00
Andrew
afc95a40fe Fixes bug where you cannot disable auto backup 2021-09-20 15:41:08 -04:00
Andrew
f032f4054e Adds inital support for waiting to start. Need to test on more powerful machine. 2021-09-20 14:46:31 -04:00
Scott R
9813be70b0 Fix notify.html to properly check for superuser 
notify.html wasn't properly checking for superuser so the whole site would crash and burn in a fiery blaze when a user logged in
 2021-09-16 21:23:08 -05:00
Andrew
dfc07fcb4c Fixes message for audit log. I know, I know too many pushes to dev. I'm done I promise! 2021-09-13 22:58:29 -04:00
Andrew
f18d74540a Fixes bug where player counts would cause crash if not super user. 
Adds commands sent through terminal to audit log.
Makes it so regular users cannot see the audit log.
 2021-09-13 22:02:57 -04:00
Andrew
21b7519861 Merge branch 'dew-features' into 'dev' 
Works around bug for port/ip reporting

See merge request crafty-controller/crafty-commander!69
 2021-09-14 00:49:43 +00:00
Andrew
afb95dc828 Final change for port ping issues 2021-09-13 20:08:38 -04:00
Andrew
f594c7a638 Fixes server-port/ip not updating after config change for stats. 2021-09-13 19:18:56 -04:00
Andrew
92725d2249 Starts troubleshooting of port not changing after config change. 2021-09-13 17:52:09 -04:00
Andrew
c93ce1613d Adds check message for internet as it may take a minute. 2021-09-13 17:08:02 -04:00