Commit Graph

1302 Commits

Author SHA1 Message Date
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
luukas
29a524ffbb Merge Andrew's papermc highlighting to lukas-features 2021-08-12 17:57:24 +03:00
luukas
a54115bed9 Add pointer cursor to all file tree items 2021-08-12 17:54:52 +03:00
Andrew
118fc7936f Improved text highlighting for papermc servers. Need to still figure out what's going on with some random characters showing up. 2021-08-12 10:16:19 -04: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
luukas
d1f582edfe Full release on stdout fix!
Basically I ditch the ANSI codes and use the old highlighting system.
2021-08-11 23:29:31 +03:00
Andrew
7d5a7658e2 Made failed server launch message more "in your face" to user. 2021-08-10 16:37:47 -04:00
luukas
4bac56e84a Use stdout for virtual terminal. WebSockets seem to be "laggy". 2021-08-10 23:17:56 +03:00
luukas
7b66cc261e Add cache for if language file exists 2021-08-10 22:36:17 +03: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
03ba259024 Merge branch 'pretzel-3' into 'pretzel'
Added the ability to remove all server files when deleting server

See merge request crafty-controller/crafty-commander!43
2021-08-10 01:51:42 +00: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
e62b24fdb8 Merge branch 'pretzel-unstable' into 'pretzel'
Added user list with users attached to role on role config page.

See merge request crafty-controller/crafty-commander!42
2021-08-09 21:19:17 +00: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
4d7592fcaa Fixed error thrown on add user 2021-08-09 01:45:01 -04:00
Andrew
7dd4702680 Fixed error thrown on add user 2021-08-09 01:44:16 -04:00
Andrew
1791f1c724 Merge branch 'pretzel' into 'pretzel-unstable'
Merge branch 'pretzel' into 'pretzel-unstable'

See merge request crafty-controller/crafty-commander!41
2021-08-09 05:34:16 +00:00
Andrew
8c947bbbb7 Merge branch 'pretzel-unstable' into 'pretzel'
Added ability for non super-user to change password

See merge request crafty-controller/crafty-commander!40
2021-08-09 05:32:11 +00:00
Andrew
0e5e2cd217 Added the ability for non super-users to change their own password. 2021-08-09 01:29:13 -04:00
Andrew
e901e3dda7 Merge branch 'pretzel' into 'pretzel-unstable'
Setting branches back to being the exact same. Working from stable.

See merge request crafty-controller/crafty-commander!39
2021-08-09 04:28:16 +00:00
Andrew
92632b5cff Merge branch 'pretzel-unstable' into 'pretzel'
Fixed bug in roles on server listing

See merge request crafty-controller/crafty-commander!38
2021-08-09 04:27:01 +00: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
79f9fd0990 Merge branch 'pretzel-unstable' into 'pretzel'
Added server lists to config page

See merge request crafty-controller/crafty-commander!37
2021-08-08 22:29:18 +00: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
26dbcd14e9 Merge branch 'pretzel-unstable' into 'pretzel'
role_ID fix in role editor

See merge request crafty-controller/crafty-commander!34
2021-08-08 17:33:08 +00: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
28e8bfd7ac Merge branch 'pretzel' into 'pretzel-unstable'
Updating unstable with stable due to changes made in stable.

See merge request crafty-controller/crafty-commander!33
2021-08-08 15:36:10 +00:00
Andrew
ea57d62b1b Fixed reset buttons on role editor and user server edit page 2021-08-08 10:49:00 -04:00
Andrew McManus
f9559a601e Merge branch 'pretzel-unstable' into 'pretzel'
Added error statements for Failed Starts

See merge request crafty-controller/crafty-commander!32
2021-08-07 19:26:13 +00: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