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,439 Commits 12 Branches 45 Tags 104 MiB
b49bca3279
Commit Graph

1439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luukas
b49bca3279
Use a tab character in the threads prompt command 
https://i.imgur.com/jy0Rlgm.png
 2022-05-21 01:57:40 +03:00
luukas
b724fc500d
Improve the startup process 2022-05-21 01:53:17 +03:00
luukas
eff7aefb6e
Use local date and time formatting for Console 2022-05-21 01:41:48 +03:00
luukas
d97bcc608f
Fix info message in tornado server starter 
Yes I know it's a 1 character replace
 2022-05-21 00:00:21 +03:00
luukas
f82241f728
Fix circular import and linting for stats.py 2022-05-20 23:33:42 +03:00
luukas
ed9d994083
Fix linting in models/crafty_permissions.py 2022-05-20 23:23:18 +03:00
luukas
c1ebb16dff
Add typings to minecraft/stats.py 2022-05-20 22:05:37 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
Iain Powrie
1e96e7a6c9 Merge branch 'merge/api-v2' into 'dev' 
New API v2 PR

See merge request crafty-controller/crafty-4!254
 2022-05-18 23:27:19 +00:00
amcmanu3
67e20302c9 Add get_perms_server back 2022-05-18 19:19:58 -04:00
Iain Powrie
11b7817a11 Merge branch 'dev-BetterDisplayMobile' into 'dev' 
Better display on mobile

See merge request crafty-controller/crafty-4!229
 2022-05-18 23:13:05 +00:00
amcmanu3
5c9c528bdf Fix typo in requirements 2022-05-18 18:25:02 -04:00
Zedifus
4a83aaac0e Fix W0404 & C0412 Lint issues 2022-05-18 23:14:00 +01:00
luukas
87085cec3c Fix an IndexError in get_lang_page 2022-05-19 01:10:06 +03:00
Andrew
b7780682d5 Merge branch 'dev' into 'merge/api-v2' 
# Conflicts:
#   app/classes/controllers/crafty_perms_controller.py
 2022-05-18 21:56:39 +00:00
luukas
6407900609 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-19 00:52:59 +03:00
Andrew
505364d7d5 Merge branch 'feature/pretzel-password-reset' into 'dev' 
Add password reset to Crafty Console

See merge request crafty-controller/crafty-4!261
 2022-05-18 21:40:04 +00:00
amcmanu3
d235d0b70b Add error for no user 2022-05-18 17:37:07 -04:00
amcmanu3
49965bf31f Add explaination to password fail. 2022-05-18 17:22:39 -04:00
Iain Powrie
34d260462d Merge branch 'experimental/feature/permission-matrix' into 'dev' 
Add a permission matrix to the role add and edit

See merge request crafty-controller/crafty-4!262
 2022-05-18 21:20:02 +00:00
luukas
0ecc0a62ca Fix a comment regarding the Logs permission 2022-05-19 00:04:14 +03:00
amcmanu3
bc6309c91b Appease the linter 2022-05-18 16:56:54 -04:00
Andrew
ca73a5f60b Merge branch 'dev' into 'experimental/feature/permission-matrix' 
# Conflicts:
#   app/classes/web/panel_handler.py
 2022-05-18 20:47:43 +00:00
Andrew
fec92c62b4 Merge branch 'tweak/pretzel-cron-explain' into 'dev' 
Change Cron Validation / Fix Security Issues with Role/User Creation

See merge request crafty-controller/crafty-4!263
 2022-05-18 20:43:26 +00:00
luukas
2b34e2c824 Remove role_id from role modify response 2022-05-18 23:41:28 +03:00
amcmanu3
cfcc446d17 Remove TODO 2022-05-18 16:41:14 -04:00
amcmanu3
0f661d5400 Disable checkboxes until server access 2022-05-18 16:37:38 -04:00
Silversthorn
bef099a5a8 Merge branch 'dev' into dev-BetterDisplayMobile 2022-05-18 22:13:44 +02:00
luukas
d64756a30c Make modify role not fetch the role again 2022-05-18 23:13:22 +03:00
luukas
ae7984c784 Change modify role's server id type to integer 2022-05-18 23:11:40 +03:00
Silversthorn
8c21eddf2b Fixed Table occupation 2022-05-18 22:00:20 +02:00
luukas
4c397ff454 Only allow number IDs to the user handlers 2022-05-18 22:54:44 +03:00
luukas
2bc26ef3fd Check invalid IDs on roles 
* Only allow number IDs to the role handlers
* Catch DoesNotExist errors
 2022-05-18 22:34:33 +03:00
luukas
8b0da5da4c Remove unnecessary prints or use logger.debug 2022-05-18 22:06:33 +03:00
amcmanu3
a833a29fb7 Allow super users to add roles/users 2022-05-18 14:35:51 -04:00
amcmanu3
12390306fd Add permissions checks for quantity for users/role 
Remove the ability to add quantities for general users.
 2022-05-18 14:33:22 -04:00
amcmanu3
e3248e8657 Change cron validation to allow day abbreviations 2022-05-18 13:53:55 -04:00
amcmanu3
3432d660ef Expand Cron explain 2022-05-19 11:04:13 -04:00
luukas
74198ff81c Add a try..except to audit log broadcast 2022-05-18 16:51:46 +03:00
luukas
4c64497a2f Add a JSON schema route 2022-05-18 15:58:54 +03:00
luukas
5bff6c12b4 Fix cq degradation: R1721 2022-05-18 13:05:58 +03:00
luukas
d67711e898 Fix cq degradation: C0411 2022-05-18 13:04:38 +03:00
luukas
7c85496eb8 Clean up enum-related functions 2022-05-18 01:55:05 +03:00
luukas
559a345f25 Merge branch 'dev' into merge/api-v2 2022-05-18 01:49:19 +03:00
luukas
14665042c6 Add and improve audit logging in the API 2022-05-18 01:34:31 +03:00
luukas
8c8ae652c8 Fix a bug in update_role_advanced 
where you could not modify server permissions
 2022-05-18 01:25:27 +03:00
luukas
f9e5b9bc5f Fix the duplicated add_server_creation in the API 2022-05-18 01:23:32 +03:00
luukas
8737c15fcf Add a permission matrix to the role add and edit 2022-05-18 01:09:58 +03:00
amcmanu3
e12814d0b0 Appease the linter 2022-05-17 16:01:37 -04:00
luukas
821ed7ef5d Make get_server_obj raise an error 
Reason being: There is nothing that checks if it returns False
 2022-05-17 21:43:15 +03:00