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
790 Commits 12 Branches 45 Tags 104 MiB
751fffe4a3
Commit Graph

268 Commits

Author SHA1 Message Date
Andrew
e4d94fbda5 Adds status page at /status 2021-08-26 21:06:22 -04:00
Andrew
86ad734f4d Changed coloring on files menu. Delete is now red 2021-08-24 22:20:03 -04:00
Andrew
d125ec76f2 Adds default value when renaming a file. 2021-08-24 22:05:30 -04:00
Andrew
b77aab954d Adds download options for files in file tree. This does not add ability to download directories. 2021-08-24 21:33:29 -04:00
Silversthorn
bb1f43bc81 Adding Support for Crafty Permissions with limits 2021-08-24 23:07:00 +02:00
Andrew
bd27e619b4 Merge branch 'dew-translation' into 'dev' 
Added translations for files page (uploads/zips)

See merge request crafty-controller/crafty-commander!60
 2021-08-24 00:29:38 +00:00
Andrew
d767dd066c Added translations for files page (uploads/zips) 2021-08-23 20:24:40 -04:00
Silversthorn
cf331a8bc3 Merge branch 'dev' into dev-Silversthorn 2021-08-24 00:25:07 +02:00
Silversthorn
261c8665c8 Pretty Server Version Choice 2021-08-24 00:24:40 +02:00
Andrew
ce4a7619a6 Fixes wait window closing after first upload is complete and not waiting for all uploads to complete. 2021-08-23 18:22:35 -04:00
Andrew
833cc55c5d Fixes upload indicator 
Fixes max-body-size
 2021-08-23 17:52:55 -04:00
Andrew
b24fd93487 Merge branch 'broken-uploads' into 'dev' 
Fixed upload streams

See merge request crafty-controller/crafty-commander!53
 2021-08-22 20:37:02 +00:00
Andrew
86c1b374bf Fixed upload streams 
Lukas added a lot of pretty things to the upload waiting screen.
Current bug: progress bar is not 100% working.
 2021-08-22 16:31:49 -04:00
Silversthorn
8eef9e094d Fixing UI after deletion of User_Servers 2021-08-22 22:18:39 +02:00
Andrew
734a576cb9 Still broken 2021-08-22 10:54:34 -04:00
Andrew
4ff0392292 Still broken 2021-08-22 10:42:06 -04:00
Andrew
7389b37198 Initial commit on this broken branch 2021-08-22 10:17:33 -04:00
Andrew
032da16a7b Somehow the delete function was broken. Fixed it 2021-08-21 20:20:33 -04:00
Silversthorn
2df9810ab4 Merge branch 'dev' into dev-Silversthorn 2021-08-22 01:42:43 +02:00
Silversthorn
1262d6708b Improve UI and Permissions on Dashboard 2021-08-22 01:41:25 +02:00
Andrew
2ea4ff1214 Now I actually removed the scroll bars...I think 2021-08-21 18:52:46 -04:00
Andrew
6ecf6285b9 Made it so vterm stops auto scrolling if user interrupts. 2021-08-21 16:17:35 -04:00
Andrew
35047e062a Fixed term buttons not changing on start/stop 2021-08-21 15:17:07 -04:00
Silversthorn
31436bdc62 Merge branch 'dev' into dev-Silversthorn 2021-08-21 16:44:02 +02:00
Andrew
89f6a98dc9 Took out ability to assign specific users to specific servers. All role based now. 2021-08-21 10:07:43 -04:00
Silversthorn
a68d24b890 Adding Working Permissions for roles on html pages 2021-08-21 10:44:03 +02:00
Andrew
1bc8acb1c5 FIxed scrollbars on overlay 2021-08-20 15:18:55 -04: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
Florian RVT
8b66fc3fc4 Adding permissions on role_servers with edit 2021-08-20 00:18:50 +02:00
Andrew
90d59faf5b This is broken right now. Trying to add unzip function 2021-08-19 16:50:18 -04:00
Andrew
00422f24cd Moved delete server to ajax call instead of a task. 2021-08-18 18:50:53 -04: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
luukas
a54115bed9 Add pointer cursor to all file tree items 2021-08-12 17:54:52 +03: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
Andrew
a826e872eb Changed labels for server ip/port in html 2021-08-09 23:20:46 -04:00
Andrew
677d5e33d9 Removed ok button from server delete dialog 2021-08-09 22:16:13 -04:00
Andrew
c44a128f19 Added proper messages for deleting server. 2021-08-09 21:49:40 -04: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
488175cc2e Added users attached to roles on role edit page. 2021-08-09 17:11:45 -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
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
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
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
luukas
7acf095463 Make HTTP handler functions not return anything else than None to remove an error in the log. Also make users not log out when visiting a page on the public handler 2021-07-30 19:20:01 +03: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
a661d33698 Fixing bugs with updates 2021-07-26 21:39:22 -04:00
Andrew McManus
a8449cc6f2 Cleanup update code 2021-07-26 21:08:46 -04:00
Andrew McManus
0643a68c74 Adding refresh on dash and term when update finishes to get the status to change. Could not do it dynamically. Buttons would no longer be clickable. Would like to figure that out at some point in the future. 2021-07-26 21:05:52 -04:00
Andrew McManus
fa9184c1ad Dumb bug I just fixed because I'm dumb. 2021-07-26 18:49:05 -04:00
Andrew McManus
a2f32ed324 Another commit because it seems like the first one didn't work. Added seamless hchanging on update status 2021-07-26 18:43:57 -04:00
Andrew McManus
b205c00c06 Fixed bug where update button still had start command attached. 2021-07-26 12:12:51 -04:00
Andrew McManus
979c67d064 Added db setter for stats field (updating) so we can disable start button when server is updating. 2021-07-25 17:04:10 -04:00
Andrew McManus
9cb46a86fb Added executable updater 2021-07-24 21:09:39 -04:00
luukas
55d63c1f7a Add translation file caching, show file read error (if any) and fix a typo in the Finnish translation. 2021-05-27 21:39:46 +03:00
luukas
736924c839 Fix uptime negative time error by saving it as UTC from the start. 2021-04-18 00:20:23 +03:00
luukas
500e537b18 Disable "Other" page button on new user page 2021-04-17 23:27:35 +03:00
luukas
b772bcb03e Fix "Server wizard has multiple elements with same ids" 2021-04-17 23:24:34 +03:00
computergeek125
5a6f09d38f Added patreons (WIP), fixed spelling error 2021-04-04 15:02:35 -05:00
Andrew
f3baedd41d Added term-nav-item class to all nav items in every server navigation in HTML files to fix CSS formatting issues. 2021-04-04 14:34:14 -04:00
computergeek125
54b0578e79 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2021-04-03 12:39:25 -05:00
computergeek125
bd6eed118a Resolves CRAFTY-CONTROLLER-T-81 - error when creating new user 
Also cleans up the panel and server code to handle other states better
 2021-04-03 12:36:01 -05:00
luukas
0b3d20ffbe One monster truck commit for 
add translation API, add fi_FI and en_EN translations, add C and
.properties file support, check if file is binary before sending and
clean up ajax handler
 2021-03-26 15:57:50 +02:00
computergeek125
506c9bb3c3 Merge branch 'backups-and-stuff' into dev 2021-03-21 23:32:48 -05:00
computergeek125
81c60d6dac One monster truck commit for rework and backups 2021-03-21 23:02:18 -05:00
Silversthorn
cd617ad5f3 Users Access to Servers from Roles Working 
Broke Users Servers Link
 2021-03-13 23:12:42 +01:00
computergeek125
c65b4a267e Staff, patreon, and translations all proceedurally generate now 2021-03-13 11:07:04 -06:00
Phillip Tarrant
653a4d6bc7 Merge branch 'admin-controls' into 'dev' 
Player controls

See merge request crafty-controller/crafty-commander!26
 2021-03-07 21:30:19 +00:00
Phillip Tarrant
85403c61af Merge branch 'dev' into 'websocket' 
# Conflicts:
#   app/classes/shared/models.py
#   app/classes/shared/tasks.py
 2021-03-07 21:29:57 +00:00
luukas
932f3586eb Change wait message for when a server is importing 2021-03-05 11:10:13 +02:00
luukas
8eb89dc131 Delete file_edit.html as it is not needed 2021-03-05 11:07:00 +02:00
luukas
031cf8cf96 Change copyright from 2020 to 2021 2021-03-05 11:05:03 +02:00
luukas
1be41b8534 Player controls 2021-03-05 10:58:38 +02:00
luukas
9c62099f32 Add authentication to WS, notify user when an activity log gets logged, and more 2021-03-01 02:54:20 +02:00
luukas
a965af5491 Remove unnecessary websocket.html 2021-02-27 14:17:37 +02:00
luukas
7be57ecfc9 Oops, forgot one thing 2021-02-27 14:07:16 +02:00
luukas
7691dc566e Finish WebSockets 2021-02-27 14:05:04 +02:00
luukas
2595e6950d Host stats are now realtime(d) by websockets 2021-02-26 17:39:35 +02:00
luukas
c6555b53e4 Change comment type from HTML to JS 2021-02-26 10:59:25 +02:00
Phillip Tarrant
92bcefa8cc Merge branch 'clone_servers' into 'dev' 
Create clone servers button/action

See merge request crafty-controller/crafty-commander!23
 2021-02-21 17:17:34 +00:00
Phillip Tarrant
96dbaf3583 Merge branch 'file_manager_polishing' into 'dev' 
File manager polishing

See merge request crafty-controller/crafty-commander!22
 2021-02-21 17:14:43 +00:00
Phillip Tarrant
abcb097cdb Merge branch 'remove-old-logs' into 'dev' 
"remove old logs" feature

See merge request crafty-controller/crafty-commander!21
 2021-02-21 17:14:03 +00:00
LukasDoesDev
ed0208ab0e Create clone servers button/action 
Can't copy while running
 2021-01-28 20:46:13 +02:00
LukasDoesDev
1bf3b381ac Add icons to file tree 2021-01-23 00:50:56 +02:00
LukasDoesDev
521eac3a83 Change "Ace" button to "Default" 2021-01-23 00:18:48 +02:00
LukasDoesDev
bf200480ce Add buttons for choosing the keyboard handler thing (Ace, Vim, Emacs, Sublime) 2021-01-23 00:12:52 +02:00
LukasDoesDev
6b2ef2c451 Remove unnecessary logs, update logs to have more information, add resizing to file editor 2021-01-20 23:10:25 +02:00
LukasDoesDev
bcaac8b9eb I think that the "remove old logs" feature is done 2021-01-20 17:20:42 +02:00
Phillip Tarrant
307d14ab77 Merge branch 'macgeek_role_manager' into 'dev' 
Basic role manager

See merge request crafty-controller/crafty-commander!18
 2021-01-19 12:29:26 +00:00
Phillip Tarrant
c154f316b7 Merge branch 'lukas-development' into 'dev' 
File Manager

See merge request crafty-controller/crafty-commander!19
 2021-01-19 12:28:58 +00:00
LukasDoesDev
e3a359bbc6 File Manager: DONE 2021-01-17 19:20:28 +02:00
LukasDoesDev
eb06f1b33b Now can edit files. Also fixed a bunch of bugs. 2021-01-15 21:59:58 +02:00
LukasDoesDev
eba7bff050 Now can see a tree view of the directory the server is in. Will do file editing now. 2021-01-15 14:13:06 +02:00
LukasDoesDev
c08751c7f8 FILES: Got everything working except Tornado seems to escape my HTML output, works if you set the output to the DOM and run the script below it. 2021-01-15 00:55:14 +02:00
Phillip Tarrant
0c5d11c780 Merge branch 'issue_8' into 'dev' 
Time improvements, Issue 8

See merge request crafty-controller/crafty-commander!16
 2021-01-14 14:56:15 +00:00
LukasDoesDev
9e66f46c2e 2 bug fixes 
1st: Footer had padding in credits.html, caused by missing closing div tag.
2nd: Java VM errors when memory is a float. Server wizard should convert from gigabytes to megabytes (Trello card)
 2021-01-13 16:48:04 +02:00
LukasDoesDev
6a253971e7 Add error when JavaScript isn't enabled 2021-01-11 21:51:38 +02:00
LukasDoesDev
2523e2e198 Fix error when server is offline, change "Not calculated yet" to "Error Calculating", remove unnecessary logging, make a loop, and fix durationToHumanizedString output number types having s's even though the number is 1 or -1. 2020-12-31 19:41:02 +02:00
computergeek125
8131cfd396 Added skeleton role manager 2020-12-27 11:00:26 -05:00
computergeek125
d91361efa5 Updated user manager to support server selection 2020-12-25 22:00:28 -05:00
computergeek125
cf61c3c931 Skeleton user manager added 2020-12-24 17:55:15 -05:00
LukasDoesDev
8ce4491a01 Add ThatOneLukas to credits.html 2020-12-23 17:16:42 +02:00
computergeek125
7ddcdd4e0e Removed execute bit on a few files 2020-12-20 11:40:25 -05:00
LukasDoesDev
8cd2d59230 Websockets.. Work in progress! 
websocket.html is just a blank page with the newest javascript helpers
threading working wonderfully! Except my own code.
websocket.html and thte bit from panel_handler.py can be deleted once this is done. It was just because the css and js kept loading for super long
 2020-12-17 15:39:29 +02:00
LukasDoesDev
359a2e1c42 Now server started shows browser time, not server time. 2020-12-16 01:17:41 +02:00
LukasDoesDev
4c9f947aa1 Rework #8 2020-12-14 23:52:46 +02:00
LukasDoesDev
c13c1ab365 #8 2020-12-14 17:59:59 +02:00
Phillip Tarrant
fb763335d1 removed datatables from vendors as it's outdated and going to use CDN 
added activity logs page
added db_helper method to return rows from db as a dict object.
this is work for issue 9
 2020-12-13 13:42:49 -05:00
Phillip Tarrant
d97712b174 Merge branch 'issue_6' into 'dev' 
Fix Issue 6

See merge request crafty-controller/crafty-commander!12
 2020-12-13 17:24:17 +00:00
MCgamin1738
f59328e4f1 Adding Support For Importing Servers From Zip Files 2020-12-12 17:54:10 +00:00
LukasDoesDev
eb1b28473f See issue #6 2020-12-12 18:44:40 +02:00
LukasDoesDev
0ac3f15b8b Start working on the file explorer UI. W.I.P. 🚧 2020-12-12 01:59:52 +02:00
LukasDoesDev
99b04dbca1 Login looks a tiny bit better :) 2020-12-12 01:57:39 +02:00
Phillip Tarrant
688117ec87 merging master with dev 2020-12-11 07:47:31 -05:00
LukasDoesDev
167f31b293 Make the action buttons in the dash server list use the pointer cursor. 2020-12-10 22:38:44 +02:00
LukasDoesDev
3563deae6a Add spacing below CPU and Memory indicators in dashboard.html. 
https://imgur.com/a/D614Ftt
 2020-12-10 21:53:03 +02:00
LukasDoesDev
4c3c0eb16b Contribute page title changed. 2020-12-09 17:55:30 +02:00
Phillip Tarrant
6ea66c37f5 adding GUI / routing for users admin (eventually roles will be here as well) 2020-12-06 15:42:49 -05:00
Phillip Tarrant
9e6ba7ba03 Merge branch 'master' into dev 2020-09-24 12:02:02 -04:00
Pita Bread
0cd60cc9f0 Update credits.html with new and improved grammer! 2020-09-24 01:37:18 +00:00
Phillip Tarrant
d792a2dae6 edited ultrablacks bio 2020-09-23 15:58:15 -04:00
Phillip Tarrant
7f090b928f changed notify icon - added code to grab remote json from craftycontrol.com for announcements and such - icon turns red if update available 2020-09-22 21:42:41 -04:00
Phillip Tarrant
09a74ef188 polishing menu, removing a few things, modified the admin profile some 2020-09-22 18:23:14 -04:00
Phillip Tarrant
8e2010af75 added version to bottom of pages 2020-09-22 16:17:17 -04:00
Phillip Tarrant
c896a12b17 Added server_ip to DB, also removed 
max_stats_count as it's not needed
 2020-09-22 12:11:16 -04:00
Phillip Tarrant
7657b77785 adding virtual console ajax to actually send the command 2020-09-21 22:01:16 -04:00
Andrew
6a2b983108 Added term-nav-item class and applied padding. Fixes spacing on nav-item classes on Dashboard 2020-09-17 21:09:19 -04:00
Phillip Tarrant
f670280f6d Fixing mobile user dropdown 2020-09-17 18:49:08 -04:00
Andrew McManus
acff9d5cfe Added class "nav-item" to Stop Refresh list item 2020-09-17 21:55:00 +00:00
Phillip Tarrant
90ca5c151f import server code done 2020-09-14 16:01:38 -04:00
Phillip Tarrant
f96649613f did some refactoring on loading of servers, fixed bug where server object would be forgotten when new server added 2020-09-14 14:05:17 -04:00
Phillip Tarrant
66d7c6f10a Refactored the server add outside of serverjars.py (since it's going away). Also made it more flexible since we are doing more than just jars now 2020-09-10 11:01:57 -04:00
Phillip Tarrant
d7fabb3da8 fixed crash detection / auto start checkboxes - found huge issue with crash detection. putting on bug list for later 2020-09-04 14:05:42 -04:00
Phillip Tarrant
568e1e8f41 finished server config page v1 - wanna add more later, but that's for alter 2020-09-04 12:35:06 -04:00
Phillip Tarrant
77021a5c0b starting server config tab 2020-09-04 00:02:03 -04:00
Phillip Tarrant
9ded6a1a4b added max_log_lines to config.json, added server_logs subpage, split server details top part to it's own include 2020-09-03 22:49:20 -04:00
Phillip Tarrant
adf8d3f51a many new things, 
regexit sub function created
virtual console now has colors
fixed error with login function auditing None instead of 0
other things I can't remember atm
 2020-09-01 21:30:39 -04:00
Phillip Tarrant
ab1772397d added version string to page footer 
created/working on server details subpages.
added "may take a few seconds" to cmd
error page is now available to panel
created server_id_exists function
more error checking around database returns from db_helper
starting styling / backend for virtual terminal
 2020-09-01 13:29:39 -04:00
Phillip Tarrant
d6c894c3d9 Creation of Command model, moved controler to shared in prep for plugins 2020-08-31 13:46:25 -04:00