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 |
|
Iain Powrie
|
3751d47b82
|
Merge branch 'tweak/server-create-roles' into 'dev'
Change server creation to include searchable roles
See merge request crafty-controller/crafty-4!772
|
2024-07-29 19:20:43 +00:00 |
|
Zedifus
|
c8425578f0
|
Update changelog !772
|
2024-07-29 20:14:06 +01:00 |
|
Zedifus
|
83813e7566
|
Mark th_TH incomplete
|
2024-07-29 20:11:32 +01:00 |
|
Ludo-code
|
af3c08d886
|
Update file fr_FR.json
|
2024-07-26 06:44:27 +00:00 |
|
Ludo-code
|
70ef395936
|
fix fr lang
|
2024-07-24 16:33:22 +00:00 |
|
Analicia Abernathy
|
76215556d2
|
translations for server creation changes
|
2024-07-23 21:38:18 -05:00 |
|
amcmanu3
|
f7a4c9505f
|
Ingnore humanized
|
2024-07-23 22:06:24 -04:00 |
|
Andrew
|
0ed296adc6
|
Merge branch 'dev' into tweak/server-create-roles
|
2024-07-21 11:17:16 -04:00 |
|
Iain Powrie
|
b71b7cb1c4
|
Merge branch 'refactor/upload-api' into 'dev'
Chunked Uploads | Fix Upload Authentication
See merge request crafty-controller/crafty-4!762
|
2024-07-09 02:32:51 +00:00 |
|
Zedifus
|
b36740e0f7
|
Update changelog !762
|
2024-07-09 03:29:06 +01:00 |
|
Iain Powrie
|
eaeda3e746
|
Merge branch 'refactor/backups' into 'dev'
Refactor Backups | Allow multiple backup configurations
See merge request crafty-controller/crafty-4!711
|
2024-07-09 02:11:30 +00:00 |
|
amcmanu3
|
1ac63fae0d
|
Merge branch 'refactor/backups' into refactor/upload-api
|
2024-07-08 22:06:49 -04:00 |
|
amcmanu3
|
a3e210c0d3
|
Check for traversal on backup delete
|
2024-07-08 22:06:29 -04:00 |
|
amcmanu3
|
d9b9f00e9a
|
Merge branch 'refactor/backups' into refactor/upload-api
|
2024-07-08 21:57:59 -04:00 |
|
amcmanu3
|
9186d9b02c
|
Include backup_id in delete call
|
2024-07-08 21:51:27 -04:00 |
|
Zedifus
|
90e11ef73e
|
Update changelog !711
|
2024-07-09 02:33:02 +01:00 |
|
Zedifus
|
c9b2b49e5f
|
Merge branch 'dev' into refactor/backups
|
2024-07-09 02:31:30 +01:00 |
|
Iain Powrie
|
b4f721cd8c
|
Merge branch 'tweak/server-name' into 'dev'
Do not allow slashes in server names
See merge request crafty-controller/crafty-4!767
|
2024-07-09 01:28:32 +00:00 |
|
Iain Powrie
|
974571ea7a
|
Merge branch 'tweak/cpu-attribute-error' into 'dev'
Workaround cpu_freq call catching on obscure cpu architectures
See merge request crafty-controller/crafty-4!776
|
2024-07-09 01:21:29 +00:00 |
|
Zedifus
|
31abf80ffc
|
Update changelog !776
|
2024-07-09 02:18:12 +01:00 |
|
Iain Powrie
|
b0afc80b73
|
Merge branch 'Username404-59-dev-patch-44249' into 'tweak/cpu-attribute-error'
Fix cpu_freq call catching on obscure systems
See merge request crafty-controller/crafty-4!754
|
2024-07-09 01:12:11 +00:00 |
|
Zedifus
|
65396b7f27
|
Merge branch 'dev' into tweak/server-name
|
2024-07-09 02:07:00 +01:00 |
|
Iain Powrie
|
1c7ffcdda7
|
Merge branch 'bugfix/user-tz-login' into 'dev'
Use UTC for tokens_valid_from in user config
See merge request crafty-controller/crafty-4!765
|
2024-07-09 01:00:46 +00:00 |
|
Zedifus
|
ba2d3c92a6
|
Update changelog !765
|
2024-07-09 01:55:01 +01:00 |
|
Zedifus
|
735cdb238a
|
Merge branch 'dev' into bugfix/user-tz-login
|
2024-07-09 01:53:01 +01:00 |
|
Iain Powrie
|
4346f58ff3
|
Merge branch 'bugfix/user-creation' into 'dev'
User Creation Fixes
See merge request crafty-controller/crafty-4!763
|
2024-07-09 00:48:25 +00:00 |
|
amcmanu3
|
0519a36fe1
|
Fix sonar issue
|
2024-07-08 20:39:21 -04:00 |
|
Zedifus
|
5b4bf46f61
|
Mark he_IL incomplete
|
2024-07-09 01:20:09 +01:00 |
|
Zedifus
|
b63081b03c
|
Update changelog !763
|
2024-07-09 01:13:43 +01:00 |
|
Zedifus
|
594f030545
|
Merge branch 'dev' into bugfix/user-creation
|
2024-07-09 01:07:19 +01:00 |
|
amcmanu3
|
f26606a0cd
|
Except filenotfound
|
2024-07-08 20:05:42 -04:00 |
|