Scott R
5b8764cb45
Removed extra .zip
...
Unnecessary .zip in backup filename generation in server.py, nuked it
2021-08-14 00:00:09 -05:00
Scott R
096a38ae54
Redoing shutil zip after merging new DB things
...
Merged from Pretzel for DB change things and needed to readd code for shutil for zipping
2021-08-13 23:28:41 -05:00
Scott R
2319d69417
Merge branch 'pretzel' into xithical
2021-08-13 23:07:26 -05:00
xithical
4757ac0573
Repaired backup zipper and old backup removals
...
*Fixed zip arg, should be in quotes
*Set while statement to constantly check for and remove old backups
*Repaired old backup removal not pulling correct path
2021-08-13 22:06:22 -05:00
Scott R
5c85a575ee
Improving backup efficiency with shutil
...
Removed the old backup code that created a zip on a file-by-file basis and replaced it with make_archive from shutil to just zip the whole directory
2021-08-13 19:45:15 -05:00
Andrew
aebf50dfc6
Fixed updates
2021-08-12 00:33:18 -04:00
Andrew
0875734777
Key errors are fixed in this
2021-08-11 23:49:06 -04:00
Andrew
6cc87c6dd1
Cleaned up backups after I broke them.
2021-08-11 23:33:18 -04:00
Andrew
001a8ee9c3
Don't use a while loop to constantly write changes to DB.
2021-08-11 23:14:33 -04:00
Andrew
7d5a7658e2
Made failed server launch message more "in your face" to user.
2021-08-10 16:37:47 -04:00
Andrew
a826e872eb
Changed labels for server ip/port in html
2021-08-09 23:20:46 -04:00
xithical
c3be92f1e8
Fixed showing all servers on new server creation
...
Removed extraneous variable definition for defined_servers, which caused all servers to appear in menu when creating a new server regardless of role
2021-08-09 22:20:18 -04:00
Andrew
677d5e33d9
Removed ok button from server delete dialog
2021-08-09 22:16:13 -04:00
xithical
0689b735ff
Fixed showing all servers on new server creation
...
Removed extraneous variable definition for defined_servers, which caused all servers to appear in menu when creating a new server regardless of role
2021-08-09 21:11:15 -05:00
Andrew
c44a128f19
Added proper messages for deleting server.
2021-08-09 21:49:40 -04:00
xithical
d3539974d1
Fixed typo in WTF error
...
Changed from "What a Terrble Failure!" to "What a Terrible Failure!"
2021-08-09 20:25:02 -05:00
Andrew
8db46d6ab6
Added option to remove server files on delete.
...
Added confirmation for server delete.
2021-08-09 20:48:22 -04:00
Andrew
046228a0e1
Fixed bug that I created in create roles. Just didn't add data to the page that should have been there
2021-08-09 17:18:02 -04:00
Andrew
488175cc2e
Added users attached to roles on role edit page.
2021-08-09 17:11:45 -04:00
Andrew
7dd4702680
Fixed error thrown on add user
2021-08-09 01:44:16 -04:00
Andrew
0e5e2cd217
Added the ability for non super-users to change their own password.
2021-08-09 01:29:13 -04:00
Andrew
b1215ff20a
Fixed bug where all roles showed the sum of servers associated with all roles
2021-08-09 00:24:08 -04:00
Andrew
9ec10db762
Disabled checkboxes in user configs if servers were granted by role.
2021-08-08 18:26:28 -04:00
Andrew
debabfc045
Added server/role lists to panel config
2021-08-08 16:43:04 -04:00
Andrew
e4db76e4b9
Removing print statements.
2021-08-08 13:30:16 -04:00
Andrew
ad4b3b6075
Merge branch 'pretzel-unstable' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-unstable
2021-08-08 11:59:50 -04:00
Andrew
a4aee7e413
Fixed "other" page on role editor so it looks for role id and not role name
2021-08-08 11:59:18 -04:00
Andrew
ea57d62b1b
Fixed reset buttons on role editor and user server edit page
2021-08-08 10:49:00 -04:00
Andrew
160e374c7a
Update messages are working, but it's not clean and we should find a better way at some point.
2021-08-07 15:23:22 -04:00
Andrew
f50e80749c
Still fighting with failed start message
2021-08-07 14:28:34 -04:00
Andrew
85fe2c9d21
Working through start error messages
2021-08-07 14:25:47 -04:00
Andrew
e86998e57d
This is the unstable version of pretzel where he breaks things.
2021-08-07 13:15:53 -04:00
Andrew
ca9788081b
Removed print statements
2021-08-06 14:15:10 -04:00
Andrew
f957d54348
Fixed issue with duplicate servers on dash if role and user both had access to the server.
2021-08-06 13:47:06 -04:00
Andrew
67008f0e37
Fixed bug where if a user created a server they would not have access to it.
2021-08-06 12:49:07 -04:00
Andrew
e40fb45853
Bug fixes for user/role based servers.
2021-08-06 12:21:47 -04:00
Andrew
e827460a18
Revert
2021-08-06 01:13:58 -04:00
Andrew
4bb798fd0c
Dumb commit because I had an extraneous _
2021-08-06 01:08:33 -04:00
Andrew
41846e34a9
Made it so only super user can see other roles/users
2021-08-06 01:05:46 -04:00
Andrew
b39e0e3a62
Added users to servers. Fixed some bugs with assigning users to role/servers. Fixed bug where user could not edit server config
2021-08-06 00:34:57 -04:00
Andrew
6aa910c8de
Added check for server.properties to avoid white throwback if server.properties doesn't exist on a zip import.
2021-08-05 17:17:36 -04:00
Andrew
e15de6c461
Merge branch 'pretzel' of https://gitlab.com/crafty-controller/crafty-commander into pretzel
2021-08-04 22:07:51 -04:00
Andrew
4f9dd972cb
Added a fix for zip import. Should still add a catch for no server.properties and create one.
2021-08-04 22:06:38 -04:00
Andrew McManus
3d979ffed3
Merge branch 'pretzel_update' into 'pretzel'
...
Added update button and bug fixes
See merge request crafty-controller/crafty-commander!31
2021-07-30 14:59:16 +00:00
Andrew McManus
c2a673dfc3
Added Try Catch around server job spawn. This fixes bug where crafty would not gracefully handle if java did not exist.
2021-07-30 10:30:58 -04:00
Andrew McManus
feab08b36f
Minor changes
2021-07-26 22:22:31 -04:00
Andrew McManus
c3b4b1f213
Minor adjustments to updates
2021-07-26 22:17:37 -04:00
Andrew McManus
f8cda4b748
I don't know the difference between str and int I guess.
2021-07-26 21:49:47 -04:00
Andrew McManus
4e4911e0b5
I don't know how to indent
2021-07-26 21:45:33 -04:00
Andrew McManus
a661d33698
Fixing bugs with updates
2021-07-26 21:39:22 -04:00
