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
2,849 Commits 12 Branches 45 Tags 104 MiB
a1eb6f1a44
Commit Graph

818 Commits

Author SHA1 Message Date
amcmanu3
87fdb1627c Add feature - ignore exit codes on crash detection 2023-02-10 14:02:26 -05:00
amcmanu3
f381562b3b Make monitored mount points user configurable 2023-02-05 19:05:20 -05:00
amcmanu3
a6d1f7b62c Add realtime storage updates 2023-02-05 18:03:59 -05:00
amcmanu3
0afa2cfd97 Add dir calc to separtate schedule- reduce latency 2023-02-05 13:08:04 -05:00
amcmanu3
a70d531ae1 Refactor naming of keys 2023-02-05 13:06:52 -05:00
amcmanu3
5bccfab7b6 add ignored names in conditional 2023-01-31 13:53:27 -05:00
amcmanu3
750e4f40c0 Remove "my secret" from authentication 2023-01-31 13:30:41 -05:00
amcmanu3
43c11f80b8 Appease the linter 2023-01-30 19:11:37 -05:00
amcmanu3
e43c63a8b7 Fix db not found issue 
Add page feedback.
 2023-01-30 18:31:46 -05:00
amcmanu3
863ded782a Add move servers dir functionality 2023-01-30 15:23:10 -05:00
amcmanu3
aaefcb913b Append to subdir function for windows mapping 2023-01-30 15:22:40 -05:00
amcmanu3
3a763178d7 Merge branch 'dev' into tweak/master-server-dir-config 2023-01-30 12:14:58 -05:00
Iain Powrie
4300cab1b9 Merge branch 'refactor/config-json' into 'dev' 
Managed config.json refactor

See merge request crafty-controller/crafty-4!485
 2023-01-29 23:33:55 +00:00
amcmanu3
3f3595acb4 Sort config.json in alphabetical order 2023-01-29 18:21:04 -05:00
amcmanu3
bd8e12f884 Fix wording in reset 2023-01-29 17:00:28 -05:00
amcmanu3
2d9529ba0c Add cookie secret to DB 
Allow users to reset cookie and api secret
Add Crafty row to table on fresh install
Change inserts to updates for crafty settings table.
 2023-01-29 16:54:02 -05:00
amcmanu3
02273580f6 Appease the linter AGAIN 2023-01-29 15:20:27 -05:00
amcmanu3
5ab224d17e Appease the linter 2023-01-29 15:18:10 -05:00
amcmanu3
040536f320 Merge branch 'dev' into bugfix/file-tree-reload 2023-01-29 15:13:02 -05:00
Zedifus
aa2ba4f8cf Merge branch 'dev' into refactor/config-json 2023-01-29 20:00:09 +00:00
amcmanu3
8ee274a927 Remove config.json from repo. 
Remove version checking.
Move master config to helpers.
Add config.json when not found on start.
 2023-01-29 14:54:25 -05:00
Zedifus
14d444b90c Merge branch 'dev' into tweak/server-stats-db-hidden 2023-01-29 18:59:29 +00:00
amcmanu3
78d27bbc13 Remove bedrock naming ping scheme. Add raknet 2023-01-29 13:59:11 -05:00
amcmanu3
e0541b1ec0 Change file tree doesn't reload on upload/delete 2023-01-28 19:10:27 -05:00
amcmanu3
afdb9d9386 Use ignored_names as class variable in helpers 2023-01-27 17:36:23 -05:00
Zedifus
e217c63fdf Merge branch 'dev' into bug/ReworkDefautPublicHandler 2023-01-27 19:59:12 +00:00
Zedifus
b5d259bce7 Merge branch 'dev' into feature/backup-echo 2023-01-27 19:39:05 +00:00
Zedifus
84592c178e Merge branch 'dev' into refactor/scheduled-task-queue 2023-01-27 19:30:03 +00:00
Andrew
8a5cc6d1e6 Set up back end for master server dir 2023-01-26 19:21:39 -05:00
Silversthorn
4248174041 Fixing Double Migration at Startup 2023-01-25 23:20:45 +01:00
Andrew
58f6448784 Move sleep into shutdown block 2023-01-21 13:16:01 -05:00
Andrew
248a5a63a9 Include option for after command 2023-01-21 13:13:02 -05:00
Andrew
cf9ad77879 Add option to run command before backup 2023-01-20 17:35:30 -05:00
amcmanu3
7ee86f3ce1 Fix logic issue 2023-01-19 12:06:29 -05:00
amcmanu3
dfa2f5fb1e Remove antequeted code after moving from db 2023-01-19 11:28:00 -05:00
amcmanu3
efd3bef029 Use queues for scheduled task disapatch 2023-01-19 11:27:33 -05:00
amcmanu3
6dfabab4af Set backup filename to use same time as schedule 2023-01-17 10:27:55 -05:00
Andrew
4031b74e00 Hide server stats db from users 2023-01-09 16:34:12 -05:00
Zedifus
1680ce18f5 Merge branch 'dev' into feature/steamcmd 2023-01-07 18:57:32 +00:00
Andrew
52ef76e15b Replace google ping for ntp for usability in china 2023-01-03 10:14:10 -08:00
Zedifus
205d111251 Merge branch 'dev' into bug/unzip-logic 2023-01-02 22:48:42 +00:00
Zedifus
aaffe69cb3 Merge branch 'dev' into bug/nested-reaction 2023-01-02 22:10:22 +00:00
Zedifus
c80d357f13 Fix CodeQuality, line length 2023-01-02 20:59:29 +00:00
Andrew
4922998b14 Remove extra task definition 2023-01-02 14:34:08 -05:00
Andrew
985178b993 Update zip import status 2023-01-02 14:26:42 -05:00
Andrew
872489d125 Remove useless block in unzip method 
This was causing an error.
 2023-01-02 12:20:18 -05:00
Andrew
9ebdbbf5af Fix bug where nested reaction tasks would stack 2023-01-01 23:13:07 -05:00
Silversthorn
9dac0b5d85 Adding Forge Installer Compaptibility with old versions 2022-12-22 19:32:56 +01:00
Andrew
d5cc4529b0 Add try/except for not finding run file 2022-12-21 21:55:21 -05:00
Zedifus
d5475b0121 Merge branch 'dev' into feature/steamcmd 2022-12-21 16:18:45 +00:00
amcmanu3
fbc506f2fd Fix issues after merge conflicts 2022-12-19 17:15:26 -05:00
Andrew
3ab57f116c Merge branch 'dev' into 'refactor/config-json' 
# Conflicts:
#   app/classes/shared/helpers.py
 2022-12-19 22:13:10 +00:00
Andrew
6572dc5e10 Appease the linter 2022-12-16 18:47:36 -05:00
Andrew
551020f738 Create our own check function 2022-12-14 14:54:52 -05:00
Zedifus
7b07ac088b Merge branch 'dev' into feature/steamcmd 2022-12-01 00:17:55 +00:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05:00
Silversthorn
b4dca8b27f Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install 2022-11-19 23:20:26 +01:00
Silversthorn
004049f6da Using Regex to Extract Infos from Forge Scripts 2022-11-19 23:20:21 +01:00
Andrew
32cdde0616 Fix failed imports 2022-11-19 16:13:44 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
Andrew
ad4603aafb Add automated forge server creation installs 2022-11-19 13:45:18 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Zedifus
48b8b9d084 Merge branch 'dev' into refactor/config-json 2022-10-23 21:30:41 +01:00
Zedifus
d165cdf223 Merge branch 'dev' into feature/steamcmd 2022-10-23 21:29:51 +01:00
Zedifus
1f842574c4 Merge branch 'dev' into tweak/stats-clients 2022-10-22 20:26:18 +01:00
Andrew
23b3e642a0 Only collect server stats when clients 2022-10-20 15:33:51 -04:00
Andrew
c2f5daf8e9 Remove feature for modded servers 2022-10-20 15:05:58 -04:00
Andrew
2d5d263852 Automatically set update url for server creation 2022-10-20 14:58:43 -04:00
Andrew
51f507c4f8 Add comments 2022-10-13 12:25:29 -07:00
Andrew
3f2e50a5dd Add config compare to not overwrite user changes 2022-10-13 12:17:31 -07:00
Zedifus
0721c0d7d4 Strip meta from sem version 2022-10-08 18:34:38 +01:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
Zedifus
c1374b5c7f Merge branch 'dev' into bug/port-constraint 2022-10-05 22:12:14 +01:00
Zedifus
522adb765c Appease lint 
Major - R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it
 2022-10-05 22:02:17 +01:00
amcmanu3
3681f52856 Fix scheduled task disable 2022-10-04 16:07:08 -04:00
Andrew
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
Andrew
f558388a0f Update themes to include all colors 2022-10-04 13:31:37 -04:00
Zedifus
d8ddc1ce27 Merge branch 'dev' into feature/steamcmd 2022-10-02 22:25:32 +01:00
Andrew
352a3e12e7 Fix minor bugs with uploads import 2022-10-02 15:54:13 -04:00
Andrew
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import' 
# Conflicts:
#   app/frontend/templates/server/wizard.html
 2022-10-02 19:10:05 +00:00
Andrew
a21bb36f7c Make it so a user cannot upload anything but zip 
TODO add better feedback than "error"
 2022-09-27 23:07:44 -04:00
Andrew
f090bf8c6f Add task to check for old files every 12 hours 2022-09-27 22:57:24 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
amcmanu3
63347f956b Fix logical issues surrounding Gravatar fetch 2022-09-19 20:00:15 -04:00
Zedifus
0829331534 Appease Minor and Major lint issues in !464 2022-09-19 23:49:16 +01:00
Zedifus
532409a08d Merge branch 'dev' into bug/start-nonetype 2022-09-19 22:57:42 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
Andrew
67d465b94c Add debug logging 2022-09-12 15:36:13 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
Andrew
6a6376ea8a appease the linter 2022-09-07 16:52:27 -04:00
Andrew
d45e32013b Fix backup exclusion issue 2022-09-07 16:51:41 -04:00
Andrew
296a5a46de Add comments. Debug logging 2022-09-07 16:01:42 -04:00
Zedifus
a29afbb27b Intigration of AppID retrival 
for Steam Dedicated Servers
 2022-09-07 16:12:11 +01:00
Zedifus
279726c19b Add AppID retrival for Steam Dedicated Servers 2022-09-07 16:11:21 +01:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
76a499f5a4 Fix start server after updates 
Fix update notifs
 2022-09-04 17:50:08 -04:00
Zedifus
385ceb9655 Merge branch 'dev' into tweak/password-reset 2022-09-04 21:41:27 +01:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00