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
3,338 Commits 12 Branches 45 Tags 104 MiB
4379ba408b
Commit Graph

57 Commits

Author SHA1 Message Date
Silversthorn
1bf8f3bf44 Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-19 22:08:49 +02:00
Zedifus
81318f641e Merge branch 'dev' into bugfix/require-packaging 2023-09-19 19:13:13 +01:00
Silversthorn
2d77c456ca Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-05 20:05:12 +02:00
Wout Bouckaert
f47e50eac1
Fix order to be alphabetical 2023-09-05 11:12:56 -06:00
Wout Bouckaert
645e11f4a8
Fix order to be alphabetical 2023-09-05 11:10:36 -06:00
Wout Bouckaert
cfe502d2d3
Add Packaging 23.1 to requirements.txt 2023-09-05 10:56:52 -06:00
Wout Bouckaert
751beaa7eb
Replace all instances of bleach with nh3. 
Using latest version of nh3.
 2023-09-04 20:44:44 -06:00
Zedifus
9132928846 Merge branch 'dev' into bugfix/bump-crypto-267-268 2023-09-05 00:51:11 +01:00
Silversthorn
af1fdb447a Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-02 21:55:51 +02:00
Zedifus
5f088c4a1c Bump tornado to resolve #269 2023-09-02 14:24:40 +01:00
Zedifus
d61da42fa9 Bump crypto to resolve #267 & #268 2023-09-02 14:17:44 +01:00
Silversthorn
2cd0b527d9 Fixing last vulnerability 2023-08-27 14:41:25 +02:00
Silversthorn
5c6407d300 Fixing vulnerabilities 2023-08-27 14:40:28 +02:00
Wout Bouckaert
ad9042e88f
Replace bleach with nh3. 2023-08-12 21:53:26 -06:00
Wout Bouckaert
ad28f84188
Bump PyYAML to 6.0.1 2023-07-17 19:01:26 -06:00
Zedifus
b1b048cb85 Bump requests to 2.31 
Resolves `CVE-2023-32681`

Issue #245
 2023-06-18 17:08:50 +01:00
Zedifus
36e15bd898 Bump cryptography & pyOpenSSL 
Resolves: https://github.com/advisories/GHSA-5cpq-8wj7-hf2v
 2023-06-18 13:46:26 +01:00
amcmanu3
fb1a0d9041 Bump Tornado to 6.3.2 2023-05-26 18:00:33 -04:00
Andrew
da800370dd Bump orjson to 3.8.12 2023-05-08 20:31:48 -04:00
amcmanu3
9d2164a1b3 Bump Cryptography/pyOpenSSL for CVE-2020-36242 2023-02-10 15:36:46 -05:00
Iain Powrie
ba28369222 Bump PyJWT version to resolve CVE-2022-29217 2022-06-03 11:58:43 +00:00
Silversthorn
18bf7ebd01 Updating Argon2-cffi and psutil 2022-05-30 19:56:21 +02:00
Zedifus
ab022a65ed Version bumping jsonlint 
Checking if this is causing lint issue
 2022-05-23 20:35:43 +01: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
5c9c528bdf Fix typo in requirements 2022-05-18 18:25:02 -04: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
amcmanu3
e3248e8657 Change cron validation to allow day abbreviations 2022-05-18 13:53:55 -04:00
luukas
1aa0d65cf7 Merge branch feature/external-frontend to feature/api-v2 without the frontend 2022-04-14 15:33:53 +03:00
computergeek125
42ca4bb973 Refactored the yes to not pass objects in import 
Merge Conflicts ᴙ Us
 2022-04-11 00:23:55 -05:00
Zedifus
5cefbab5ec Sort requirements.txt alphabetically 2022-03-19 16:23:31 +00:00
Zedifus
36934d981c Remove dupe crypto 2022-03-19 16:20:04 +00:00
Iain Powrie
755e4a656b Security patch to fix 
CVE-2020-14343

pyyaml Arbitrary Code Execution [9.8/10]
 2022-03-09 10:41:34 +00:00
Iain Powrie
0b1da08f20 Bump bleach to 4.1 
Resolves import error (See MR)
 2022-01-22 20:11:08 +00:00
Lukas ‎‎‎‎
09bd01a634 Merge branch 'dev' into 'lukas-jwts' 
# Conflicts:
#   app/classes/web/panel_handler.py
#   app/frontend/templates/notify.html
#   app/translations/en_EN.json
#   requirements.txt
 2022-01-16 10:54:55 +00:00
Andrew
0d3fc43931 Remove schedules from DB when deleting a server. 
Add better messaging for support log prep.
Add english translation for notify.
Chnage dep to 4.0 for tzlocal
 2022-01-14 23:53:44 -05:00
Andrew
50a6c0a2ce donwngrade tzlocal from 4.1 to 3.0 2022-01-14 21:32:26 -05:00
luukas
93857f90db JWT login and multi API keys! 2022-01-15 02:23:50 +02:00
Andrew
c736c2eec1 Fix for tzdata 2022-01-14 14:59:06 -05:00
Andrew
a124ab24e2 Update dependencies for tzdata 2022-01-14 14:25:43 -05:00
Andrew
9f846c051e update python modules in requirements.txt 2022-01-14 14:14:51 -05:00
Iain Powrie
5812584de6 Add missing dependant for 
8723a444
 2022-01-14 18:27:49 +00:00
Andrew
3e3a068e48 Update requirements.txt for apscheduler 2022-01-11 17:52:02 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Quentin
12153b1207 Merge branch 'fix/exit-code-tweak' into 'dev' 
removed old exit handling logic

See merge request crafty-controller/crafty-commander!109
 2021-12-06 05:50:48 +00:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
Iain Powrie
73fba6b980 Make cryptography a TLD again 
This is to fix:
'AttributeError: module 'lib' has no attribute 'X509_get_notBefore'
 2021-11-24 01:24:17 +00:00
Zedifus
4657cee59d Make cryptography a TLD again 
This is to fix:
'AttributeError: module 'lib' has no attribute 'X509_get_notBefore'
 2021-11-23 23:17:27 +00:00
Zedifus
be0efe7c28 Fix pip requirements 
pyOpenSSL req by helpers.py,
PyYAML req by roles.py,
schedule replaced by incorrect package schedules
 2021-11-05 16:04:53 +00:00
luukas
220f11bc09 Remove unnecessary lines from requirements.txt and make them get the latest patch version of the minor version 2021-09-30 22:18:14 +03:00
Silversthorn
05b48ef786 cffi update version for running with python 3.9 2021-09-27 21:57:04 +02:00