4205c0a8f0
Exempt jsonschema falsepositive E0611
...
Can't understand why these are flagging, code is as per docs.
Version is latest, and not flagging locally. Going to exempt mod for now
2022-05-23 20:53:23 +01:00
4c981f50c2
Add more permission validation in user creation
2022-05-23 22:45:27 +03:00
ab022a65ed
Version bumping jsonlint
...
Checking if this is causing lint issue
2022-05-23 20:35:43 +01:00
0d62223982
Merge branch 'dev' into bugfix/api-v2-bugfixes
2022-05-23 20:20:49 +03:00
da483b9291
Merge branch 'bug/pretzel-database-exit' into 'dev'
...
Fix error where database atomic is not needed
See merge request crafty-controller/crafty-4!269
2022-05-23 10:05:46 +00:00
f01f04ef97
Merge branch 'merge/cleanup-nosquash' into 'dev'
...
New merge request for cleanup
See merge request crafty-controller/crafty-4!268
2022-05-23 10:01:40 +00:00
f099639cc6
Fix error where database atomic is not needed
2022-05-21 14:26:58 -04:00
8f8b2aa22f
Simplify MainPrompt.emptyline.
2022-05-21 02:04:03 +03:00
b49bca3279
Use a tab character in the threads prompt command
...
https://i.imgur.com/jy0Rlgm.png
2022-05-21 01:57:40 +03:00
b724fc500d
Improve the startup process
2022-05-21 01:53:17 +03:00
eff7aefb6e
Use local date and time formatting for Console
2022-05-21 01:41:48 +03:00
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
f82241f728
Fix circular import and linting for stats.py
2022-05-20 23:33:42 +03:00
ed9d994083
Fix linting in models/crafty_permissions.py
2022-05-20 23:23:18 +03:00
c1ebb16dff
Add typings to minecraft/stats.py
2022-05-20 22:05:37 +03:00
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash
2022-05-20 22:04:41 +03:00
9ddcd13f2f
Fix W0611 & R1734 lint issues
2022-05-20 14:06:46 +03:00
dba3fafa87
Use shorthand for Controller.check_system_user
...
This reduced the code from 4 lines to 1 line.
The code
if <condition>:
return True
else:
return False
can be shortened to
return <condition>
2022-05-20 13:31:30 +03:00
1b059b24df
Update get_*_column functions
...
Use getattr instead of model_to_dict in single columns. We might want to
change the functions later on so peewee's ForeignKeyField primary key
shorthand like model.server_id instead of model.server.server_id
will work.
This will very likely increase performance of the get_*_column functions
due to not having to call the model_to_dict function from Peewee's
helper library.
2022-05-20 13:15:50 +03:00
48948423c9
Fix various things in create_api_server
2022-05-20 01:33:02 +03:00
2709ebb54b
Merge branch 'freddy0-Unraid-Template' into 'dev'
...
Adjustments for !251 & changed donation
See merge request crafty-controller/crafty-4!265
2022-05-19 21:27:08 +00:00
6637748a59
Merge branch 'dev' into 'freddy0-Unraid-Template'
...
# Conflicts:
# docker/unraid.xml
2022-05-19 21:24:09 +00:00
379f680312
Merge branch 'bug/pretzel-stats-db-name' into 'dev'
...
Change naming of servers stats to generic name
See merge request crafty-controller/crafty-4!264
2022-05-19 21:13:07 +00:00
8ebcbb7456
Adjustments for !251 & changed donation
2022-05-19 18:10:49 +00:00
ca170b86e0
Change naming of servers stats to generic name
2022-05-19 12:14:30 -04:00
7a7c7501e6
Use relative path for latest.log
2022-05-19 17:27:36 +03:00
73175d0f82
Remove the root example from the new server schema
...
* It messed up https://json-schema-faker.js.org
* It wasn't updated for agree_to_eula
2022-05-19 16:32:18 +03:00
bd4a35b418
Make role add and edit use API v2 internal APIs
2022-05-19 16:13:25 +03:00
f763fa9d0c
Fix API v2 server modification
2022-05-19 16:01:03 +03:00
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
67e20302c9
Add get_perms_server back
2022-05-18 19:19:58 -04:00
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
5c9c528bdf
Fix typo in requirements
2022-05-18 18:25:02 -04:00
4a83aaac0e
Fix W0404 & C0412 Lint issues
2022-05-18 23:14:00 +01:00
87085cec3c
Fix an IndexError in get_lang_page
2022-05-19 01:10:06 +03:00
b7780682d5
Merge branch 'dev' into 'merge/api-v2'
...
# Conflicts:
# app/classes/controllers/crafty_perms_controller.py
2022-05-18 21:56:39 +00:00
6407900609
Merge branch 'dev' into experimental/lukas-cleanup
2022-05-19 00:52:59 +03:00
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
d235d0b70b
Add error for no user
2022-05-18 17:37:07 -04:00
49965bf31f
Add explaination to password fail.
2022-05-18 17:22:39 -04:00
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
0ecc0a62ca
Fix a comment regarding the Logs permission
2022-05-19 00:04:14 +03:00
bc6309c91b
Appease the linter
2022-05-18 16:56:54 -04:00
ca73a5f60b
Merge branch 'dev' into 'experimental/feature/permission-matrix'
...
# Conflicts:
# app/classes/web/panel_handler.py
2022-05-18 20:47:43 +00:00
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
2b34e2c824
Remove role_id from role modify response
2022-05-18 23:41:28 +03:00
cfcc446d17
Remove TODO
2022-05-18 16:41:14 -04:00
0f661d5400
Disable checkboxes until server access
2022-05-18 16:37:38 -04:00
bef099a5a8
Merge branch 'dev' into dev-BetterDisplayMobile
2022-05-18 22:13:44 +02:00
d64756a30c
Make modify role not fetch the role again
2022-05-18 23:13:22 +03:00
