Commit Graph

2050 Commits

Author SHA1 Message Date
Zedifus
d3a6228d7e Update offline credits.json to schema v2
Also remove non-perm staff & update promoted staff
2022-08-05 23:57:54 +01:00
Zedifus
0af2def7b0 Update credits panel to handle v2 schema 2022-08-05 23:39:31 +01:00
Zedifus
13a0500e86 Switch to v2 credits schema 2022-08-05 23:38:32 +01:00
amcmanu3
ad318296dc Fix no new_job error 2022-08-04 23:57:22 -04:00
amcmanu3
64122f3674 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-08-04 23:33:07 -04:00
amcmanu3
f69d79b702 Fix indenting on jobs being added 2022-08-04 23:23:56 -04:00
Zedifus
e15cc93d04 Prepare 4.0.9 release base 2022-08-05 04:17:30 +01:00
Iain Powrie
8f035e1a7b Merge branch 'dev' into 'master'
4.0.8

See merge request crafty-controller/crafty-4!418
2022-08-05 02:42:41 +00:00
Zedifus
f9ef406cdb Update changelog date 4.0.8 2022-08-05 03:29:09 +01:00
Iain Powrie
a454632ef1 Merge branch 'feature/crafty-version-check' into 'dev'
Add version checking helper and notices

See merge request crafty-controller/crafty-4!411
2022-08-05 02:24:20 +00:00
Zedifus
4f1026c42f Change href to open new tab 2022-08-05 03:09:57 +01:00
Zedifus
6d08d31d97 Add log lines for update notif
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
2022-08-05 03:02:02 +01:00
Zedifus
390d995f53 Add flashing frontend notification
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
2022-08-05 02:56:26 +01:00
Zedifus
59174110ab Remove print statement
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
2022-08-05 02:38:43 +01:00
Zedifus
ff0faffc08 Add update check to 12hr schedule
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
2022-08-05 02:37:21 +01:00
Zedifus
d258c4ec0c Update changelog !411 2022-08-05 01:55:45 +01:00
Zedifus
1e6df269ac Merge branch 'dev' into feature/crafty-version-check 2022-08-05 01:53:40 +01:00
Iain Powrie
bc8ec179a1 Merge branch 'enhancement/pretzel-next-run' into 'dev'
Add next run to schedule info

See merge request crafty-controller/crafty-4!417
2022-08-05 00:46:45 +00:00
Zedifus
6b3bd0ba9f Update changelog !417 2022-08-05 01:33:39 +01:00
Zedifus
a0b599bbd2 Merge branch 'dev' into enhancement/pretzel-next-run 2022-08-05 01:27:18 +01:00
Iain Powrie
78914d92aa Merge branch 'bug/pretzel-api-key-delete' into 'dev'
Fix api key delete confirm

See merge request crafty-controller/crafty-4!416
2022-08-05 00:25:25 +00:00
Zedifus
81baec2c97 Update changelog !416 2022-08-05 01:19:04 +01:00
Zedifus
e306bc449c Merge branch 'dev' into bug/pretzel-api-key-delete 2022-08-05 01:12:52 +01:00
Iain Powrie
6e95801159 Merge branch 'bug/server-creation-api' into 'dev'
Fix server creation with serverjars API

See merge request crafty-controller/crafty-4!415
2022-08-04 23:54:05 +00:00
Zedifus
e495febe3b Update changelog !415 2022-08-05 00:37:16 +01:00
Zedifus
da6a3e3688 Merge branch 'dev' into bug/server-creation-api 2022-08-05 00:33:58 +01:00
Iain Powrie
476b00a807 Merge branch 'bug/pretzel-backup-restart' into 'dev'
Backup Shutdown/restart bug

See merge request crafty-controller/crafty-4!414
2022-08-04 23:27:46 +00:00
Zedifus
db61169c7a Update changelog !414 2022-08-05 00:22:24 +01:00
Zedifus
6c901e5e3e Merge branch 'dev' into bug/pretzel-backup-restart 2022-08-05 00:20:20 +01:00
Iain Powrie
5353cd854f Change sleep from 60 to 3 2022-08-04 23:18:01 +00:00
Iain Powrie
4b1eb8680c Merge branch 'bug/pretzel-nebulous-java' into 'dev'
Handle Missing Java From Win Registry

See merge request crafty-controller/crafty-4!413
2022-08-04 22:42:38 +00:00
Zedifus
7a81d95f57 Update changelog !413 2022-08-04 23:38:22 +01:00
amcmanu3
18a0b95d29 Fix lint issues 2022-08-04 18:34:43 -04:00
amcmanu3
6c0cd54e7e Add next run to schedule info 2022-08-04 18:15:59 -04:00
amcmanu3
719896e4b2 Fix api key delete confirm 2022-08-04 15:47:52 -04:00
Andrew
4f4798d44a Add serverjars cache refresh 2022-08-03 15:38:44 -04:00
Andrew
b4213a438b Clean up javascript. Add Translations 2022-08-03 12:26:59 -04:00
Andrew
d1bdb6198b Fix server creation with serverjars API
By accident this adds some modded support.

TODO: Cleanup javascript in wizard.
Fix naming on selects in wizard
2022-08-02 21:08:53 -04:00
Andrew
ad0d47c357 Check for server backup on restart 2022-07-30 14:47:07 -04:00
Andrew
af009a96d9 Fix bug where no java reg path found stack 2022-07-30 13:17:01 -04:00
Iain Powrie
b20e303932 Merge branch 'bug/super-user-creation' into 'dev'
Fix bug where SU status wouldn't stick on creation

See merge request crafty-controller/crafty-4!410
2022-07-27 18:17:02 +00:00
Zedifus
21f404facc Update changelog !410 2022-07-27 19:06:25 +01:00
Zedifus
fc1146b86f Merge branch 'dev' into bug/super-user-creation 2022-07-27 19:04:32 +01:00
Iain Powrie
9fa8ba4ec6 Merge branch 'lang/translations-update-4.0.6-parital-2' into 'dev'
Translation updates 2

See merge request crafty-controller/crafty-4!412
2022-07-27 17:59:11 +00:00
Zedifus
959b504c7e Update changelog !412 2022-07-27 18:54:55 +01:00
Zedifus
462fbb021e Add lang pl_PL
Thanks Terrariadlc²
2022-07-26 21:15:19 +01:00
Zedifus
f448ae3c7a Update lang es_ES
Thanks JuliGame
2022-07-26 21:14:22 +01:00
Zedifus
99ae7e01a1 Tidy import naming
This will allow for previous variable naming
2022-07-21 00:39:29 +01:00
Zedifus
e01a0d5f65 Add update available notice to crafty startup
I tried displaying just under do_intro(),
but looked visually better just before user prompt
2022-07-20 23:56:09 +01:00
Zedifus
ebe5d6815c Add helper for remote version check 2022-07-20 23:53:31 +01:00