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,990 Commits 12 Branches 45 Tags 104 MiB
81b72caf20
Commit Graph

1990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zedifus
9659963c92 Merge branch 'dev' into tweak/java-version 
Correct changelog
 2022-06-18 22:14:57 +01:00
Andrew
31097da971 Fix type issue comparing 2022-06-18 17:06:44 -04:00
Andrew
a8cd982b96 Fix warning message 2022-06-18 17:03:44 -04:00
Andrew
37765dbebc Fix general user can view any api-key page 2022-06-18 17:02:10 -04:00
Andrew
72f97e4ff0 Fix issue where any user could add/remove api keys 2022-06-18 16:55:39 -04:00
Andrew
fd0da1ef20 Fix any user can recieve all api keys 2022-06-18 16:20:57 -04:00
Andrew
e9bf2af83b Add wiki iframe as requested. 2022-06-18 15:57:37 -04:00
Andrew
4a35e09fbd Remove commander naming scheme from public 2022-06-18 15:53:47 -04: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
luukas
4c03631923
Update CHANGELOG.md 2022-06-18 03:09:00 +03: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
luukas
b4770bc9a0
Use indent=4 instead of indent=True 
`indent=True` is equivalent to `indent=1`
You can test this by executing `'foo' * True`, `'foo' * 1` and
`'foo' * 4` in a Python REPL.
 2022-06-18 01:30:50 +03:00
luukas
5bfd564ef4
Use with-blocks when opening files 2022-06-18 01:27:55 +03: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