Zedifus
|
2a4295d9b3
|
Add subscription source parsing & format html
|
2022-05-23 22:21:32 +01:00 |
|
Zedifus
|
11335b58f3
|
Update Translations for kofi credit support
More sane key naming as multiple sources, title & desc update too.
|
2022-05-23 22:20:19 +01:00 |
|
Iain Powrie
|
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 |
|
Iain Powrie
|
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 |
|
Andrew
|
f099639cc6
|
Fix error where database atomic is not needed
|
2022-05-21 14:26:58 -04:00 |
|
luukas
|
8f8b2aa22f
|
Simplify MainPrompt.emptyline.
|
2022-05-21 02:04:03 +03:00 |
|
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
|
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 |
|
Iain Powrie
|
6637748a59
|
Merge branch 'dev' into 'freddy0-Unraid-Template'
# Conflicts:
# docker/unraid.xml
|
2022-05-19 21:24:09 +00:00 |
|
Iain Powrie
|
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 |
|
Freddy 0
|
8ebcbb7456
|
Adjustments for !251 & changed donation
|
2022-05-19 18:10:49 +00:00 |
|
amcmanu3
|
ca170b86e0
|
Change naming of servers stats to generic name
|
2022-05-19 12:14:30 -04: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 |
|
