141 Commits

Author	SHA1	Message	Date
Z. Cliffe Schreuders	e5767caad6	fix conflict based on name	2019-02-01 20:20:43 +00:00
ts	723813fb11	wordpress_2x on stretch + wheezy both http and https, apache now autoredirects to https if it's enabled	2019-01-22 10:38:31 +00:00
ts	439d66d087	fixed negative regex match so we no longer need a conflict in parameterised_website for webapps (necessary for basic_narrative.xml)	2019-01-21 11:52:39 +00:00
ts	8c5b5f8670	Updated names for consistency	2019-01-18 16:31:34 +00:00
ts	1c8162959c	parameterised_website: conflict with webapps	2019-01-18 16:06:37 +00:00
ts	bc39277610	Old unrealirc versions won't build on Stretch so adding conflict	2019-01-18 14:50:35 +00:00
ts	275681109e	services/parameterised_website: main_page_paragraph_content fix, navbar and contact page fixes	2019-01-14 18:06:03 +00:00
ts	9a8f19ea47	Merge fix: renamed files to remove merge branch name	2019-01-11 13:07:08 +00:00
ts	5bce99b86c	Merge branch 'ctf_challenges_merge' into january_19_merge ... # Conflicts: # lib/helpers/constants.rb # modules/utilities/unix/languages/java_wheezy_compatible/java/spec/spec_helper.rb~upstream_stretch_kde_update	2019-01-11 13:02:39 +00:00
ts	1302237027	Merge remote-tracking branch 'upstream/stretch_kde_update' into january_19_merge	2019-01-11 12:01:38 +00:00
ts	f7d3fabba9	Testing script, stretch fixes + code review	2018-11-16 10:27:10 +00:00
ts	c5db8da1c9	Adding samba conflicts	2018-10-19 13:46:50 +01:00
ts	fdeb28e246	Stretch update merge: mysql & php for stretch, module conflicts and general cleanup	2018-10-19 13:46:50 +01:00
ts	f0bb2a26e1	Testing script, stretch fixes + code review	2018-10-19 13:46:49 +01:00
ts	be1be16c4f	Adding samba conflicts	2018-10-09 12:43:21 +01:00
ts	634efdcc83	Stretch update merge: mysql & php for stretch, module conflicts and general cleanup	2018-10-09 09:09:12 +01:00
ts	ff75b56c6b	Testing script, stretch fixes + code review	2018-10-05 17:27:12 +01:00
Z. Cliffe Schreuders	ac1936cbee	updates to metadata	2018-10-05 17:27:05 +01:00
ts	5ab97f59cc	Fix for duplicate received_inputs from module outputs on conflict resolution	2018-10-05 17:27:05 +01:00
ts	7c85582867	Temp fix: updated tomcat httpd to servlet to avoid conflicts.	2018-10-05 17:27:05 +01:00
ts	0565b0e82c	more stable tomcat url#	2018-10-05 17:27:05 +01:00
ts	9d66ea9215	Squashed WNS + IRI DL work	2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders	2dc5c6d743	updates to metadata	2018-09-26 14:41:19 +01:00
ts	e7adc14b02	Fix for duplicate received_inputs from module outputs on conflict resolution	2018-09-26 12:35:27 +01:00
ts	950d0d4237	Temp fix: updated tomcat httpd to servlet to avoid conflicts.	2018-09-26 09:52:49 +01:00
ts	0ca88194b1	more stable tomcat url#	2018-09-21 16:50:29 +01:00
ts	5208ae5cc7	Squashed WNS + IRI DL work	2018-09-21 12:34:26 +01:00
thomashaw	3435c4a256	Bugfix: proftpd.erb template referred to local variable $secgen_parameters instead of @secgen_parameters (declared and parsed in configure.pp file)	2018-06-22 12:37:48 +01:00
ts	512d6ee03d	Merge fix - updating apache scenario references and requires to .*apache	2018-02-15 12:23:53 +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	89263d28a7	Merge branch 'upstream/master'	2018-02-05 12:59:05 +00:00
thomashaw	5ddc9b541f	tomcat server	2018-01-11 18:52:06 +00:00
Z. Cliffe Schreuders	94724a3434	lab update	2017-12-20 16:05:14 +00:00
thomashaw	be454cc8bd	ssh_leaked_keys, no longer requires user_rw. param website doesn't drop a flag by default, additions to .gitignore	2017-11-17 16:45:40 +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	f32d90fbf1	lab update	2017-11-09 00:26:40 +00:00