4350 Commits

Author SHA1 Message Date
Zedifus
dc8db04228 Consolidate separate prod & dev build jobs into one, adding rule for nightly builds 2024-12-10 19:50:12 +00:00
Iain Powrie
e0665a3ed5 Merge branch 'feature/upgrade-image' into 'dev'
Upgrade crafty to ubuntu 24.04

See merge request crafty-controller/crafty-4!812
2024-12-10 19:24:56 +00:00
Glenn Schuurman
3eeb6d8a2a Upgrade crafty to ubuntu 24.04 2024-12-10 19:24:56 +00:00
Zedifus
30948b4db9 Append job id to builder & context
Stops parallel jobs clashing
2024-12-10 13:50:57 +00:00
Zedifus
0a466a0a34 Fix changelog !786 2024-12-01 19:15:19 +00:00
Iain Powrie
a37372d8ce Merge branch 'refactor/validator-errors' into 'dev'
Human readable JSON errors

See merge request crafty-controller/crafty-4!786
2024-12-01 19:08:41 +00:00
Zedifus
a247aa4752 Fix lint missing deps for orjson 2024-12-01 19:03:47 +00:00
Zedifus
40956a751b Update changelog !786 2024-12-01 18:55:59 +00:00
Zedifus
02830b3b99 Merge branch 'dev' into refactor/validator-errors 2024-12-01 18:50:15 +00:00
Iain Powrie
6d9b3e239a Merge branch 'translations/weblate' into 'dev'
Remove Incomplete Labels From Translations

See merge request crafty-controller/crafty-4!810
2024-11-19 22:38:05 +00:00
Iain Powrie
69c4b1b716 Appease Lint 2024-11-19 22:33:36 +00:00
Iain Powrie
81457271cc Disable lang check as now managed by Weblate 2024-11-19 22:27:32 +00:00
Iain Powrie
137fc1b88d Update changelog !810 2024-11-19 22:18:27 +00:00
=
5058d0ee36 Remove empty translations 2024-11-19 15:51:06 -05:00
=
e3af7e612e Remove incomplete for new workflow 2024-11-19 15:40:01 -05:00
Iain Powrie
236d1bf11f Merge branch 'sec/bump-requests' into 'dev'
Bump requests to 2.32.0 -> 2.32.3

See merge request crafty-controller/crafty-4!808
2024-11-03 13:16:19 +00:00
Zedifus
8d91cd7ec5 Update changelog !808 2024-10-16 21:20:11 +01:00
Zedifus
5e1d7ed4bd Bump requests to 2.32.0 -> 2.32.3
Resolves yanked ver:
2.32.0 Conflics w/ CVE-2024-35195 mitigation
2024-10-16 21:15:45 +01:00
Zedifus
0572c0a91d Prepare 4.4.5 release base 2024-10-03 02:54:49 +01:00
Zedifus
848a7f365c Close changelog 4.4.4 2024-10-03 02:25:04 +01:00
Iain Powrie
2f61ace6e8 Merge branch 'sec/bump-crypto' into 'dev'
Bump cryptography for GHSA-h4gh-qq45-vh27

See merge request crafty-controller/crafty-4!803
2024-10-03 01:04:38 +00:00
Zedifus
9f3706e089 Update changelog !803 2024-10-03 01:28:44 +01:00
Zedifus
402b2040bc Bump parent dep of crypto 2024-10-03 01:27:12 +01:00
Zedifus
cee88e8e4a Bump cryptography for GHSA-h4gh-qq45-vh27 2024-10-03 01:22:32 +01:00
Zedifus
1123718d3d Update changelog !796 2024-10-03 01:10:16 +01:00
Zedifus
e69222d38c Merge branch 'bugfix/update-download-bedrock-url' of gitlab.com:crafty-controller/crafty-4 into bugfix/update-download-bedrock-url 2024-10-02 22:55:42 +01:00
Zedifus
16504c77a8 Update changelog !802 2024-10-02 22:55:35 +01:00
=
f0bf9619cd Change http response code for creation error 2024-10-02 17:54:33 -04:00
Zedifus
00ab1747be Merge branch 'dev' into bugfix/update-download-bedrock-url 2024-10-02 22:50:20 +01:00
Iain Powrie
730fcf5883 Merge branch 'bugfix/crash-detection' into 'dev'
Reset crash detection counter after crash detection process detects successful start

See merge request crafty-controller/crafty-4!798
2024-10-02 21:34:55 +00:00
Zedifus
031ee91409 Update changelog !798 2024-10-02 22:22:43 +01:00
Zedifus
8f754536b1 Merge branch 'dev' into bugfix/crash-detection 2024-10-02 22:20:53 +01:00
Andrew
aa5f7c303b Merge branch 'bugfix/update-download-bedrock-url' into 'bugfix/update-download-bedrock-url'
Bugfix/update download bedrock url

See merge request crafty-controller/crafty-4!802
2024-10-02 21:18:50 +00:00
Iain Powrie
c59c5f960f Merge branch 'bugfix/bedrock_root_files' into 'dev'
Fix logic in bedrock server import frontend

See merge request crafty-controller/crafty-4!797
2024-10-02 21:06:24 +00:00
Zedifus
e637a9705b Update changelog !797 2024-10-02 21:55:36 +01:00
=
eb0670ca42 Lint lint lint! 2024-10-02 16:34:29 -04:00
Adam Plante
16862a418b Merge branch 'bugfix/update-download-bedrock-url' of gitlab.com:sarcastron/crafty-4 into bugfix/update-download-bedrock-url 2024-10-02 19:45:57 +00:00
Adam Plante
b8e14edc06 Merge branch crafty-4:master into bugfix/update-download-bedrock-url 2024-10-02 19:12:45 +00:00
Adam Plante
a73db62b24 Send message to front end when system fails to download bedrock server 2024-10-02 19:10:36 +00:00
Analicia Abernathy
f65899c0f9 translations for lv_LV and nl_BE 2024-10-01 17:59:31 -05:00
Analicia Abernathy
9140899a32 ran .gitlab scripts 2024-10-01 17:56:41 -05:00
Analicia Abernathy
fbb301beab translations for lv_LV, nl_BE and _uk_UA 2024-10-01 17:41:14 -05:00
Andrew
4da525208a Merge branch 'dev' into bugfix/backup-schedules-migration 2024-09-28 11:12:02 -04:00
Adam Plante
37b8a4fa16 Fix failed bedrock download due to outdated target URL 2024-09-24 00:52:05 +00:00
=
8a957a3fcf Reset crash detection counter after 30 seconds of running 2024-09-19 15:52:58 -04:00
=
db7a3cfde8 Use more descript username error 2024-09-18 16:10:41 -04:00
=
2d5d31cb6e Use error_data for additional info EVERYWHERE 2024-09-18 16:10:29 -04:00
=
1167e46077 Fix translation error on user page 2024-09-18 15:46:30 -04:00
=
3bd1e7ee0d Merge branch 'dev' into refactor/validator-errors 2024-09-18 14:06:27 -04:00
=
e6bcfdf339 Fix logical issue in backup migration 2024-09-17 13:47:55 -04:00