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
1,903 Commits 12 Branches 45 Tags 104 MiB
c7c50fcc5b
Commit Graph

1338 Commits

Author SHA1 Message Date
Zedifus
3719d3f24f Merge branch 'dev' into bug/unzip-firefox 2022-07-05 23:47:27 +01:00
Zedifus
6406cdf66a Merge branch 'dev' into bug/server-creation-no-servers 2022-07-05 23:36:17 +01:00
Zedifus
dc73768a83 Merge branch 'dev' into bug/bool-obj-no-desc 2022-07-05 23:26:01 +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
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
Zedifus
48cd5916ed Revert internal comment 
Must've changed this accidentally
 2022-06-24 03:56:31 +01:00
Zedifus
9a6625ccaa Merge branch 'dev' into bugfix/handle-none-java-return 2022-06-24 03:45:36 +01:00
Zedifus
459ca2d191 Merge branch 'dev' into bug/server-startup 2022-06-24 03:38:05 +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
Zedifus
3b9f72beee Merge branch 'dev' into tweak/clone-confirmation 2022-06-24 03:02:48 +01: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
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
db839252ac Better Display 2022-06-23 18:07:25 +02:00
Silversthorn
ae73165423 smaller Server icon 2022-06-23 18:02:54 +02: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
amcmanu3
205bbf356f Fix traceback on server schedule creation page 2022-06-21 18:40:16 -04:00
amcmanu3
d8d80bbb42 Remove bad check for backup path 2022-06-21 17:41:52 -04:00
amcmanu3
b725054dcd Appease the linter 2022-06-21 17:36:50 -04:00
amcmanu3
97900cd283 Fix issue on path transversal backups linux 2022-06-21 17:35:34 -04:00
amcmanu3
7074dd18fb Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-21 17:14:55 -04:00
amcmanu3
fdfec80a39 Fix bug with sec logic 2022-06-21 17:14:35 -04:00
Zedifus
7107713666 Merge branch 'dev' into enhancement/file-editor-large 2022-06-21 22:01:36 +01:00
amcmanu3
950cbce27c Fix java logic issue 2022-06-21 17:00:51 -04:00
amcmanu3
d1af950c46 Update translation 2022-06-21 16:55:42 -04:00
amcmanu3
c2bcc82cc0 Fix save button bug 2022-06-21 16:44:30 -04:00
amcmanu3
6e1eaf595c Allow file-editor increase size 2022-06-21 16:41:06 -04:00
Zedifus
ffba1fb438 Merge branch 'dev' into enhancement/backup-failure-alert 2022-06-21 21:34:51 +01:00
amcmanu3
d3b1095867 Disable backups directory from changing bad paths 2022-06-21 16:14:29 -04:00
amcmanu3
177d99e002 Add mobile menu to pages without it 2022-06-21 15:59:34 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00
Zedifus
610b94dd59 Merge branch 'dev' into tweak/file-enhancements 2022-06-21 20:41:09 +01:00
Zedifus
70e9290627 Merge branch 'dev' into dev-ImprovingMobileDisplay 2022-06-21 20:23:48 +01:00
Andrew
e727e6662a Merge branch 'tweak/java-version-retention' into 'dev' 
Fix sec bug with server creation roles/Java Version Select improvements

See merge request crafty-controller/crafty-4!376
 2022-06-21 19:17:35 +00:00
Zedifus
a6d9b81775 Add execution cmd -display only- for non supers 2022-06-21 20:11:01 +01:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
7379545186 Strip empty entry in update-alternatives output 
Catch ValueError on missing end quote in java execution command
 2022-06-21 19:28:53 +01:00
Zedifus
6fe5d16ded Remove java selection from bedrock 2022-06-21 19:05:56 +01:00
Zedifus
176f5a4004 Add java selection POST check 
Protect against tampered post requests to front end

Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-06-21 18:39:20 +01:00
amcmanu3
c4fb6482cc Fix sec bug with server creation roles 
Retain current java version in dropdown.
 2022-06-21 01:18:19 -04:00