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
3,092 Commits 12 Branches 45 Tags 104 MiB
eb6d9560f8
Commit Graph

3092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silversthorn
eb6d9560f8 Implementations of Prometheus Client 2023-09-03 16:04:28 +02:00
Iain Powrie
57dc58099b
Merge branch 'tweak/console-get-user' into 'dev' 
Add get users to crafty command

See merge request crafty-controller/crafty-4!620
 2023-09-02 15:03:28 +00:00
Zedifus
1fd0ac7581 Update changelog !620 2023-09-02 15:57:09 +01:00
Zedifus
7cad738259 Merge branch 'dev' into tweak/console-get-user 2023-09-02 15:55:48 +01:00
Zedifus
36afb3b797 Update changelog !616 2023-09-02 15:17:09 +01:00
Iain Powrie
2a19e24a82
Merge branch 'refractor/remove-bleach' into 'dev' 
Refractor/Replace bleach with nh3

See merge request crafty-controller/crafty-4!616
 2023-09-02 14:06:26 +00:00
Iain Powrie
242ba7899b
Merge branch 'bugfix/server-stats' into 'dev' 
Check for string response on server ping

See merge request crafty-controller/crafty-4!614
 2023-09-02 13:44:44 +00:00
Zedifus
ce6e8ea538 Update changelog !614 2023-09-02 14:38:22 +01:00
Zedifus
8569fb6f20 Merge branch 'dev' into bugfix/server-stats 2023-09-02 14:36:36 +01:00
Iain Powrie
99a635658d
Merge branch 'enhancement/better-InApp-doc-display' into 'dev' 
Better Display for InApp Documentation

See merge request crafty-controller/crafty-4!613
 2023-09-02 13:11:36 +00:00
Zedifus
b2cab357be Update changelog !613 2023-09-02 14:05:00 +01:00
Zedifus
4c7f95675b Merge branch 'dev' into enhancement/better-InApp-doc-display 2023-09-02 14:03:25 +01:00
Iain Powrie
0eab07db62
Merge branch 'bugfix/public-status-servers' into 'dev' 
Add check for authorized servers on mobile.

See merge request crafty-controller/crafty-4!612
 2023-09-02 13:02:09 +00:00
Zedifus
1786562a19 Update changelog !612 2023-09-02 13:48:23 +01:00
Zedifus
8f5cb62c25 Merge branch 'dev' into bugfix/public-status-servers 2023-09-02 13:47:34 +01:00
Iain Powrie
3fd3afb9c4
Merge branch 'bug-fix/service-worker' into 'dev' 
Bug fix/service worker

See merge request crafty-controller/crafty-4!607
 2023-09-02 12:43:28 +00:00
Zedifus
eec70dd894 Update changelog !607 2023-09-02 13:32:28 +01:00
Zedifus
e0b425c659 Merge branch 'dev' into bug-fix/service-worker 2023-09-02 13:28:57 +01:00
Wout Bouckaert
f50efcd6f4
Merge branch 'dev' into refractor/remove-bleach 2023-09-01 20:39:41 -06:00
Wout Bouckaert
1e159d5f0d
Merge remote-tracking branch 'upstream/dev' into dev 2023-09-01 20:38:23 -06:00
Andrew
7eb8e2bfd9 Add get users to crafty command 2023-08-24 13:02:44 -04:00
Wout Bouckaert
ad9042e88f
Replace bleach with nh3. 2023-08-12 21:53:26 -06:00
Andrew
2c4b90964d Check for string response on server ping 2023-08-02 19:20:26 -04:00
Silversthorn
dd8b8b5cb9 Better Display for InApp Documentation 2023-08-02 19:26:39 +02:00
Andrew
fe2f86ac84 Add check for authorized servers on mobile. 2023-08-01 12:20:01 -04:00
bobsfriend12
d60a0cf908 decrease code density 2023-07-29 16:16:09 -05:00
bobsfriend12
e76ba70d88 get rid of cache 2023-07-29 16:05:27 -05:00
bobsfriend12
86960b7c9f fix lint issues 2023-07-29 16:01:29 -05:00
Zedifus
834f6f3c3b Prepare 4.1.3 release base 2023-07-18 23:12:54 +01:00
Iain Powrie
6421d4f2d5 Merge branch 'dev' into 'master' 
v4.1.3

See merge request crafty-controller/crafty-4!610
 2023-07-18 22:09:40 +00:00
Zedifus
2c42970155 Merge branch 'master' into dev 2023-07-18 22:52:49 +01:00
Zedifus
e3ad0de7bc Close changelog 4.1.3 2023-07-18 22:33:24 +01:00
Iain Powrie
c2d0461ba5 Merge branch 'bugfix/creation-formatting' into 'dev' 
Fix format on serverjars warning

See merge request crafty-controller/crafty-4!601
 2023-07-18 21:21:20 +00:00
Zedifus
fe03b3a9a8 Update changelog !601 2023-07-18 22:14:41 +01:00
Zedifus
d5acbdddb9 Merge branch 'dev' into bugfix/creation-formatting 2023-07-18 21:59:25 +01:00
Zedifus
bfe4291584 Tweak sonar conditional 
Jobs were still fireing
 2023-07-18 21:54:45 +01:00
Zedifus
1beb86bc8f Merge branch 'dev' into bugfix/creation-formatting 2023-07-18 21:43:54 +01:00
Iain Powrie
d3f9314139 Merge branch 'refactor/in-file' into 'dev' 
Replace "in_file" helper method

See merge request crafty-controller/crafty-4!605
 2023-07-18 20:31:59 +00:00
Zedifus
18d9ffa6b3 Make sonar conditional on token 
This will stop forked repo tests failing
 2023-07-18 21:21:36 +01:00
Zedifus
8c5dea587f Update changelog !605 2023-07-18 21:09:12 +01:00
Zedifus
aa0824630a Merge branch 'dev' into refactor/in-file 2023-07-18 21:07:11 +01:00
Iain Powrie
be37f8f49e Merge branch 'bugfix/schedule-enable' into 'dev' 
Fix enabling/disabling schedules from schedule list

See merge request crafty-controller/crafty-4!606
 2023-07-18 20:02:02 +00:00
Zedifus
748db1866a Update changelog !606 2023-07-18 20:57:30 +01:00
Zedifus
a254a20082 Merge branch 'dev' into bugfix/schedule-enable 2023-07-18 20:55:22 +01:00
Iain Powrie
390188fa56 Merge branch 'tweak/status-link' into 'dev' 
Add public status link to login

See merge request crafty-controller/crafty-4!608
 2023-07-18 19:52:02 +00:00
Zedifus
dcfc3f00fe Update changelog !608 2023-07-18 20:42:13 +01:00
Zedifus
8e9eec36b8 Merge branch 'dev' into tweak/status-link 2023-07-18 20:41:39 +01:00
Iain Powrie
5016dbd45f Merge branch 'bugfix/bump-pyyaml-6.0.1' into 'dev' 
Bump PyYAML to 6.0.1

See merge request crafty-controller/crafty-4!609
 2023-07-18 19:22:15 +00:00
Iain Powrie
1fb4edd463 Update changelog !609 2023-07-18 19:19:34 +00:00
Wout Bouckaert
ad28f84188
Bump PyYAML to 6.0.1 2023-07-17 19:01:26 -06:00