3102 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Zedifus	c2b3c98e39	Update changelog !622	2023-09-05 00:52:24 +01:00
Zedifus	9132928846	Merge branch 'dev' into bugfix/bump-crypto-267-268	2023-09-05 00:51:11 +01:00
Iain Powrie	2d26a40cb2	Merge branch 'bugfix/bump-tornado-269' into 'dev' ... Bump tornado to resolve #269 See merge request crafty-controller/crafty-4!623	2023-09-04 23:50:07 +00:00
Zedifus	8664876c1b	Update changelog !623	2023-09-05 00:43:52 +01:00
Zedifus	90dd1c79b8	Merge branch 'dev' into bugfix/bump-tornado-269	2023-09-05 00:40:35 +01:00
Zedifus	88dada0b91	Reversion release 4.2.0	2023-09-05 00:30:11 +01:00
Zedifus	6ea46277bb	Revert changelog !616	2023-09-05 00:22:49 +01:00
Iain Powrie	cf92cd276a	Merge branch 'revert-2a19e24a' into 'dev' ... Revert "Merge branch 'refractor/remove-bleach' into 'dev'" See merge request crafty-controller/crafty-4!625	2023-09-04 23:19:09 +00:00
Iain Powrie	81d6357596	Revert "Merge branch 'refractor/remove-bleach' into 'dev'" ... This reverts merge request !616	2023-09-04 23:13:13 +00: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
Zedifus	5f088c4a1c	Bump tornado to resolve #269	2023-09-02 14:24:40 +01:00
Zedifus	d61da42fa9	Bump crypto to resolve #267 & #268	2023-09-02 14:17:44 +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