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
681 Commits 12 Branches 45 Tags 104 MiB
6966605bd0
Commit Graph

681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iain Powrie
6966605bd0 Merge branch 'lang/include-new-language-pack' into 'dev' 
Lang/include new language pack

See merge request crafty-controller/crafty-commander!105
 2021-12-03 21:59:38 +00:00
Iain Powrie
e9ba371324 Lang/include new language pack 2021-12-03 21:59:38 +00:00
Andrew
e914f93ab5 Merge branch 'pretzel-windows' into 'dev' 
Fix Windows bug on server restore

See merge request crafty-controller/crafty-commander!104
 2021-11-30 00:17:41 +00:00
Andrew
0d34fcdea3 Add traveral check before deleting pre-existing backup dir 2021-11-29 19:13:21 -05:00
amcmanu3
b49077991e Fix backup dir rename issue on windows. 2021-11-29 19:09:43 -05:00
Andrew
e8f36cce8d Merge branch 'pretzel-windows' into 'dev' 
Add fix for windows Administrator lockout

See merge request crafty-controller/crafty-commander!103
 2021-11-29 22:21:19 +00:00
Andrew
73fbf19088 Add fix for windows Administrator lockout 2021-11-29 22:21:19 +00:00
Andrew
f2a55da58d Fix windows root issues. 2021-11-29 17:18:06 -05:00
Andrew
1625883a7b sending changes to windows 2021-11-29 17:12:25 -05:00
Andrew
79284a9094 Add potential fix for windows admin lockout 2021-11-29 16:56:17 -05:00
Andrew
a6b380152a Merge branch 'pretzel-fix' into 'dev' 
Backup Restore/Root Disable

See merge request crafty-controller/crafty-commander!102
 2021-11-29 21:22:46 +00:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
Andrew
798dac02a5 Make exe update field not required. 2021-11-27 21:55:59 -05:00
Andrew
78834c1ed0 Fix bug where general user can change working directory and potentially destroy a system. 
Initial commit for path traversal for server config only.
 2021-11-27 21:52:49 -05:00
Andrew
0cd8f6b3a7 Fix bug where no fields were required while editing servers 2021-11-27 20:09:13 -05:00
Andrew
f6f52d0f4e Merge branch 'pretzel-fixes' into 'dev' 
Fix autostart error with missing param.

See merge request crafty-controller/crafty-commander!100
 2021-11-28 00:43:18 +00:00
Andrew
4c6b459b43 Remove useless if in backups.i 2021-11-27 19:28:53 -05:00
Iain Powrie
3de1f38c7e Merge branch 'devops/tidy-image' into 'dev' 
Remove unnecessary files from docker image

See merge request crafty-controller/crafty-commander!99
 2021-11-28 00:21:01 +00:00
Zedifus
a07821ba14 Remove remaining unnecessary files from image 2021-11-28 00:16:02 +00:00
Andrew
bfe6cabd9e Fix bug where a false EULA on delay start would cause the user to never be able to start the server. 2021-11-27 18:43:14 -05:00
Iain Powrie
e14de5ff57 Switch Dockerfile additional apk repo to latest-stable 
Edge is not required anymore.
 2021-11-27 23:41:10 +00:00
Andrew
c7d3b3aa1c Fix update notifications. 2021-11-27 18:32:53 -05:00
Andrew
12c4c9ec45 Fix bug where all server terminals would show updating. 2021-11-27 17:46:37 -05:00
Andrew
1bf47b5c54 Rework server start to look for user_id and not user_lang. Gives acces to more user info. 
Fixes websocket broadcast to only send broadcast to user who sent original request.
 2021-11-27 17:10:43 -05:00
Andrew
db4812c8ea Add feature where if server executable is changed in config it also changes the execution string to match. 2021-11-27 14:29:28 -05:00
Andrew
b6a4698486 Add required to all server creation fields. 2021-11-27 13:52:53 -05:00
Andrew
e21a019de4 Add better logging to falling back to default language on server start. 2021-11-27 12:53:29 -05:00
Andrew
b99f0f502e Change Donation Page 
Remove direct link to donate to Phil's paypal.
Change Patreon Edition info since it's not relevant at this time.
 2021-11-27 12:26:31 -05:00
Andrew
64c4df343a Fix autostart error with missing param. 
Takes default lang for errors on auto start since there is no user language to choose from for an auto start error.
 2021-11-27 12:01:55 -05:00
bobsfriend12
f924c6e21a siwtch server ip description and server port description (on server config page) 2021-11-24 10:44:14 -06:00
Andrew
63857a54a4 Fix naming on users html table 2021-11-23 19:26:35 -05:00
Iain Powrie
d0b6b65a0d Merge branch 'bugfix/correct-tag-styles' into 'dev' 
bugfix/correct-tag-styles

See merge request crafty-controller/crafty-commander!92
 2021-11-23 23:35:41 +00:00
Zedifus
f309107174 Merge branch 'dev' into bugfix/correct-tag-styles 2021-11-23 23:30:02 +00:00
Iain Powrie
d3388eab85 Merge branch 'bugfix/cert-generation-exception' into 'dev' 
Fix certificate generation on fresh install

See merge request crafty-controller/crafty-commander!97
 2021-11-23 23:24:57 +00:00
Zedifus
4657cee59d Make cryptography a TLD again 
This is to fix:
'AttributeError: module 'lib' has no attribute 'X509_get_notBefore'
 2021-11-23 23:17:27 +00:00
Andrew
f569d3b4f0 Fix user lang for Lukas on panel_handler.py 2021-11-23 17:29:34 -05:00
Andrew
17abe01dcc Merge branch 'pretzel-patches' into 'dev' 
Fixes characters from merge conflict

See merge request crafty-controller/crafty-commander!96
 2021-11-23 22:21:36 +00:00
Andrew
c811c568a5 Fix Merge issues 2021-11-23 17:16:33 -05:00
Andrew
5705d3aaa2 Merge branch 'dev' into 'pretzel-patches' 
Merge Dev Into Pretzel

See merge request crafty-controller/crafty-commander!95
 2021-11-23 22:12:59 +00:00
Andrew
97ddc1b964 Merge branch 'pretzel-patches' into 'dev' 
# Conflicts:
#   app/classes/shared/server.py
 2021-11-23 22:12:06 +00:00
xithical
9fcd7f7fec Merge branch 'bobsfriend12-icons' into 'dev' 
fix disappearing icons

See merge request crafty-controller/crafty-commander!91
 2021-11-23 21:18:29 +00:00
Andrew
dc83dc8fc8 Add EULA confirm message on server startup if EULA is not found. 2021-11-23 16:11:23 -05:00
Andrew
0e942311fb Add error message on login that does not direct to new page. 
Remove failed to create dir error on startup when crafty cannot create dir since it exists after first startup.

Error logging is still enabled for every error except FileExists for this case.
 2021-11-23 13:22:15 -05:00
Andrew
eb39577cc7 Fix index out of range if user tries to import server without server.properties file. 
Fix port not changing for crafty db - only server.properties on server creation.
 2021-11-22 22:26:06 -05:00
Zedifus
7ae4e8b5bc Pull changes from patreon-generator 2021-11-23 02:55:08 +00:00
Zedifus
1b1a7b75d2 Apply correct style to unlinked developer tag 2021-11-23 02:42:23 +00:00
bobsfriend12
8781621a4c make the buttons stop disappearing 2021-11-22 16:51:53 -06:00
Iain Powrie
c6ddfc0dbc Replace incorrect variable in artifact name 
I was meaning to have the CI_COMMIT_SHORT_SHA referenced 
so we can identify a users build based on last commit (help support).
 2021-11-22 04:18:18 +00:00
Iain Powrie
cac4671c51 Tweak artifact download name 
Include more info for support cases to help identify which build user is having issue with
 2021-11-22 04:11:04 +00:00
Iain Powrie
2e512449a4 Add names to win artifact downloads 2021-11-22 03:51:54 +00:00