132 Commits

Author	SHA1	Message	Date
ts	ff75b56c6b	Testing script, stretch fixes + code review	2018-10-05 17:27:12 +01:00
Z. Cliffe Schreuders	dc07fd581b	lab updates	2018-10-05 17:27:11 +01:00
Z. Cliffe Schreuders	2ac3263e10	lab updates	2018-10-05 17:27:11 +01:00
Z. Cliffe Schreuders	ca049dc348	lab updates	2018-10-05 17:27:11 +01:00
Z. Cliffe Schreuders	45a20fef1a	lab updates	2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders	c8d138919b	lab updates	2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders	d7e6d87644	Lab updates	2018-10-05 17:27:05 +01:00
ts	9d66ea9215	Squashed WNS + IRI DL work	2018-10-05 17:27:05 +01:00
ts	a003b81f69	wip changes	2018-02-07 17:59:24 +00:00
ts	5eda7c5d34	Merge branch 'team_project' into team_project_merge ... # Conflicts: # .gitignore # modules/services/unix/http/parameterised_website/secgen_metadata.xml	2018-02-07 15:47:48 +00:00
ts	6d0f7097dd	WiP: Random themes	2018-02-07 14:25:14 +00:00
thomashaw	30193eb7c4	wip	2018-02-06 23:37:54 +00:00
thomashaw	2391bab6d3	WiP	2018-02-05 17:24:56 +00:00
thomashaw	95bcdfe865	organisations: added intro_paragraph parameter	2018-02-05 15:19:15 +00:00
Z. Cliffe Schreuders	52a1bb2620	lab update	2018-01-04 13:58:24 +00:00
Z. Cliffe Schreuders	e97bfa7553	lab update	2018-01-04 12:43:56 +00:00
Z. Cliffe Schreuders	647ebb8dd9	lab update	2018-01-03 16:10:29 +00:00
Z. Cliffe Schreuders	470c30658f	lab update	2017-12-20 16:31:39 +00:00
Z. Cliffe Schreuders	e385829e38	lab update	2017-12-20 16:28:45 +00:00
Z. Cliffe Schreuders	94724a3434	lab update	2017-12-20 16:05:14 +00:00
Z. Cliffe Schreuders	1484b038f3	lab update	2017-12-20 16:00:37 +00:00
Z. Cliffe Schreuders	b13903df21	lab update	2017-12-08 14:11:27 +00:00
Z. Cliffe Schreuders	cecf892d69	lab update	2017-12-08 13:58:59 +00:00
Z. Cliffe Schreuders	f1590bc6c0	lab update	2017-12-08 01:04:18 +00:00
Z. Cliffe Schreuders	dd86b56b8e	lab update	2017-12-07 16:31:34 +00:00
Z. Cliffe Schreuders	2930d85917	lab update	2017-12-06 23:54:04 +00:00
Z. Cliffe Schreuders	7329bd0a92	lab update	2017-12-03 02:19:50 +00:00
Z. Cliffe Schreuders	04fcbed7a5	lab update	2017-12-01 15:54:44 +00:00
Z. Cliffe Schreuders	3d46505609	lab update	2017-11-24 18:46:31 +00:00
Z. Cliffe Schreuders	9a32d6a5e4	lab update	2017-11-24 18:10:32 +00:00
Z. Cliffe Schreuders	6cecb6b199	lab update	2017-11-24 18:04:29 +00:00
thomashaw	d2898f9b79	Merge remote-tracking branch 'upstream/live_lab' into week_7_merge_branch ... # Conflicts: # modules/utilities/unix/hackerbot/files/opt_hackerbot/hackerbot.rb	2017-11-17 16:49:42 +00:00
Z. Cliffe Schreuders	17c5088b85	networking	2017-11-17 16:10:28 +00:00
Z. Cliffe Schreuders	3aa5338f53	lab requiring honeynet VM	2017-11-17 15:56:57 +00:00
thomashaw	86ec04fc3d	Merge remote-tracking branch 'upstream/ids_rules_lab' into week_6_merge_branch	2017-11-10 10:57:24 +00:00
Z. Cliffe Schreuders	4a5e9fe355	lab updates	2017-11-10 09:26:33 +00:00
Z. Cliffe Schreuders	c4d5561d86	lab updates	2017-11-10 01:15:57 +00:00
Z. Cliffe Schreuders	a560335744	lab update	2017-11-09 16:09:35 +00:00
Z. Cliffe Schreuders	34be6e051f	lab update	2017-11-09 10:06:02 +00:00
Z. Cliffe Schreuders	f32d90fbf1	lab update	2017-11-09 00:26:40 +00:00
Z. Cliffe Schreuders	bcfedfe61f	Hackerbot and lab updates	2017-11-08 17:25:01 +00:00
Z. Cliffe Schreuders	91e2bc6f9e	lab updates	2017-11-07 17:31:15 +00:00
Z. Cliffe Schreuders	e5100ae72c	lab update	2017-11-05 22:43:47 +00:00
thomashaw	34d5c9712d	Merge remote-tracking branch 'upstream/HvHB1' into week_4_merge_branch ... # Conflicts: # scenarios/labs/hacker_vs_hackerbot_1.xml	2017-11-03 13:20:17 +00:00
thomashaw	cc3119455f	Merge remote-tracking branch 'upstream/ids_rules_lab' into week_4_merge_branch	2017-11-03 13:07:57 +00:00
Z. Cliffe Schreuders	5022f34658	lab update	2017-11-03 00:15:58 +00:00
Z. Cliffe Schreuders	f9c0764397	HvHB1 updates	2017-11-02 17:34:55 +00:00
secgen server	16c99260ee	tests	2017-11-02 16:42:48 +00:00
thomashaw	f79dd16362	Merge remote-tracking branch 'upstream/HvHB1' into week_4_merge_branch	2017-11-01 10:28:05 +00:00
Z. Cliffe Schreuders	8817a3165b	lab updates	2017-10-30 22:31:00 +00:00