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,763 Commits 12 Branches 45 Tags 104 MiB
cb69bdabc0
Commit Graph

1763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zedifus
9659963c92 Merge branch 'dev' into tweak/java-version 
Correct changelog
 2022-06-18 22:14:57 +01:00
Zedifus
5bb17eae33 Merge branch 'master' into dev 2022-06-18 03:14:31 +01:00
Zedifus
ce6336ee68 Add CONTRIBUTING.md 2022-06-18 03:07:53 +01:00
Andrew
aac3a84ab8 Update changelog.md 2022-06-17 20:03:42 -04:00
Iain Powrie
990f038a04 Merge branch 'tweak/host-stats-exceptions' into 'dev' 
Add better error logging for statistic collection

See merge request crafty-controller/crafty-4!359
 2022-06-17 23:38:52 +00:00
Andrew
9bbf316494 Check for Oracle Java before changing start string 2022-06-17 19:11:03 -04:00
Andrew
a2ad23548c Check for Oracle Java before changing start string 2022-06-17 19:08:57 -04:00
Iain Powrie
b6104e283b Add more accepted names, 
>Per request from lukas
 2022-06-17 20:10:41 +00:00
Zedifus
ba8f8256d9 Fix changelog 2022-06-17 15:44:03 +01:00
Zedifus
8480172bdc Merge branch 'dev' into tweak/host-stats-exceptions 2022-06-17 15:42:37 +01:00
Zedifus
f73faf3e5b Reinstate changelog prior to hotfix clobber 2022-06-17 15:41:08 +01:00
Zedifus
3653f6b3b0 Merge branch 'master' into dev 2022-06-17 15:39:39 +01:00
Iain Powrie
471b1c5751 Merge branch 'dev' into 'master' 
4.0.2-hotfix1

See merge request crafty-controller/crafty-4!360
 2022-06-17 14:38:33 +00:00
Iain Powrie
e204287bc5 4.0.2-hotfix1 
Fix blank server_detail page for general users
See merge request !358
 2022-06-17 14:38:33 +00:00
Zedifus
4d0afd015d Add missing MR link from hotfix 2022-06-17 15:30:48 +01:00
Iain Powrie
4501e91a0b Merge branch 'bug/general-user-bug' into 'dev' 
Fix blank server_detail page for general users

See merge request crafty-controller/crafty-4!358
 2022-06-17 14:27:45 +00:00
Iain Powrie
56a9002a98 Clobber changelog for hotfix 2022-06-17 14:24:18 +00:00
luukas
eabaff6323
Update CHANGELOG.md to include stats error logging 2022-06-17 16:55:01 +03:00
luukas
abc34ef2b6
Add better error logging for statistic collection 2022-06-17 16:19:37 +03:00
Andrew
e435292a52 Fix blank server_detail page for general users 2022-06-17 00:58:18 -04:00
Zedifus
8a44e8eac2 Add 4.0.3 base to changelog 2022-06-17 01:24:49 +01:00
Zedifus
f4ea5b81b1 Use add content instead of echo 
Any kind of piping or echo creates a UCS-2 LE BOM,
and dotenv can't handle this.
https://gitlab.com/gitlab-org/gitlab/-/issues/212629#note_430278657

I've also added back in branch trigger so latest links still work
 2022-06-16 21:09:27 +01:00
Zedifus
cae8f2697f Move from file JOB_ID to env 
Resolves BOM issue hopefully
 2022-06-16 20:37:50 +01:00
Zedifus
021a4ad002 Fix artifact url to not be static 
And also remove example artifacts, I'm a silly
 2022-06-16 20:11:54 +01:00
Zedifus
3104b3ce39 Fix artifact link url construction 
This may resolve it...
 2022-06-16 19:33:59 +01:00
Iain Powrie
2bbcf65278 Merge branch 'dev' into 'master' 
4.0.2 Patches

See merge request crafty-controller/crafty-4!357
 2022-06-16 17:55:06 +00:00
Zedifus
e47cad13f9 Bump version 2022-06-16 18:45:07 +01:00
Zedifus
9eb560845c Silence lint on release pipe, add (---) 2022-06-16 18:43:06 +01:00
Zedifus
fe351ed0fe Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-16 18:34:11 +01:00
Zedifus
91de96194c Add release pipes & CHANGELOG.md 
Also add checkbox for changelog updates in MR
 2022-06-16 18:33:57 +01:00
Iain Powrie
43906d531e Merge branch 'bug/support_logs' into 'dev' 
Bug/support logs

See merge request crafty-controller/crafty-4!354
 2022-06-16 16:56:56 +00:00
Iain Powrie
93e8d8a51d Merge branch 'bug/usernames-can-be-capital' into 'dev' 
Fix username case

See merge request crafty-controller/crafty-4!351
 2022-06-16 16:52:03 +00:00
Andrew
8160eb1392 Merge branch '22-docker-versioning-does-not-inherit-changes-to-image-template' into 'dev' 
Add version inheretence & config check

See merge request crafty-controller/crafty-4!353
 2022-06-16 16:30:55 +00:00
amcmanu3
e3d289e6fd Fix support logs download issues 2022-06-16 12:11:21 -04:00
Zedifus
c0006e47f4 Add version inheretence & config check 
Also add pretty colours

Also config check will always return true but meh 🤷‍♂️
If api key location changes it will be accurate
 2022-06-16 16:45:08 +01:00
amcmanu3
35518e960f Fix username capital issues once and for all 2022-06-16 09:52:21 -04:00
Andrew
fff186e547 Merge branch 'bugfix/reconnecting-websocket' into 'dev' 
Make the WebSocket automatically reconnect.

See merge request crafty-controller/crafty-4!345
 2022-06-16 13:39:25 +00:00
Iain Powrie
a4c324669d Merge branch 'fix/pylint-relative-paths' into 'dev' 
Remove unused server_uuid variables to fix Pylint

See merge request crafty-controller/crafty-4!350
 2022-06-16 13:19:26 +00:00
luukas
581b6734d3
Remove unused server_uuid variables to fix Pylint 2022-06-16 15:31:11 +03:00
Iain Powrie
828af04e1f Merge branch 'master' into 'dev' 
Merging Master into Dev

See merge request crafty-controller/crafty-4!349
 2022-06-16 00:10:03 +00:00
Craft Breadth
fb73f0a200 Merge branch 'feature/relative-paths-logs-jar' into 'master' 
Use relative paths for the jarfile and logs

See merge request crafty-controller/crafty-4!347
 2022-06-16 00:00:51 +00:00
luukas
f39e75616c
Use an exponential backoff algorhithm. 
https://stackoverflow.com/a/37038217/15388424
 2022-06-16 02:37:53 +03:00
Iain Powrie
c22d07d832 Merge branch 'bugfix/getelementbyid-first-dashboard' into 'dev' 
Fix an error when there are no servers

See merge request crafty-controller/crafty-4!346
 2022-06-15 23:30:12 +00:00
Iain Powrie
2ed9e5663d Merge branch 'feature/filemanager-improvements' into 'dev' 
Fix Ace editor saving keybinds and ex-commands

See merge request crafty-controller/crafty-4!341
 2022-06-15 23:24:06 +00:00
luukas
e009ff9819
Use relative paths for the jarfile and logs 2022-06-16 02:10:26 +03:00
luukas
d9c03caa9b
Fix an error when there are no servers 2022-06-16 00:19:48 +03:00
luukas
cd8ebfdcbe
Make the WebSocket automatically reconnect. 
The WebSocket reconnects 5 seconds after the connection's closure.
If the connection reconnection fails it will try to reconnect after
another 5 seconds.
 2022-06-16 00:10:48 +03:00
Iain Powrie
025db1de77 Merge branch 'dev' into 'master' 
Fix winreg import pass on non-NT systems

See merge request crafty-controller/crafty-4!344
 2022-06-15 04:48:38 +00:00
amcmanu3
8611c7e5e4 Fix win reg import on not windows. 
Replace WindowsError with OSError
 2022-06-15 00:42:29 -04:00