Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,006 Commits 12 Branches 45 Tags 104 MiB
d1bdb6198b
Commit Graph

2006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zedifus
e4140748cf Merge branch 'dev' into dev-BetterMobileDisplayStatusPage 2022-06-24 02:56:52 +01:00
Iain Powrie
7939b70e8c Merge branch 'bug/backup-delete-page-2' into 'dev' 
Fix cannot delete backup on page 2

See merge request crafty-controller/crafty-4!382
 2022-06-24 01:50:09 +00:00
Zedifus
6ae87ca2af Update changelog !382 2022-06-24 02:46:53 +01:00
Zedifus
cf25249a9d Fix path issue with update-alternatives 
Sometimes it can be in /sbin,
if it is we return `None` which broke upstream frontend.
Returning an empty list to resolve this.
 2022-06-24 02:28:05 +01:00
Andrew
b4749f8caf Fix 2 bugs: Stats startup after backup 
Server java version path bug
 2022-06-23 19:34:27 -04:00
Silversthorn
8fab04878a Update Changelog Status Page 2022-06-23 18:16:17 +02:00
Silversthorn
db839252ac Better Display 2022-06-23 18:07:25 +02:00
Silversthorn
ae73165423 smaller Server icon 2022-06-23 18:02:54 +02:00
luukas
f951b49e2f
AJAX schedule enabled status 
This is buggy in its current state
 2022-06-23 01:58:06 +03:00
luukas
147f178c87
Add a basic API for modifying schedules. 
THIS IS VERY UNTESTED AND WILL BE EXPANDED TO FULL CRUD FOR SCHEDULES
 2022-06-23 01:57:29 +03:00
Matze
d3164c564e corrected a misunderstood translation in string "javaversionDesc" 2022-06-22 23:24:07 +02:00
Matze
6328ef4a74 reviewed the german translation, fixed some spelling issues and added some missing strings 2022-06-22 22:54:57 +02:00
Silversthorn
b3993d1072 First try to add a better display for Status Page 2022-06-22 21:36:05 +02:00
Andrew
b359685392 Add clone server confirmation. 2022-06-22 14:51:10 -04:00
amcmanu3
b1b04e536e Fix cannot delete backup on page 2 2022-06-21 23:18:17 -04:00
Iain Powrie
a252444c52 Merge branch 'dev' into 'master' 
4.0.4-hotfix2

See merge request crafty-controller/crafty-4!381
 2022-06-21 22:49:26 +00:00
Zedifus
81bc228e40 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-21 23:43:24 +01:00
Zedifus
f2023ec06a Update changelog !381 2022-06-21 23:43:10 +01:00