Commit Graph

4280 Commits

Author SHA1 Message Date
Iain Powrie
2b14d514e0 Merge branch 'dev' into 'master'
v4.4.3

See merge request crafty-controller/crafty-4!792
2024-08-08 19:59:08 +00:00
Iain Powrie
149a51b4e6 Merge branch 'bugfix/schedule-creation' into 'dev'
Fix schedules creation fail due to missing action ID

See merge request crafty-controller/crafty-4!791
2024-08-08 19:41:47 +00:00
Zedifus
3da6d6f740 Close changelog 4.4.3 2024-08-08 20:37:30 +01:00
Zedifus
3ec43e45ba Update changelog !791 2024-08-08 20:36:26 +01:00
Andrew
a1c3e3386f Fix schedules creation fail due to missing action ID 2024-08-07 20:28:13 -04:00
Zedifus
0d19f81a29 Prepare 4.4.3 release base 2024-08-07 02:39:41 +01:00
Iain Powrie
94a1fdd215 Merge branch 'dev' into 'master'
v4.4.2

See merge request crafty-controller/crafty-4!790
2024-08-07 00:33:38 +00:00
Iain Powrie
589b3b5cc8 Merge branch 'bugfix/upload-flood' into 'dev'
Upload chunks in batches

See merge request crafty-controller/crafty-4!788
2024-08-07 00:26:26 +00:00
Zedifus
adc781f8f9 Close changelog 4.4.2 2024-08-07 01:21:24 +01:00
Zedifus
a4f97b446e Update changelog !788 2024-08-07 01:20:16 +01:00
Zedifus
4155f359cc Merge branch 'dev' into bugfix/upload-flood 2024-08-07 01:17:33 +01:00
Iain Powrie
1f832ae85e Merge branch 'bugfix/fileNotFound-exceptoin' into 'dev'
Fix exception message on file not found for backups

See merge request crafty-controller/crafty-4!789
2024-08-06 23:08:20 +00:00
Zedifus
885b629cc7 Update changelog !789 2024-08-06 23:54:16 +01:00
amcmanu3
849242ecea Fix exception message on file not found for backups 2024-08-06 18:36:21 -04:00
amcmanu3
6ef93908ae Tweak upload js function to upload in batches 2024-08-06 17:48:17 -04:00
Zedifus
fc6f85a16b Prepare 4.4.2 release base 2024-08-06 21:31:41 +01:00
Zedifus
fcdebbe3e5 Merge branch 'dev' into rerelease-4.4.1 2024-08-06 20:47:25 +01:00
Zedifus
45c3f73eca Revert "Revert "Merge branch 'dev' into 'master'""
This reverts the 4.4.1 release revert commit 29ce7a2cde.
2024-08-06 20:45:00 +01:00
Iain Powrie
73ed9156b7 Merge branch 'lang/new-lang-russian' into 'dev'
Add ru_RU Translation

See merge request crafty-controller/crafty-4!779
2024-08-06 19:14:34 +00:00
Zedifus
ce972ec728 Merge branch 'lang/new-lang-russian' of gitlab.com:crafty-controller/crafty-4 into lang/new-lang-russian 2024-08-06 20:10:06 +01:00
Zedifus
6139a6426f Close changelog 4.4.1 2024-08-06 20:09:21 +01:00
Zedifus
7f27c018de Merge branch 'dev' into lang/new-lang-russian 2024-08-06 20:08:30 +01:00
Iain Powrie
fe33b84e10 Merge branch 'bugfix/backup-migration' into 'dev'
Orphan Backup Migration Fix

See merge request crafty-controller/crafty-4!785
2024-08-06 19:05:17 +00:00
amcmanu3
7c16737fab Appease sonar return nothing instead of false 2024-08-06 14:59:10 -04:00
Zedifus
7b739863b3 Update changelog !785 2024-08-06 19:51:39 +01:00
Zedifus
037e13d243 Merge branch 'dev' into bugfix/backup-migration 2024-08-06 19:46:18 +01:00
amcmanu3
9f7f588e85 Tweak default backup configs to account for bad clone in 4.2.x 2024-07-30 14:30:30 -04:00
amcmanu3
4a58759183 Add function for removing old malformed backups 2024-07-30 16:45:02 +01:00
Analicia Abernathy
f8b1070162 added norole and nonerole translations 2024-07-30 07:32:10 -05:00
Zedifus
44b5f2a809 Reopen changelog 4.4.1 2024-07-30 00:49:33 +01:00
amcmanu3
ff9abe4359 Fix directory moves on backup migration 2024-07-29 18:02:00 -04:00
Iain Powrie
d3f965d127 Merge branch 'revert-501b490c' into 'master'
Revert "Merge branch 'dev' into 'master'"

See merge request crafty-controller/crafty-4!784
2024-07-29 21:53:44 +00:00
Iain Powrie
29ce7a2cde Revert "Merge branch 'dev' into 'master'"
This reverts merge request !783
2024-07-29 21:49:44 +00:00
Iain Powrie
501b490cbd Merge branch 'dev' into 'master'
v4.4.1

See merge request crafty-controller/crafty-4!783
2024-07-29 21:34:20 +00:00
Zedifus
627adcdc95 Close changelog 4.4.1 2024-07-29 21:56:47 +01:00
Iain Powrie
4e345652dc Merge branch 'bugfix/dropdown-width' into 'dev'
Remove unused and problematic "dropdown-menu" ident from css

See merge request crafty-controller/crafty-4!782
2024-07-29 20:52:07 +00:00
Zedifus
3775268883 Update changelog !782 2024-07-29 21:48:27 +01:00
amcmanu3
245f473693 Remove unused and problematic "dropdown-menu" ident from css 2024-07-29 16:41:25 -04:00
Iain Powrie
928d266ee6 Merge branch 'lang/th_TH-updates' into 'dev'
Add th_TH translations for !772

See merge request crafty-controller/crafty-4!781
2024-07-29 20:30:34 +00:00
Zedifus
c920719503 Update changelog !781 2024-07-29 21:26:58 +01:00
Zedifus
ef7fc68a24 Merge branch 'dev' into lang/th_TH-updates 2024-07-29 21:24:43 +01:00
Zedifus
d7f00ecb27 Update changelog !779 2024-07-29 21:13:51 +01:00
Zedifus
65ae3f08b9 Merge branch 'dev' into lang/new-lang-russian 2024-07-29 21:12:27 +01:00
Iain Powrie
b5e30bea58 Merge branch 'lang/fix-frFR-syntax' into 'dev'
Fix fr_FR syntax issues

See merge request crafty-controller/crafty-4!780
2024-07-29 20:07:40 +00:00
Zedifus
fbf1dd5395 Update chngelog !780 2024-07-29 20:53:58 +01:00
Analicia Abernathy
bcdc464edf Update th_TH.json 2024-07-29 14:47:53 -05:00
Analicia Abernathy
d0aeb019d8 adding missing translations from merge 772 2024-07-29 14:46:15 -05:00
Iain Powrie
568641dce3 Merge branch 'lang/fix_fr' into 'lang/fix-frFR-syntax'
Lang/fix fr

See merge request crafty-controller/crafty-4!778
2024-07-29 19:40:10 +00:00
Analicia Abernathy
e60b86c238 Adding new language ru_RU 2024-07-29 14:33:28 -05:00
Analicia Abernathy
d4af117421 added ru_RU to the humanized json 2024-07-29 14:33:14 -05:00