Zedifus
e3ad0de7bc
Close changelog 4.1.3
2023-07-18 22:33:24 +01:00
Iain Powrie
c2d0461ba5
Merge branch 'bugfix/creation-formatting' into 'dev'
...
Fix format on serverjars warning
See merge request crafty-controller/crafty-4!601
2023-07-18 21:21:20 +00:00
Zedifus
fe03b3a9a8
Update changelog !601
2023-07-18 22:14:41 +01:00
Zedifus
d5acbdddb9
Merge branch 'dev' into bugfix/creation-formatting
2023-07-18 21:59:25 +01:00
Zedifus
bfe4291584
Tweak sonar conditional
...
Jobs were still fireing
2023-07-18 21:54:45 +01:00
Zedifus
1beb86bc8f
Merge branch 'dev' into bugfix/creation-formatting
2023-07-18 21:43:54 +01:00
Iain Powrie
d3f9314139
Merge branch 'refactor/in-file' into 'dev'
...
Replace "in_file" helper method
See merge request crafty-controller/crafty-4!605
2023-07-18 20:31:59 +00:00
Zedifus
18d9ffa6b3
Make sonar conditional on token
...
This will stop forked repo tests failing
2023-07-18 21:21:36 +01:00
Zedifus
8c5dea587f
Update changelog !605
2023-07-18 21:09:12 +01:00
Zedifus
aa0824630a
Merge branch 'dev' into refactor/in-file
2023-07-18 21:07:11 +01:00
Iain Powrie
be37f8f49e
Merge branch 'bugfix/schedule-enable' into 'dev'
...
Fix enabling/disabling schedules from schedule list
See merge request crafty-controller/crafty-4!606
2023-07-18 20:02:02 +00:00
Zedifus
748db1866a
Update changelog !606
2023-07-18 20:57:30 +01:00
Zedifus
a254a20082
Merge branch 'dev' into bugfix/schedule-enable
2023-07-18 20:55:22 +01:00
Iain Powrie
390188fa56
Merge branch 'tweak/status-link' into 'dev'
...
Add public status link to login
See merge request crafty-controller/crafty-4!608
2023-07-18 19:52:02 +00:00
Zedifus
dcfc3f00fe
Update changelog !608
2023-07-18 20:42:13 +01:00
Zedifus
8e9eec36b8
Merge branch 'dev' into tweak/status-link
2023-07-18 20:41:39 +01:00
Iain Powrie
5016dbd45f
Merge branch 'bugfix/bump-pyyaml-6.0.1' into 'dev'
...
Bump PyYAML to 6.0.1
See merge request crafty-controller/crafty-4!609
2023-07-18 19:22:15 +00:00
Iain Powrie
1fb4edd463
Update changelog !609
2023-07-18 19:19:34 +00:00
Wout Bouckaert
ad28f84188
Bump PyYAML to 6.0.1
2023-07-17 19:01:26 -06:00
Andrew
345fee7e5d
Add translation
2023-07-05 21:51:15 -04:00
Andrew
d2f56a6556
Add link to status page to login
2023-07-05 21:48:55 -04:00
Andrew
6396c3079e
Include self in method call
2023-07-04 15:02:47 -04:00
Andrew
45b0264499
Fix enabling schedules from schedule list
2023-07-04 12:10:59 -04:00
Iain Powrie
2a1fb3bde8
Merge branch 'bugfix/public-status-config' into 'dev'
...
Fix text for public status page
See merge request crafty-controller/crafty-4!602
2023-07-01 12:28:53 +00:00
Zedifus
8af726cd79
Update changelog !602
2023-07-01 13:22:19 +01:00
Zedifus
4c66752924
Merge branch 'dev' into bugfix/public-status-config
2023-07-01 13:20:48 +01:00
amcmanu3
a00ea06b9f
Merge branch 'dev' into refactor/in-file
2023-06-27 00:48:21 -04:00
Iain Powrie
01a4f2ea74
Update changelog !604
2023-06-24 15:39:38 +00:00
Iain Powrie
749b3e60ca
Merge branch 'bugfix/add-tzdata-to-docker-image' into 'dev'
...
Include tzdata in Docker image
See merge request crafty-controller/crafty-4!604
2023-06-24 15:13:32 +00:00
Peter Szabo
a5668ff7da
apt-get install tzdata in Dockerfile
2023-06-24 15:46:06 +02:00
amcmanu3
e5e5d529ae
Fix text for public status page
2023-06-19 20:28:36 -04:00
Zedifus
653397883d
Update missing items from dockerignore
...
Including new sonarsource properties file
2023-06-18 21:22:43 +01:00
Zedifus
e5f65a5a6e
Bump SQ proj version for dev
2023-06-18 20:59:18 +01:00
Zedifus
0d66b90ca6
Configure sonarcloud
2023-06-18 20:46:18 +01:00
Zedifus
cd389f1202
Add SonarCloud CQ
2023-06-18 20:29:23 +01:00
Andrew
dd3ea0a094
Merge branch 'dev' into bugfix/creation-formatting
2023-06-18 14:26:24 -04:00
Zedifus
5de11aec9a
Prepare 4.1.3 release base
2023-06-18 19:07:19 +01:00
Zedifus
f95632e06f
Close changelog 4.1.2
2023-06-18 18:32:09 +01:00
Iain Powrie
cbbf3a5c55
Merge branch 'tweak/bump-requests-245' into 'dev'
...
Bump requests to 2.31
See merge request crafty-controller/crafty-4!600
2023-06-18 17:08:16 +00:00
Zedifus
d008cc616b
Update changelog !599
...
Missing from MR
2023-06-18 17:56:07 +01:00
Iain Powrie
d02f9d0b87
Merge branch 'bugfix/management' into 'dev'
...
Add autofield to appease linter
See merge request crafty-controller/crafty-4!599
2023-06-18 16:42:34 +00:00
Zedifus
4227b114b3
Update changelog !600
2023-06-18 17:14:01 +01:00
Zedifus
b1b048cb85
Bump requests to 2.31
...
Resolves `CVE-2023-32681`
Issue #245
2023-06-18 17:08:50 +01:00
Andrew
6f506eecbd
Add autofield to appease linter
2023-06-18 11:09:00 -04:00
Zedifus
3673134048
Update changelog !596
...
Missed from MR
2023-06-18 15:44:02 +01:00
Zedifus
dfe8cd5cd8
Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev
2023-06-18 15:36:57 +01:00
Zedifus
c303ca4012
Update overgeneral-exceptions
...
Fixes deprecation warning:
pylint: Command line or configuration file:1: UserWarning: Specifying exception names in the overgeneral-exceptions option without module name is deprecated and support for it will be removed in pylint 3.0. Use fully qualified name (maybe 'builtins.BaseException' ?) instead.
2023-06-18 15:36:49 +01:00
Iain Powrie
5d109f2fa0
Merge branch 'lang/es-pl' into 'dev'
...
Update es_ES & pl_PL lang
See merge request crafty-controller/crafty-4!597
2023-06-18 14:26:04 +00:00
Iain Powrie
fda691ecac
Merge branch 'tweak/bump-crypto-openssl' into 'dev'
...
Bump cryptography & pyOpenSSL
See merge request crafty-controller/crafty-4!596
2023-06-18 13:56:58 +00:00
Zedifus
cf01524fda
Update changelog !597
2023-06-18 14:46:51 +01:00