d486fdd4c8
add jquery back to the main base.html template.
2022-05-30 20:57:19 -04:00
26b3b8a869
Merge branch 'cleanup/remove-unused-dependencies' into 'dev'
...
Remove unused dependencies
See merge request crafty-controller/crafty-4!279
2022-05-30 13:18:42 +00:00
678a42afa6
Merge branch 'feature/kofi-contribute' into 'dev'
...
Ko-fi contribution widget
See merge request crafty-controller/crafty-4!280
2022-05-30 08:25:29 +00:00
ca793807cb
Add kofi widget
...
Not sure how to remove the background behind the widget :(
2022-05-29 07:09:39 +01:00
f2890fa31d
Remove unused dependencies
2022-05-28 18:31:11 +03:00
83864a0023
Merge branch 'translations/hebrew-corrections' into 'dev'
...
Hebrew corrections
See merge request crafty-controller/crafty-4!278
2022-05-28 14:19:37 +00:00
ccd09e9753
Fix missing escaped chars in submitted translation
2022-05-28 15:17:41 +01:00
cfe5f01d78
Update he_IL.json 3.5
...
Fix For RTL & Typo Mistakes and orientation & definition of a few words
Thanks thefourcraft
2022-05-28 14:10:55 +00:00
39915ef53c
Fix critical bad stats push
2022-05-26 06:49:51 -04:00
b0b9936df7
Merge branch 'bugfix/stats-db-select' into 'dev'
...
Get rid of the stats database proxy
See merge request crafty-controller/crafty-4!276
2022-05-25 18:29:23 +00:00
b293164e12
Add crash detection to realtime stats
2022-05-25 14:26:13 -04:00
fae4aeb492
Fix CQ C0412
2022-05-25 14:16:14 +03:00
cf2ff2f2d5
Try to get rid of database_stats_proxy
2022-05-25 14:00:22 +03:00
8f1630b6a2
Merge branch 'devops/gitlab-scanning-pipes' into 'dev'
...
Add Dependancy, SAST, Container, Secret Scanning
See merge request crafty-controller/crafty-4!274
2022-05-25 00:52:00 +00:00
d386244e86
Add Dependancy, SAST, Container, Secret Scanning
2022-05-25 00:52:00 +00:00
7ca7232829
Add question to warning message
2022-05-24 19:11:14 -04:00
54c81d6dd4
Merge branch 'bugfix/api-v2-bugfixes' into 'dev'
...
API v2 bug fixes
See merge request crafty-controller/crafty-4!267
2022-05-24 22:42:41 +00:00
2ac9118152
Merge remote's bugfix/api-v2-bugfixes to local
2022-05-25 00:58:32 +03:00
cbc73b7e92
Fix routing for the user permissions handler
2022-05-25 00:58:10 +03:00
57ef5e27dd
Add route for viewing user Crafty permissions
...
The route includes the permission mask, counters and limits
2022-05-25 00:55:49 +03:00
6dadce2c9a
Enable changing more of yourself with superuser
...
Enable modifying your own superuser status, permissions and roles if you
have superuser status
2022-05-25 00:43:49 +03:00
b0d342e949
Check if something is in a dict with a simpler way
...
* Replace `data.get("key", None) is not None` with `"key" in data`
2022-05-25 00:39:16 +03:00
2aa2d14f5e
Improve the invalidate tokens API handler
...
* Remove the TODO
* Replace the Console.info with logger.debug
2022-05-25 00:35:11 +03:00
9a9d101015
Add pasword hashing to API user modification
2022-05-25 00:32:31 +03:00
54ff888002
Fix user modification via the API
2022-05-25 00:29:31 +03:00
db13b11f18
Merge branch 'tweak/pretzel-wss-error' into 'dev'
...
Add link to documentation to WSS error
See merge request crafty-controller/crafty-4!272
2022-05-24 18:14:06 +00:00
71dde6edba
Merge branch 'translations/hebrew' into 'dev'
...
Add Hebrew lang file @ 3.5 stage
See merge request crafty-controller/crafty-4!273
2022-05-24 18:03:45 +00:00
f69cf39c1d
Add Hebrew lang file
...
Up to date to 3.5, altered credits trans keys amended,
Patreon will need amended to Patreon / Ko-fi like en lang,
this will be done on final beta translation update.
Thanks thefourcraft
2022-05-24 18:58:37 +01:00
5104c34513
Add link to documentation to WSS error
2022-05-23 21:23:29 -04:00
d0596af4c9
Add exemption orjson no-member falsepositive
2022-05-23 22:54:06 +01:00
6fa2aa93a5
Merge branch 'tweak/patgen-credits-format-update' into 'dev'
...
Update credits panel for new PatGen format update
See merge request crafty-controller/crafty-4!270
2022-05-23 21:31:42 +00:00
2a4295d9b3
Add subscription source parsing & format html
2022-05-23 22:21:32 +01:00
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
afdffcd836
Optimize get_user_permissions_mask
2022-05-23 23:03:50 +03:00
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
