Commit Graph

723 Commits

Author SHA1 Message Date
thomashaw
dde559d158 wip 2018-02-08 01:00:16 +00:00
thomashaw
b101bd56d3 wip 2018-02-08 00:50:45 +00:00
thomashaw
2251aaa709 wip 2018-02-08 00:10:58 +00:00
thomashaw
55e694efc3 wip 2018-02-08 00:03:13 +00:00
thomashaw
abfc8bba24 wip 2018-02-07 23:56:41 +00:00
thomashaw
ed141950ff wip 2018-02-07 23:40:34 +00:00
thomashaw
d052c1cd25 wip 2018-02-07 23:30:13 +00:00
thomashaw
ab00a44d16 wip 2018-02-07 23:09:36 +00:00
thomashaw
80cac647de Revert me before merge: wip 2018-02-07 23:02:38 +00:00
thomashaw
a6ed578b2c Wip 2018-02-07 22:19:47 +00:00
thomashaw
52030fb424 wip 2018-02-07 22:05:31 +00:00
ts
282c68d207 vm and scenario name change 2018-02-07 18:34:45 +00:00
ts
01eb9c8941 vm name change 2018-02-07 18:33:16 +00:00
ts
1dce75be57 wip changes to tmp_team_project 2018-02-07 18:07:50 +00: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
df2636a9f3 minor ui changes 2018-02-07 15:43:58 +00:00
ts
eb1c678149 minor ui changes 2018-02-07 15:39:08 +00:00
ts
c09c4c3a92 Changing layout for contacts + adding tmp_team_project_scenario.xml with single nic 2018-02-07 15:21:35 +00:00
ts
5cebfb4a7e WiP: nicer themes, changed leeds beckett businesses to look better 2018-02-07 14:49: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
7ea8c67925 website improvements wip 2018-02-06 21:35:13 +00:00
ts
db3a469731 pizza.json 2018-02-06 17:01:45 +00:00
ts
41a4cffd1e prepared business json files 2018-02-06 16:49:48 +00:00
ts
22bab8d8bf Clean organisation.json 2018-02-06 14:12:44 +00:00
thomashaw
948a494f32 website: wip 2018-02-06 11:09:55 +00:00
thomashaw
2391bab6d3 WiP 2018-02-05 17:24:56 +00:00
thomashaw
3434518086 selector 2018-02-05 16:04:24 +00:00
thomashaw
95bcdfe865 organisations: added intro_paragraph parameter 2018-02-05 15:19:15 +00:00
thomashaw
23af572707 random line selector and example organisations 2018-02-05 15:18:38 +00:00
thomashaw
89263d28a7 Merge branch 'upstream/master' 2018-02-05 12:59:05 +00:00
Cliffe
c17a26406b Physical access in schema 2018-01-25 15:30:28 +00:00
Cliffe
553ac3ac8c Rename VM 2018-01-25 15:24:15 +00:00
Cliffe
a0325f6c3d Desktop root requires "physical" access (not shell) 2018-01-25 15:21:51 +00:00
Cliffe
60767030b9 Date bump 2018-01-23 19:09:59 +00:00
thomashaw
5ddc9b541f tomcat server 2018-01-11 18:52:06 +00:00
Z. Cliffe Schreuders
52a1bb2620 lab update 2018-01-04 13:58:24 +00:00
Z. Cliffe Schreuders
b921a4dff9 always exclude previously selected IP address ranges 2018-01-04 12:47:59 +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
7f9ca77ef3 ovirt libs edit 2018-01-03 11:34:14 +00:00
Z. Cliffe Schreuders
58ad4bd3af save outputs from SecGen even when SecGen fails to complete 2018-01-03 11:30:09 +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
1ddc854f00 lab update 2017-12-20 16:27:26 +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
5fb61a8577 lab update 2017-12-09 01:07:01 +00:00
Z. Cliffe Schreuders
d38e9c99b5 lab update and irc backdoor fix 2017-12-09 00:26:12 +00:00