Commit Graph

407 Commits

Author SHA1 Message Date
thomashaw
ca07316ec2 Merge remote-tracking branch 'upstream/web_userspice' into web_userspice 2018-03-19 16:59:23 +00:00
thomashaw
c8e08cb438 Wordpress module versions 1.5.1 - 4.8 (current) 2018-03-19 16:56:53 +00:00
thomashaw
8cded98a9f wordpress WIP - need to finish off the wordpress_conf.sh.erb file 2018-03-15 19:39:52 +00:00
Z. Cliffe Schreuders
6cc4ef7df4 ovirt template name 2018-03-15 14:39:29 +00:00
thomashaw
e95d89dc8f wordpress WIP 2018-03-15 14:25:22 +00:00
thomashaw
917fc96074 wordpress working - need to add account configuration automation, this will require checking wp versions + changing the post request as later versions have different fields. 2018-03-14 15:58:45 +00:00
thomashaw
e4cb04a4b2 wordpress base 2 2018-03-14 12:46:51 +00:00
ts
bf56d22c15 hunner-wordpress base module 2018-03-14 12:44:33 +00:00
thomashaw
43e1baff03 mysql update 2018-03-13 15:30:18 +00:00
ts
0f1de674c5 Clipbucket WIP - need to downgrade mysql to 5.6 2018-03-13 14:13:12 +00:00
thomashaw
975c74c973 Userspice 4.3 and Debian Stretch vagrant basebox (VirtualBox only) 2018-03-10 16:41:13 +00:00
Z. Cliffe Schreuders
a49793a4cb merge dvwa into master 2018-02-19 23:48:22 +00:00
Z. Cliffe Schreuders
4219937aa3 improved error handling and cleanup 2018-02-19 23:39:23 +00:00
Z. Cliffe Schreuders
25d19b983f dvwa module 2018-02-19 23:36:17 +00:00
ts
512d6ee03d Merge fix - updating apache scenario references and requires to .*apache 2018-02-15 12:23:53 +00:00
ts
7c125425d2 Merge fix 2018-02-15 12:19:40 +00:00
ts
38797f18b6 Merge fixes 2018-02-15 11:44:30 +00:00
ts
2f501bb964 parameterised_website conflicts with itself 2018-02-15 11:25:02 +00:00
thomashaw
6045c1f187 hackerbot merge - includes lots of other changes 2018-02-08 13:14:22 +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
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
a0325f6c3d Desktop root requires "physical" access (not shell) 2018-01-25 15:21:51 +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
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
d38e9c99b5 lab update and irc backdoor fix 2017-12-09 00:26:12 +00:00
Z. Cliffe Schreuders
fbd5db86db lab update and irc backdoor fix 2017-12-09 00:11:55 +00:00
Z. Cliffe Schreuders
c3947e1666 lab update 2017-12-08 23:25:38 +00:00
Z. Cliffe Schreuders
75c9d83903 lab update 2017-12-08 22:14:19 +00:00
Z. Cliffe Schreuders
a4da5b9431 lab update 2017-12-08 22:13:55 +00:00
Z. Cliffe Schreuders
dba1460afc lab update 2017-12-08 21:50:04 +00:00
Z. Cliffe Schreuders
24bc7c8632 lab update 2017-12-08 21:04:23 +00:00