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
1,464 Commits 12 Branches 45 Tags 104 MiB
4205c0a8f0
Commit Graph

246 Commits

Author SHA1 Message Date
Andrew
afc95a40fe Fixes bug where you cannot disable auto backup 2021-09-20 15:41:08 -04:00
Andrew
f18d74540a Fixes bug where player counts would cause crash if not super user. 
Adds commands sent through terminal to audit log.
Makes it so regular users cannot see the audit log.
 2021-09-13 22:02:57 -04:00
Andrew
92725d2249 Starts troubleshooting of port not changing after config change. 2021-09-13 17:52:09 -04:00
Andrew
333cd33be3 Fixes server port writing issue. 2021-09-13 17:04:46 -04:00
Silversthorn
70ca82a086 Rework architecture for better MVC 2021-09-09 00:01:10 +02:00
Silversthorn
cb73540e65 Doing MVC on Crafty Permissions 2021-09-06 19:27:01 +02:00
Silversthorn
f4ca0f6559 Addind support for -1 unlimited check 2021-08-25 20:22:43 +02: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
Andrew
aea023b893 Fixes error thrown when calling add_user page 2021-08-24 19:25:35 -04:00
Andrew
af7e31a744 Fixes issue with error thrown when click save in edit_user 2021-08-24 19:19:33 -04:00
Silversthorn
bb1f43bc81 Adding Support for Crafty Permissions with limits 2021-08-24 23:07:00 +02:00
Silversthorn
1acb7827ae Reworking Functions After User_Servers Deletion 2021-08-22 18:50:30 +02:00
Silversthorn
88042998d9 Merge branch 'dev' into dev-Silversthorn 2021-08-22 12:14:31 +02:00
Silversthorn
331f3e7b12 Adding Crafty Permissions 2021-08-22 11:57:02 +02:00
Silversthorn
1262d6708b Improve UI and Permissions on Dashboard 2021-08-22 01:41:25 +02: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
Florian RVT
8b66fc3fc4 Adding permissions on role_servers with edit 2021-08-20 00:18:50 +02: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
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
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
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
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
9cb46a86fb Added executable updater 2021-07-24 21:09:39 -04:00
luukas
092a8e85f1 Fix not being able to go to credits or contribute page when there are no servers 2021-05-02 18:52:10 +03:00
luukas
805f51ffb2 One big bug slapping commit 
Fix bug where arguments would not have default values and would break editing users (panel handler line 507, 508 and 559), fix major typo (panel handler line 569) and fix autobleach logging (base handler lines 35 and 36)
 2021-04-04 21:22:52 +03:00
computergeek125
f3b1d1e87d cleaned up DB commands a bit to resolve the rest of CRAFTY-CONTROLLER-T-81 2021-04-03 13:18:43 -05: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
fb08d77a80 General cleanup after merge, hopefully improved roles with backup 2021-03-21 23:44:22 -05:00
computergeek125
506c9bb3c3 Merge branch 'backups-and-stuff' into dev 2021-03-21 23:32:48 -05:00
computergeek125
da97597d52 Merge branch 'dev-Silversthorn' into dev 2021-03-21 23:24:49 -05:00
computergeek125
c690f9113e Merge branch 'macgeek-noshell' into dev 2021-03-21 23:17:36 -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
Florian RVT
3f0d1871ff User access to servers operating 2021-03-09 23:17:50 +01: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
computergeek125
a0448f5408 Theoretically this fixes tasks scheduler 2021-03-06 14:48:02 -06:00
luukas
8eb89dc131 Delete file_edit.html as it is not needed 2021-03-05 11:07:00 +02:00
luukas
1be41b8534 Player controls 2021-03-05 10:58:38 +02: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
bcaac8b9eb I think that the "remove old logs" feature is done 2021-01-20 17:20:42 +02:00
Phillip
19e4a31bf7 fixed console.debug printing - added module auto-installer 2021-01-19 08:56:00 -05: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
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
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
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
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
58b63cb9a4 Add Permissions Check To Import From Zip 2020-12-12 19:35:41 +00:00
LukasDoesDev
0ac3f15b8b Start working on the file explorer UI. W.I.P. 🚧 2020-12-12 01:59:52 +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
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
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
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
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
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
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
Phillip Tarrant
f0618b073b finished credits and contribute section - with setting to disable contribute link 2020-08-28 14:38:42 -04:00
Phillip Tarrant
c829d495de Worked on dashboard - made a blank page template - started credits page 2020-08-27 23:21:55 -04:00
Phillip Tarrant
d2d403e144 complete rewrite of stats pulling, fixed default.json, changed the config file and handling 2020-08-27 18:30:56 -04:00
Phillip Tarrant
d0720958f9 Error handling if server was deleted without crafty knowing 
start/stop server functions complete
expanding out online/max/motd etc in db for easier parsing
fixed issue of servers loosing their name from 3.2
finished restart button
added fontawesome 5
 2020-08-24 19:11:17 -04:00
Phillip Tarrant
a958b6dea0 populating dashboard with real data 2020-08-24 13:08:17 -04:00
Phillip Tarrant
a0fcda018c Fixed errand print statement 
Re-init all servers when adding a server
server builder tested well. Next is importing a server
 2020-08-23 22:17:36 -04:00
Phillip Tarrant
a6c1a885d6 finished redirect woes, adding server handler, made 404 and default pages pretty 2020-08-19 13:54:10 -04:00
Phillip Tarrant
81d5ff05e8 fixed endless redirect issue on non-existant paths 2020-08-19 13:21:19 -04:00
Phillip Tarrant
203441045f Added crafty specific stuff to config.ini 2020-08-18 21:04:43 -04:00
Phillip Tarrant
ad541347af scheduler, version change, database work, controller init servers, etc etc 2020-08-16 22:47:53 -04:00
Phillip Tarrant
25affba2e6 got login working 2020-08-13 10:38:36 -04:00