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
102 Commits 12 Branches 45 Tags 104 MiB
7ddcdd4e0e
Commit Graph

102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
computergeek125
7ddcdd4e0e Removed execute bit on a few files 2020-12-20 11:40:25 -05:00
computergeek125
1239822761 Fixed logic inversion that resolves #10 2020-12-19 08:44:04 -05:00
computergeek125
d30cbb8563 Merge branch 'macgeek_wslfix' into dev 2020-12-19 08:41:36 -05:00
computergeek125
8795a1eaf5 Fixed crash on CPU speed reading for certain systems 2020-12-19 08:39:31 -05:00
Phillip Tarrant
31b311980c Merge branch 'issue_9' into 'dev' 
removed datatables from vendors as it's outdated and going to use CDN

See merge request crafty-controller/crafty-commander!15
 2020-12-13 18:46:41 +00: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
fc51cd088c expanding gitignore to include app/config 2020-12-13 12:27:37 -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
Phillip Tarrant
b66f22b12a Merge branch 'issue_7' into 'dev' 
Issue 7

See merge request crafty-controller/crafty-commander!14
 2020-12-13 17:22:43 +00:00
MCgamin1738
58b63cb9a4 Add Permissions Check To Import From Zip 2020-12-12 19:35:41 +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
MCgamin1738
414cbf6fa3 Merge branch 'SEC_ERROR_REUSED_ISSUER_AND_SERIAL' into 'dev' 
Fixing SEC_ERROR_REUSED_ISSUER_AND_SERIAL

See merge request crafty-controller/crafty-commander!11
 2020-12-12 09:09:02 +00: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
MCgamin1738
7acb044bd8 Fixing SEC_ERROR_REUSED_ISSUER_AND_SERIAL 2020-12-11 19:08:09 +00:00
Phillip Tarrant
aab743b901 Merge branch 'dbpath_hotfix' into 'dev' 
adding creation of app/config/db directory to helper so if it's not there,it will be created

See merge request crafty-controller/crafty-commander!9
 2020-12-11 15:17:29 +00:00
Phillip Tarrant
1542f2559a adding creation of app/config/db directory to helper so if it's not there,it will be created 
bug introduced by commit 102f63c7
 2020-12-11 10:14:48 -05:00
Phillip Tarrant
5270bdcc3d Merge branch 'issue_4_server_cascade' into 'dev' 
patches for issue #4:

See merge request crafty-controller/crafty-commander!8
 2020-12-11 14:56:11 +00:00
Phillip Tarrant
6b686c5b47 patches for issue #4: 
biggest issue causing the cascade was building crash detection in check_running method
that method is called everywhere, so when called (sometimes 5 times at the same time) it tries to restart the server over and over
i created a new detect_crash method that will now look for crashes and removed all crash detection from check_running method
also added the remove_watcher_thread method to remove the old scheduled task watching the older server.
 2020-12-11 09:52:36 -05:00
MCgamin1738
102f63c771 Move session.lock, Database And config.json To Config Folder 2020-12-11 12:59:48 +00:00
Phillip Tarrant
688117ec87 merging master with dev 2020-12-11 07:47:31 -05:00
Phillip Tarrant
bd91cc4138 Merge branch 'lukas-development' into 'master' 
Lukas Development

See merge request crafty-controller/crafty-commander!7
 2020-12-11 12:46:25 +00: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
cc0c036f79 Change main scrollbar colors. (Only for Firefox) 
Example: https://imgur.com/a/pjJ0wuL
 2020-12-09 23:10:52 +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
192922159f version bump 2020-12-01 11:11:40 -05:00
Phillip Tarrant
10bd7a74c9 fixed issue where server settings don't get reloaded when changing server config without restarting crafty. Now server settings get repulled from DB after writing new settings on config change 2020-10-07 09:19:47 -04:00
Phillip Tarrant
9e6ba7ba03 Merge branch 'master' into dev 2020-09-24 12:02:02 -04:00
Phillip Tarrant
8d7e85b3bb Merge branch 'patch-1' into 'master' 
Update credits.html with new and improved grammer!

See merge request crafty-controller/crafty-commander!5
 2020-09-24 15:56:29 +00: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
fe54367d44 Merge branch 'dev' into 'master' 
Dev to master

See merge request crafty-controller/crafty-commander!4
 2020-09-23 12:51:57 +00:00
Phillip Tarrant
43ad169aa9 removing print from update 2020-09-23 08:49:19 -04:00
Phillip Tarrant
6951d7cc8a fixed IP not updating, fixed usernames being case sensitive in update query 2020-09-22 23:26:23 -04:00
Phillip Tarrant
635bef867b adding todo: for version data 2020-09-22 21:43:22 -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
2eeee9d6c4 fixed bug where tables/default settings were firing each restart 2020-09-22 15:00:05 -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
Phillip Tarrant
e4cc400d20 testing notifications 2020-09-18 12:06:02 -04:00
Phillip Tarrant
ab3ee9a25e Merge branch 'dev' into 'master' 
Added term-nav-item class and applied padding. Fixes spacing on nav-item classes on Dashboard

See merge request crafty-controller/crafty-commander!3
 2020-09-18 15:59:55 +00: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
Phillip Tarrant
f049d6d453 Merge branch 'master' into 'master' 
Master

See merge request crafty-controller/crafty-commander!1
 2020-09-17 22:28:48 +00:00
Andrew McManus
d9bf82c56f Added independent line for .nav-item. Added padding to nav-item class to fix mobile scaling issue on terminal navigation (This does not appear to break anything else). 2020-09-17 22:20:08 +00:00