Andrew
1bc8acb1c5
FIxed scrollbars on overlay
2021-08-20 15:18:55 -04:00
Andrew
af3ab28ee8
Fixed context menu css dupe
2021-08-20 15:15:17 -04:00
Andrew
fc719d07d9
Merge branch 'pretzel' into 'dev'
...
Added Upload and Unzip functions. Added better context menu
See merge request crafty-controller/crafty-commander!48
2021-08-20 19:03:02 +00:00
Andrew
6e59bbd524
Fixed context menu. Added feature for off-clicking.
2021-08-20 14:58:52 -04:00
Andrew
bd51742b94
Added better context menu
2021-08-20 13:46:01 -04:00
Andrew
f539f9e095
I leaned on my keyboard just before the last commit. Fixed the things
2021-08-19 23:50:24 -04:00
Andrew
e08df4d369
Completed file uploading. Need to fix listing when right clicking. Unzip is shown at all times. Added unzip function to helpers and is called through ajax for unzipping files to current directory.
2021-08-19 23:36:25 -04:00
Andrew
90d59faf5b
This is broken right now. Trying to add unzip function
2021-08-19 16:50:18 -04:00
xithical
9883d980f4
Merge branch 'xithical' into 'dev'
...
Backups improvements
See merge request crafty-controller/crafty-commander!47
2021-08-18 23:32:10 +00:00
xithical
c20ffb522d
Merge branch 'dev' into 'xithical'
...
# Conflicts:
# app/classes/shared/server.py
2021-08-18 23:30:45 +00:00
Andrew
00422f24cd
Moved delete server to ajax call instead of a task.
2021-08-18 18:50:53 -04:00
Andrew
c1ce2b985a
Fixed bugs from pretzel merge
2021-08-18 12:50:13 -04:00
Andrew
85a118da81
Merge branch 'pretzel' into 'dev'
...
Lots of Alpha 2.5 commits. See details
See merge request crafty-controller/crafty-commander!46
2021-08-18 16:37:40 +00:00
Andrew
0ab8f11a60
Merge branch 'dev' into 'pretzel'
...
# Conflicts:
# app/classes/shared/server.py
# app/classes/web/panel_handler.py
# main.py
2021-08-18 16:34:41 +00:00
Andrew
9a2212e94e
Merge branch 'lukas-features' into 'dev'
...
Lukas features
See merge request crafty-controller/crafty-commander!45
2021-08-18 16:29:36 +00:00
luukas
f8aad8b33d
Add database migrations!
2021-08-18 18:11:53 +03:00
Scott R
689e4abb51
Oops! All backups are gone... but not anymore!
...
While loop automatically removed all old backups greater than the max backups threshold... including if it was set to 0. Set a test for the while loop to make sure max backups is greater than 0 before deletey delete
2021-08-14 00:07:24 -05:00
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
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
