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,922 Commits 12 Branches 45 Tags 104 MiB
43a93f35b3
Commit Graph

1922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
e2d5e7cb69 Update changelog !376 2022-06-21 06:26:08 +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
Iain Powrie
44e5d27d88 Bump Version 2022-06-21 04:06:08 +00:00
Iain Powrie
5c1a9c5626 Add branch trigger back 
For windows updater to remain up-to-date with master
 2022-06-21 04:03:05 +00:00
Iain Powrie
b5331501ec Merge branch 'feature/java-selection' into 'dev' 
Java path dropdown select

See merge request crafty-controller/crafty-4!375
 2022-06-21 03:39:30 +00:00
Zedifus
481572be1e Add 4.0.4 date 2022-06-21 04:33:27 +01:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
Iain Powrie
0bf74288ea Merge branch 'bug/ping-data' into 'dev' 
Check if ping result is boolean

See merge request crafty-controller/crafty-4!371
 2022-06-21 03:22:49 +00:00
Zedifus
8518cbbcd9 Update CHANGELOG.md !371 2022-06-21 04:18:24 +01:00
Zedifus
4bfbf9ea47 Merge branch 'dev' into bug/ping-data 2022-06-21 04:09:35 +01:00
Iain Powrie
96e4a07958 Merge branch 'feature/backup-shutdown' into 'dev' 
Add backup shutdown feature

See merge request crafty-controller/crafty-4!373
 2022-06-21 02:58:35 +00:00
Zedifus
a4ead62ea3 Add missing change !373 2022-06-21 03:54:42 +01:00
Zedifus
0ada8e40a9 Update CHANGELOG.md !373 2022-06-21 03:50:41 +01:00
Zedifus
69d1aa6c87 Appease linter 2022-06-21 03:31:40 +01:00
Zedifus
093058d01c Merge branch 'feature/java-selection' of gitlab.com:crafty-controller/crafty-4 into feature/java-selection 2022-06-21 03:16:46 +01:00
Zedifus
85f508dbc2 Remove debug log 2022-06-21 03:16:41 +01:00
amcmanu3
569d21f295 Fix java override for general user 2022-06-20 20:50:34 -04:00
amcmanu3
41532f97ef Change translation from None to javaNoChange 2022-06-20 18:53:19 -04:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01:00
amcmanu3
32b3551108 Add java selection code to panel handler 2022-06-20 17:56:26 -04:00
Silversthorn
eb37faac08 Better Mobile Display for Dashboard 2022-06-20 23:41:52 +02:00
amcmanu3
77c9d2613d Appease black 2022-06-20 17:33:36 -04:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
Silversthorn
2d3377b497 Fixing Resizing of the table 2022-06-20 22:39:03 +02:00
Iain Powrie
3c5c16a5e7 Merge branch 'critical/api_secret_fix' into 'dev' 
Backup/Config.json rework for API key hardening

See merge request crafty-controller/crafty-4!369
 2022-06-20 19:26:21 +00:00
Andrew
7d286e60e0 Backup/Config.json rework for API key hardening 
See merge request crafty-controller/crafty-4!369
 2022-06-20 19:26:21 +00:00
Silversthorn
ce21ed6171 Fixing Mobile Display on Server Wizard 2022-06-20 19:24:09 +02:00
Zedifus
e820ba058a Add prototype helper (linux only) 2022-06-20 18:05:39 +01:00
Zedifus
fd162a0d24 Update CHANGELOG.md TBD 
Also add readability improvements
and lang tweak
 2022-06-20 16:19:51 +01:00
Iain Powrie
bc73f6b5f3 Merge branch 'tweak/german-language-spelling' into 'dev' 
Updated spelling of "default" and "defaultPort" in german translation - related to #31

See merge request crafty-controller/crafty-4!370
 2022-06-20 12:45:11 +00:00
amcmanu3
ccfbad91d1 Check if ping result is boolean 2022-06-19 23:07:48 -04:00
Matze
ae4def47a4 Updated spelling of "default" and "defaultPort" in german translation 2022-06-19 19:43:52 +02:00
Iain Powrie
8514d13320 Merge branch 'dev' into 'master' 
4.0.3

See merge request crafty-controller/crafty-4!368
 2022-06-18 22:30:42 +00:00
Iain Powrie
6532828a2a Merge branch 'tweak/front-end' into 'dev' 
Integrate Wiki iframe into panel instead of link

See merge request crafty-controller/crafty-4!367
 2022-06-18 22:22:48 +00:00
Andrew
4f5b52bbdf remove sticky from main menu 2022-06-18 18:19:32 -04:00
Zedifus
b9a9007b4f Merge branch 'dev' into tweak/front-end 2022-06-18 23:12:24 +01:00
Andrew
b9ad296367 Merge branch 'critical/API-token-auth-issues' into 'dev' 
API Token authentication hardening

See merge request crafty-controller/crafty-4!366
 2022-06-18 22:07:22 +00:00
Zedifus
27cba00e16 Bump CHANGELOG.md 2022-06-18 23:03:23 +01:00
Zedifus
376a6b3a1e Merge branch 'dev' into critical/API-token-auth-issues 2022-06-18 23:01:39 +01:00
Zedifus
51b8165c0e Rename crafty_commander to crafty 
Also make win master only run on release:
https://gitlab.com/crafty-controller/crafty-4/-/releases
 2022-06-18 22:57:12 +01:00
Zedifus
53c622e928 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-18 22:52:07 +01:00
Zedifus
c8d88e1b50 Bump version & Update latest link 2022-06-18 22:52:02 +01:00
Andrew
b375cfa283 Update CHANGELOG.md 2022-06-18 21:51:42 +00:00
Andrew
8a57104456 Update changelog 2022-06-18 17:49:35 -04:00
Andrew
9569e760c9 Fix api key permission logic issue 2022-06-18 17:40:50 -04:00
xithical
464428ea7e Remove erroneous print statements 2022-06-18 16:29:36 -05:00
xithical
8b6d70ba9a Fix bug where non-superusers could not edit their own API keys 2022-06-18 16:27:06 -05:00
Iain Powrie
1de2ea1b5c Merge branch 'bug/-1-stats-showing-on-dashboard' into 'dev' 
Fix -1 showing on dashboard when offline

See merge request crafty-controller/crafty-4!365
 2022-06-18 21:27:05 +00:00
Iain Powrie
cb69bdabc0 Merge branch 'tweak/java-version' into 'dev' 
Tweak/java version

See merge request crafty-controller/crafty-4!364
 2022-06-18 21:19:24 +00:00
Andrew
478dfdc6ef Fix -1 showing on dashboard when offline 2022-06-18 17:18:21 -04:00