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
|
540cdf6149
|
Fixing Roles Permissions for Server Creation
|
2021-08-22 11:06:44 +02:00 |
|
Andrew
|
73d8be2d57
|
Still cleaning up my mess...sorry
|
2021-08-21 23:56:02 -04:00 |
|
Andrew
|
0d11b80181
|
Merge branch 'dev' into 'dewfix'
# Conflicts:
# app/classes/shared/models.py
|
2021-08-22 03:38:39 +00:00 |
|
Andrew
|
7f1f667212
|
This should fix everything
|
2021-08-21 23:36:48 -04:00 |
|
Andrew
|
773ace55ad
|
Revert "Fixed error with modelselect"
This reverts commit cbd5d29fe9404b3f381f7dd4b12a5b135a0476a7
|
2021-08-22 03:30:43 +00:00 |
|
Andrew
|
cbd5d29fe9
|
Fixed error with modelselect
|
2021-08-21 23:21:06 -04:00 |
|
Andrew
|
8de3b3b3cd
|
Removed User_Servers table.
|
2021-08-21 23:17:54 -04:00 |
|
Andrew
|
2851493589
|
Removed servers from user_role_permissions query. Not needed and caused query to result in none very time
|
2021-08-21 22:02:27 -04: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
|
1150c98faf
|
Made it so server is added to all user roles when created.
|
2021-08-21 10:30:37 -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 |
|
luukas
|
f8aad8b33d
|
Add database migrations!
|
2021-08-18 18:11:53 +03: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
|
debabfc045
|
Added server/role lists to panel config
|
2021-08-08 16:43:04 -04:00 |
|
Andrew
|
e4db76e4b9
|
Removing print statements.
|
2021-08-08 13:30:16 -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 |
|
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 |
|
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
|
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
|
9049e44803
|
Fix logging on import errors
|
2021-04-17 23:34:13 +03:00 |
|
luukas
|
d5e83c5935
|
Fix a bunch of errors in API base handler and
add some verbosity to logging in it
|
2021-04-17 18:19:19 +03:00 |
|
computergeek125
|
1e2abff40a
|
Moved server DB code to models, fix autobleach logging, fix redirect bug
|
2021-04-04 12:48:02 -05: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
|
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 |
|
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 |
|
Florian RVT
|
3f0d1871ff
|
User access to servers operating
|
2021-03-09 23:17:50 +01: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
|
458456a716
|
try fix merge conflict
|
2021-03-05 11:35:05 +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 |
|
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 |
|
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 |
|
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
|
6ea66c37f5
|
adding GUI / routing for users admin (eventually roles will be here as well)
|
2020-12-06 15:42:49 -05: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
|
2eeee9d6c4
|
fixed bug where tables/default settings were firing each restart
|
2020-09-22 15:00:05 -04:00 |
|