Andrew
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
Iain Powrie
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
Silversthorn
37bda32164
Fixing moved functions calls
2022-05-30 07:36:25 +02:00
Silversthorn
2f2c9d8203
Merge branch 'dev' into dev-StatsDBImprovement
2022-05-29 10:30:18 +02:00
Zedifus
ca793807cb
Add kofi widget
...
Not sure how to remove the background behind the widget :(
2022-05-29 07:09:39 +01:00
luukas
7885b2c8f7
Fix null writer
2022-05-28 21:11:09 +03:00
luukas
b0e356f999
Fix host stats error messages
2022-05-28 19:43:37 +03:00
luukas
0df5fedf2b
Add try-excepts for host stats
2022-05-28 19:32:54 +03:00
luukas
d1beb2f125
Redirect stderr to null during psutil's import.
...
On some systems /proc might be unavailable and psutil would freak out
printing several exceptions to stderr but strangely not raising the
exceptions for upper scope to handle
2022-05-28 19:00:25 +03:00
luukas
f2890fa31d
Remove unused dependencies
2022-05-28 18:31:11 +03:00
Iain Powrie
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
Zedifus
ccd09e9753
Fix missing escaped chars in submitted translation
2022-05-28 15:17:41 +01:00
Iain Powrie
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
Silversthorn
3b4253de9b
Fixing get_authorized_server
2022-05-26 23:19:59 +02:00
Silversthorn
6fae395185
Fixing issues for latest stats
2022-05-26 15:43:24 +02:00
Silversthorn
99b28efd33
Merge branch 'dev' into dev-StatsDBImprovement
2022-05-26 15:39:52 +02:00
Silversthorn
be1930c7c7
fixing server shutdown gracefull exit
2022-05-26 15:28:54 +02:00
Silversthorn
2b484d5a07
fixing download jar
2022-05-26 15:20:21 +02:00
Silversthorn
056856cf98
Fixing Helpers issue
2022-05-26 15:02:47 +02:00
Silversthorn
8423cc24c1
I'm breaking/fixing stuff
2022-05-26 14:50:20 +02:00
Andrew
39915ef53c
Fix critical bad stats push
2022-05-26 06:49:51 -04:00
luukas
47fc398f26
Fix CORS preflight
2022-05-26 00:31:58 +03:00
Andrew
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
Andrew
b293164e12
Add crash detection to realtime stats
2022-05-25 14:26:13 -04:00
luukas
8ce7a96071
Use a better ANSI escape regex in the API logs
2022-05-25 18:41:41 +03:00
luukas
2e51fa9629
Remove newline characters from API file logs
2022-05-25 18:41:16 +03:00
luukas
3956d9c699
Remove stdin sending from command_watcher
...
Reasons:
* It's unused in our program
* It can be a start to security vulnerabilities.
I've seen many routes add commands to `Commands` without validation.
2022-05-25 17:44:09 +03:00
Silversthorn
5a1353373a
trying something new
2022-05-25 15:54:35 +02:00
luukas
ca450f21ed
Document set_passwd and threads prompt commands
...
Help messages:
set_passwd: Set a user's password. Example: set_passwd admin
threads: Get all of the Python threads used by Crafty
2022-05-25 16:25:49 +03:00
luukas
8e13b4e11d
Simplify helpers setting methods
2022-05-25 16:21:34 +03:00
luukas
0eac0721ea
Remove unused DatabaseShortcuts imports
2022-05-25 16:17:01 +03:00
luukas
4e84eee5a5
Rename server stats variables to server_stats
2022-05-25 16:15:51 +03:00
luukas
83018c6860
Calculate the min stats date with timedelta
...
This is more correct than just using days.
I've also tested this working in a completely separate Peewee project.
2022-05-25 16:14:42 +03:00
luukas
a937a94ac8
Use a better variable name for stat disappear date
...
* Rename occurences of `last_week` with `minimum_to_exist`
2022-05-25 14:49:17 +03:00
luukas
4b707aa9d1
Don't use get_latest_server_stats
...
Use get_server_stats_by_id instead of get_latest_server_stats
The reasoning behind this is that all usages of get_latest_server_stats
had `DatabaseShortcuts.return_rows(latest)[0]`, which
get_server_stats_by_id already did
2022-05-25 14:43:05 +03:00
luukas
166272e12c
Replace .count() != 0 with .exists()
2022-05-25 14:24:34 +03:00
luukas
fae4aeb492
Fix CQ C0412
2022-05-25 14:16:14 +03:00
luukas
cf2ff2f2d5
Try to get rid of database_stats_proxy
2022-05-25 14:00:22 +03:00
Iain Powrie
1bbe6fbae3
Merge branch 'devops/update-master-pipes' into 'master'
...
Devops/update master pipes
See merge request crafty-controller/crafty-4!275
2022-05-25 01:01:35 +00:00
Zedifus
65f1de905f
Update pipes to current dev
2022-05-25 01:59:04 +01:00
Iain Powrie
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
Iain Powrie
d386244e86
Add Dependancy, SAST, Container, Secret Scanning
2022-05-25 00:52:00 +00:00
Andrew
7ca7232829
Add question to warning message
2022-05-24 19:11:14 -04:00
Iain Powrie
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
luukas
2ac9118152
Merge remote's bugfix/api-v2-bugfixes to local
2022-05-25 00:58:32 +03:00
luukas
cbc73b7e92
Fix routing for the user permissions handler
2022-05-25 00:58:10 +03:00
luukas
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
luukas
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
luukas
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
luukas
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
