aa07d14755 
					 
					
						
						
							
							Merge branch 'next' of  https://github.com/WebGoat/WebGoat  into next  
						
						
						
						
					 
					
						2014-09-12 12:10:33 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						39bf431ca2 
					 
					
						
						
							
							WEB-22 Added Spider Web Logo  
						
						
						
						
					 
					
						2014-09-12 12:07:52 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d7ed16296c 
					 
					
						
						
							
							WEB-25 updated text for about page.  
						
						
						
						
					 
					
						2014-09-12 10:32:40 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1e0460c6f2 
					 
					
						
						
							
							WEB-25 about content  
						
						
						
						
					 
					
						2014-09-12 09:52:30 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1e5e9c0b8b 
					 
					
						
						
							
							WEB-25 - Content for About Page  
						
						... 
						
						
						
						WEB-24 - Unauthenticated access should redirect to login page 
						
						
					 
					
						2014-09-12 08:18:25 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d72d1f0262 
					 
					
						
						
							
							Merge branch 'next' of  https://github.com/WebGoat/WebGoat  into next  
						
						
						
						
					 
					
						2014-09-12 21:13:07 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c9e6d1f7a7 
					 
					
						
						
							
							WEB-48 Updated useful tools  
						
						
						
						
					 
					
						2014-09-11 18:49:53 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7e50264d4e 
					 
					
						
						
							
							Updated logo bg, added modal for about icon  
						
						
						
						
					 
					
						2014-09-11 13:38:07 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						809ef80e18 
					 
					
						
						
							
							autowire servlet context instead of getting from request  
						
						
						
						
					 
					
						2014-09-11 09:27:25 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fc8d4d495a 
					 
					
						
						
							
							move hints up  
						
						
						
						
					 
					
						2014-09-11 08:05:35 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						706a574d5f 
					 
					
						
						
							
							style login and logout pages to match new look  
						
						
						
						
					 
					
						2014-09-11 07:54:53 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5241af57cc 
					 
					
						
						
							
							Fix mailto link on top right  
						
						
						
						
					 
					
						2014-09-11 07:23:02 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						96ec99e65a 
					 
					
						
						
							
							show user and role in logout menu  
						
						
						
						
					 
					
						2014-09-11 07:16:41 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b04622ff86 
					 
					
						
						
							
							add tooltips to nav buttons on right  
						
						
						
						
					 
					
						2014-09-11 06:59:04 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						35559d657b 
					 
					
						
						
							
							WEB-66 updated headers  
						
						
						
						
					 
					
						2014-09-10 18:15:03 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1cfbe2b843 
					 
					
						
						
							
							Merge branch 'next' of  https://github.com/WebGoat/WebGoat  into next  
						
						... 
						
						
						
						Conflicts:
	.gitignore 
						
						
					 
					
						2014-09-10 21:25:45 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						624e8a40e3 
					 
					
						
						
							
							modified for working around files created during merge  
						
						
						
						
					 
					
						2014-09-10 21:23:09 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8eac6ef898 
					 
					
						
						
							
							fixed WEB-53  
						
						
						
						
					 
					
						2014-09-10 08:46:45 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5c8e545185 
					 
					
						
						
							
							fixed WEB-27  
						
						
						
						
					 
					
						2014-09-10 07:52:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e9b7de4bab 
					 
					
						
						
							
							Merge pull request  #6  from WebGoat/WEB-54  
						
						... 
						
						
						
						Moved images files etc from lesson_solutions_1 to lesson_solutions 
						
						
					 
					
						2014-09-09 16:34:50 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						182705448c 
					 
					
						
						
							
							Merge pull request  #7  from WebGoat/WEB-61  
						
						... 
						
						
						
						Web 61 
						
						
					 
					
						2014-09-09 16:19:31 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9fe1982eee 
					 
					
						
						
							
							Removed adding title with h1 to the page and removing it  
						
						
						
						
					 
					
						2014-09-09 18:19:34 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f9d14c9b79 
					 
					
						
						
							
							Added service for fetching the title of a lesson  
						
						
						
						
					 
					
						2014-09-09 18:18:45 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ac46ddd4d9 
					 
					
						
						
							
							mail and user buttons  
						
						
						
						
					 
					
						2014-09-08 08:20:45 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e9cd630a95 
					 
					
						
						
							
							get the info button functioning  
						
						
						
						
					 
					
						2014-09-07 23:39:05 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						be7d40706a 
					 
					
						
						
							
							WEB-49 Added title to all lessons  
						
						
						
						
					 
					
						2014-09-07 16:59:56 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c7d7926147 
					 
					
						
						
							
							Moved images files etc from lesson_solutions_1 to lesson_solutions  
						
						
						
						
					 
					
						2014-09-07 12:50:56 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b06a0a2c7c 
					 
					
						
						
							
							cookies and params modification. Hints update as well  
						
						
						
						
					 
					
						2014-09-07 01:36:10 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8ae120404f 
					 
					
						
						
							
							Changed the layout of the lesson. The congratulation sentence is now displayed in "red". See WEB-46  
						
						
						
						
					 
					
						2014-09-06 22:23:22 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						91029ed3a6 
					 
					
						
						
							
							reworked cookies/params and modified button layout some  
						
						
						
						
					 
					
						2014-09-04 20:02:23 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6d431ca1fd 
					 
					
						
						
							
							Merge branch 'next' of  https://github.com/WebGoat/WebGoat  into next  
						
						... 
						
						
						
						Conflicts:
	src/main/webapp/WEB-INF/pages/main_new.jsp
	src/main/webapp/css/main.css
overrode the local with the remote version 
						
						
					 
					
						2014-09-05 06:03:48 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8b2eeb103b 
					 
					
						
						
							
							WEB-43 Implement Accordion on Menu  
						
						... 
						
						
						
						tried to implement jQuery UI Accordion; issues raised in the ticket 
						
						
					 
					
						2014-09-05 05:45:47 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2a87ee669c 
					 
					
						
						
							
							pull in changes from Ali  
						
						
						
						
					 
					
						2014-09-03 21:58:10 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						05cdeda1ba 
					 
					
						
						
							
							minor changes from this AM  
						
						
						
						
					 
					
						2014-09-03 21:21:45 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b18d320bd1 
					 
					
						
						
							
							WEB-32, WEB-12, WEB-17, WEB-14  
						
						... 
						
						
						
						Added about, contact, login buttons to top right header. Added lesson
buttons above lesson.
Added ‘heads-up’ display for hints, params etc in a right sidebar in
main body. 
						
						
					 
					
						2014-09-03 13:07:28 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						19e3eff325 
					 
					
						
						
							
							added view portion of cookies, to be updated per new mock-up  
						
						
						
						
					 
					
						2014-09-03 08:02:22 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						50f936f395 
					 
					
						
						
							
							basic params working from cookie/params button.  
						
						
						
						
					 
					
						2014-09-01 23:40:14 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d35f5e0348 
					 
					
						
						
							
							Cleanup, class added to handle lesson info. Updates for plan,source and solution. Started work on cookies and params, not functioning quite yet  
						
						
						
						
					 
					
						2014-09-01 22:30:46 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d414d1a5e4 
					 
					
						
						
							
							basic updates to UI, some js clean-up (moving some literals into goatConstants)  
						
						
						
						
					 
					
						2014-08-30 21:33:20 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d6e68e4860 
					 
					
						
						
							
							Merged branch 'next' of  https://github.com/WebGoat/WebGoat  into next  
						
						
						
						
					 
					
						2014-08-29 05:48:25 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1c72097c24 
					 
					
						
						
							
							make source render in pre tag  
						
						
						
						
					 
					
						2014-08-27 22:09:17 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5cf9b4752a 
					 
					
						
						
							
							show lesson solution  
						
						
						
						
					 
					
						2014-08-27 21:59:29 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ea81253b7c 
					 
					
						
						
							
							changed .gitignore  
						
						
						
						
					 
					
						2014-08-28 05:30:47 +10:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ff76644664 
					 
					
						
						
							
							moving buttons down off the header area, styles to be updated more later  
						
						
						
						
					 
					
						2014-08-26 21:29:45 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						37aed7ffe1 
					 
					
						
						
							
							show lesson solution  
						
						
						
						
					 
					
						2014-08-26 08:03:08 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5f378a7520 
					 
					
						
						
							
							js file reorganization, basic name spacing  
						
						
						
						
					 
					
						2014-08-25 21:02:31 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						53b6c16fb6 
					 
					
						
						
							
							wire up show source service to button  
						
						
						
						
					 
					
						2014-08-25 09:47:57 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						48c31458aa 
					 
					
						
						
							
							text of lesson title (no styling yet), place holder buttons for top functions laid in  
						
						
						
						
					 
					
						2014-08-25 06:20:07 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						eaad78099d 
					 
					
						
						
							
							Merge pull request  #5  from dcowden/next  
						
						... 
						
						
						
						Dynamic Source code display fix 
						
						
					 
					
						2014-08-24 14:18:31 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						705f52f9dc 
					 
					
						
						
							
							fixed source code display  
						
						
						
						
					 
					
						2014-08-24 14:10:30 -04:00