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
Silversthorn
180ba5f8a7
Merge branch 'dev-PathHelpers' into 'dev'
...
Adding Helpers for Path
See merge request crafty-controller/crafty-commander!90
2021-11-21 10:58:59 +00:00
Silversthorn
ea48bd5562
Merge branch 'dev' into dev-PathHelpers
2021-11-21 11:56:07 +01:00
Silversthorn
f20d41242d
Adding Helpers for Path
...
Correcting a MVC update missing function
2021-11-21 11:52:29 +01:00
Andrew
315cd6909c
Fixes update bug where 2 parameters were given when update only expected one.
...
Adds "Access to All servers" for exec_super_user.
Will need to add translation support for accessto all servers message.
2021-11-20 12:25:14 -05:00
Silversthorn
77deb6c126
Cleaner Path for Backups
2021-11-20 15:34:58 +01:00
Silversthorn
5164000c9a
Fixing Path Errors for Backup files (Windows)
2021-11-20 14:44:20 +01:00
Silversthorn
0f70b288d7
Merge branch 'dev' into dev_ultimateFixes
2021-11-20 10:25:11 +01:00
Silversthorn
564eedce32
Update of my Credits Items (Sorry pipeline)
2021-11-20 10:16:57 +01:00
Andrew
b7039573a4
Maybe I fixed backups?
...
Another attempt at allowing windows users to think about what they did by choosing windows to run a server on while also deleting backups
2021-11-19 22:17:24 -05:00
Andrew
67444a2d4f
More reverts from the windows issue.
2021-11-19 22:02:59 -05:00
Andrew
79190e15f5
Revert last push
2021-11-19 21:56:09 -05:00
Andrew
bd3da474f5
Another attempt to fix backup delete issue.
...
This is hacky and can probably be done better.
2021-11-19 21:47:03 -05:00
Andrew
146873eb10
Attempt to fix windows backup delete issue. Zedifus will test.
2021-11-19 21:28:46 -05:00
Andrew
cef282ca91
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-11-19 21:10:33 -05:00
Andrew
4d31ee399a
Puts a temporary fix on deleting backups. Will be fixed in alpha 4
2021-11-19 21:09:09 -05:00
computergeek125
62cac66e8e
revert readall change since it didn't work
2021-11-19 19:06:35 -06:00
computergeek125
5230a7ddc3
fix I/O thread read, fixed thread ident/pid
2021-11-19 18:31:33 -06:00
computergeek125
45e074ac4a
Resolved thread leak, fixed non-Minecraft java terminate, renamed
...
threads
2021-11-19 18:14:32 -06:00
Silversthorn
0640a1ba98
Fixing MOTD on details server pages
2021-11-19 23:01:47 +01:00
Silversthorn
0ddc8015e9
Fixing server select list + traductions
2021-11-19 22:08:36 +01:00
Silversthorn
6f9d722a92
Fixing MOTD display
2021-11-19 21:59:23 +01:00
Zedifus
6a677df10c
Correct PT loc & bread dev
2021-11-19 19:27:26 +00:00
Craft Breadth
5cb21064d5
Added motd_format.json so that it Crafty would find it instead of creating an error
2021-11-19 18:58:13 +00:00
Iain Powrie
e7f73732f1
Merge branch 'tweak/credits-titles' into 'dev'
...
tweak/credits-titles
See merge request crafty-controller/crafty-commander!89
2021-11-19 18:53:18 +00:00
Zedifus
4139ac1152
Fix title formatting
2021-11-19 18:48:22 +00:00
Zedifus
9f066fbe39
Make Developer tag point to gitlab profile
2021-11-19 17:46:40 +00:00
Zedifus
19e3a7b63b
Change PT's title
2021-11-19 17:16:00 +00:00
Zedifus
460779e4ef
Make staff titles bold
2021-11-19 17:10:47 +00:00
Iain Powrie
c40ce93ca5
Merge branch 'tweak/update-credits-json' into 'dev'
...
Update Credits
See merge request crafty-controller/crafty-commander!87
2021-11-19 16:58:12 +00:00
Craft Breadth
810f2cf561
Merge branch 'revert-461411ad' into 'dev'
...
Revert "Grammar changes that should (TM) not break anything"
See merge request crafty-controller/crafty-commander!88
2021-11-19 16:49:32 +00:00
