Commit Graph

2069 Commits

Author SHA1 Message Date
Andrew
3f4e9ac0c2 Merge branch 'dev' into enhancement/mobile-app 2022-08-07 12:59:14 -04:00
Zedifus
bb2621c723 Prepare 4.0.10 release base 2022-08-06 02:05:49 +01:00
Zedifus
0b5b0d2092 Update changelog bugfix-offline-credits 2022-08-06 01:49:43 +01:00
Zedifus
247678e6c6 Correct offline credits for kofi schema update 2022-08-06 01:47:25 +01:00
Iain Powrie
7db9e9698d Merge branch 'bug/unloaded-servers' into 'dev'
Change How Missing Servers are handled

See merge request crafty-controller/crafty-4!420
2022-08-06 00:29:21 +00:00
amcmanu3
8897856aef Remove Update button when unloaded
Fix duplicate list issue
2022-08-05 20:24:42 -04:00
Zedifus
0642c61314 Update changelog !420 2022-08-06 01:13:26 +01:00
Zedifus
c5d049830e Merge branch 'dev' into bug/unloaded-servers 2022-08-06 01:10:16 +01:00
amcmanu3
5cbb8f7018 Fix broken unloaded servers 2022-08-05 20:04:34 -04:00
Iain Powrie
6510046c2c Merge branch 'enhancement/pretzel-schedules' into 'dev'
Add Translations to Schedules. Use Names in Schedules. Fix Schedules Traceback Bug

See merge request crafty-controller/crafty-4!419
2022-08-05 23:35:38 +00:00
Zedifus
3cd190e15c Update changelog !419
Also add untracked changes (direct commits to dev)
2022-08-06 00:30:57 +01:00
Zedifus
3e3c0ff946 Merge branch 'dev' into enhancement/pretzel-schedules 2022-08-06 00:20:31 +01:00
Iain Powrie
d757451445 Merge branch 'tweak/credits-v2' into 'dev'
credits-v2| Translator status

See merge request crafty-controller/crafty-4!421
2022-08-05 23:08:36 +00:00
Zedifus
98d6dd6617 Update changelog !421 2022-08-06 00:05:01 +01:00
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
b039eec857 First commit for unloaded server. Working Frontend 2022-08-05 17:56:44 -04:00
amcmanu3
3c8614f378 Fix traceback when editing schedule 2022-08-05 16:01:26 -04:00
amcmanu3
75c8cdef53 Add names to schedules 2022-08-05 13:52:50 -04:00
amcmanu3
e0377d4b2f Add translations to schedules page 2022-08-05 11:56:41 -04: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
amcmanu3
3974b7e8c7 poorly attempt to add "add to home" feature 2022-08-04 19:45:44 -04: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