Commit Graph

1922 Commits

Author SHA1 Message Date
Zedifus
43a93f35b3 Version bump to 4.0.6 2022-07-06 03:04:24 +01:00
Iain Powrie
f3c09648f9 Merge branch 'bug/edit-user-issues' into 'dev'
Tweak Edit User Form

See merge request crafty-controller/crafty-4!395
2022-07-06 02:01:20 +00:00
Zedifus
b714d3d0f1 Update changelog for f1d11bfb 2022-07-06 02:54:10 +01:00
Zedifus
f404e38739 Update changelog !395 2022-07-06 02:50:59 +01:00
Zedifus
102a470348 Merge branch 'dev' into bug/edit-user-issues 2022-07-06 02:50:06 +01:00
amcmanu3
f1d11bfb0d Remove tempdir from packaging logs. 2022-07-05 21:35:43 -04:00
amcmanu3
11b13fbcd6 Add page alert for wrong password 2022-07-05 20:27:10 -04:00
Iain Powrie
50523cead3 Merge branch 'bugfix/turnoff-verbose-logging-docker' into 'dev'
Turn off verbose logging on Docker

See merge request crafty-controller/crafty-4!394
2022-07-06 00:23:48 +00:00
Zedifus
3279062894 Update changelog !394 2022-07-06 00:56:31 +01:00
amcmanu3
a498ef8986 Check if username exists 2022-07-05 19:49:51 -04:00
Zedifus
93bc9b1476 Turn off verbose logging on docker
Oversight on my part, pretty critical as my prod has a 16gb session.log
2022-07-06 00:49:40 +01:00
Zedifus
8ff9f111f6 Merge branch 'master' into dev 2022-07-06 00:45:32 +01:00
amcmanu3
964b3bc4c3 Remove auto complete on edit user 2022-07-05 19:21:06 -04:00
Iain Powrie
c7c50fcc5b Merge branch 'bug/unzip-firefox' into 'dev'
Fix ajax issue with unzip on firefox

See merge request crafty-controller/crafty-4!393
2022-07-05 23:01:13 +00:00
Zedifus
a351e9e59f Update changelog !393 2022-07-05 23:48:52 +01:00
Zedifus
3719d3f24f Merge branch 'dev' into bug/unzip-firefox 2022-07-05 23:47:27 +01:00
Iain Powrie
df3c5d274a Merge branch 'bug/server-creation-no-servers' into 'dev'
Fix unhandeld serverjars api error

See merge request crafty-controller/crafty-4!392
2022-07-05 22:43:35 +00:00
Zedifus
764d9c3905 Update changelog !392 2022-07-05 23:38:53 +01:00
Zedifus
6406cdf66a Merge branch 'dev' into bug/server-creation-no-servers 2022-07-05 23:36:17 +01:00
Iain Powrie
150cd58173 Merge branch 'bug/bool-obj-no-desc' into 'dev'
Fix bug with bool obj on server start

See merge request crafty-controller/crafty-4!391
2022-07-05 22:34:50 +00:00
Zedifus
66f637484b Update changelog !391 2022-07-05 23:30:22 +01:00
Zedifus
dc73768a83 Merge branch 'dev' into bug/bool-obj-no-desc 2022-07-05 23:26:01 +01:00
Iain Powrie
5ce49d478c Merge branch 'bug/backup-external-restore' into 'dev'
Backup restore failure when from external storage medium

See merge request crafty-controller/crafty-4!390
2022-07-05 22:25:10 +00:00
Zedifus
a2c59ebad7 Update changelog !390 2022-07-05 23:20:46 +01:00
Zedifus
795f72a7b4 Merge branch 'dev' into bug/backup-external-restore 2022-07-05 23:15:25 +01:00
amcmanu3
c909d01596 Fix file unzip on Firefox 2022-07-05 17:50:51 -04:00
amcmanu3
69f915616b Fix unhandled serverjars api error on server creation 2022-07-05 16:15:49 -04:00
Zedifus
0a26797496 Update changelog !389 2022-07-05 20:34:55 +01:00
Iain Powrie
0d62959055 Merge branch 'tweak/german-lang-spelling' into 'dev'
Add string "cloneConfirm" to german translation (related to !384 and  #97)

See merge request crafty-controller/crafty-4!389
2022-07-05 19:26:52 +00:00
amcmanu3
6f80b3e5c1 Fix bug with bool obj on server start 2022-07-05 15:24:19 -04:00
amcmanu3
ea24215e21 Remove default backup dir location 2022-07-05 14:55:17 -04:00
amcmanu3
70dfc28574 Fix unable to restore backup on external meduim 2022-07-05 14:45:13 -04:00
Matze
b7941484f5 Add string "cloneConfirm" to german translation (related to !388 & !384) 2022-06-24 20:26:34 +02:00
Iain Powrie
8487871dd6 Bump version to 4.0.5
Forgot this in release
2022-06-24 04:09:50 +00:00
Iain Powrie
fd9b673819 Merge branch 'dev' into 'master'
4.0.5

See merge request crafty-controller/crafty-4!388
2022-06-24 03:20:57 +00:00
Zedifus
9915899ecd Correct changelog date 4.0.5 2022-06-24 04:07:22 +01:00
Iain Powrie
4f40d79ee6 Merge branch 'bugfix/handle-none-java-return' into 'dev'
Fix path issue with update-alternatives

See merge request crafty-controller/crafty-4!387
2022-06-24 03:01:13 +00:00
Zedifus
48cd5916ed Revert internal comment
Must've changed this accidentally
2022-06-24 03:56:31 +01:00
Zedifus
6dfaacc306 Update changelog !387 2022-06-24 03:46:44 +01:00
Zedifus
9a6625ccaa Merge branch 'dev' into bugfix/handle-none-java-return 2022-06-24 03:45:36 +01:00
Iain Powrie
fa01a4a528 Merge branch 'bug/server-startup' into 'dev'
Fix 2 bugs: Stats startup after backup

See merge request crafty-controller/crafty-4!386
2022-06-24 02:43:25 +00:00
Zedifus
509e51ebf3 Update changelog !386 2022-06-24 03:39:49 +01:00
Zedifus
459ca2d191 Merge branch 'dev' into bug/server-startup 2022-06-24 03:38:05 +01:00
Zedifus
0a8d338272 Update changelog !385 2022-06-24 03:34:10 +01:00
Iain Powrie
bf446e869d Merge branch 'tweak/german-lang-spelling' into 'dev'
reviewed the german translation, fixed some spelling issues and added some missing strings

See merge request crafty-controller/crafty-4!385
2022-06-24 02:30:46 +00:00
Iain Powrie
a6bed55218 Merge branch 'tweak/clone-confirmation' into 'dev'
Add clone server confirmation.

See merge request crafty-controller/crafty-4!384
2022-06-24 02:07:50 +00:00
Zedifus
163c05eee3 Update changelog !384 2022-06-24 03:04:07 +01:00
Zedifus
3b9f72beee Merge branch 'dev' into tweak/clone-confirmation 2022-06-24 03:02:48 +01:00
Iain Powrie
ae457c0207 Merge branch 'dev-BetterMobileDisplayStatusPage' into 'dev'
Improving Mobile Display for  Status Page

See merge request crafty-controller/crafty-4!383
2022-06-24 02:01:02 +00:00
Andrew
118924eeaa Fix one more stop where this as an issue 2022-06-23 21:57:50 -04:00