280 Commits

Author SHA1 Message Date
Bruce Mayhew
fbc62a4cd7 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-09-14 10:07:01 -04:00
Bruce Mayhew
ab2b6c4c29 WEB-132 Disabled Remote Admin Lesson 2014-09-14 10:06:43 -04:00
Rick Lawson
9afb31c6b2 WEB-15 Provide a way for remote resources to run locally
Added jquery form plugin to local
2014-09-14 09:56:06 -04:00
Rick Lawson
b542127c22 Revert "WEB-65"
This reverts commit ebae6964fa096bf3a861bfaf66e08fa74573f64d.
2014-09-14 09:38:38 -04:00
Bruce Mayhew
43fccdcaf7 WEB-126 Updated all introduction lessons 2014-09-13 13:13:44 -04:00
diver-sity
710e3ee1ee Merge branch 'next' of https://github.com/webgoat-atlassian/WebGoat-1 into next
Conflicts:
	src/main/webapp/js/application.js
2014-09-13 17:31:03 +10:00
diver-sity
0f82bd9991 missed a semi-colon 2014-09-13 17:22:36 +10:00
diver-sity
5e44298f2b WEB-64
The left-side navigation bar now appear to be of the same height as the browser window's height. The bar's height also changes when the window is resized.
Testing is carried out in two recent versions of Firefox and Chrome.
2014-09-13 16:54:54 +10:00
diver-sity
9e40e55b8c WEB-64
The left-side navigation bar now appear to be of the same height as the browser window's height. The bar's height also changes when the window is resized.
Testing is carried out in two recent versions of Firefox and Chrome.
2014-09-13 16:37:07 +10:00
diver-sity
3932f884d9 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-09-13 13:38:17 +10:00
Bruce Mayhew
dd421ebb01 WEB-25 Added Devin 2014-09-12 17:46:44 -04:00
diver-sity
5978b63156 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-09-13 07:13:20 +10:00
diver-sity
ebae6964fa WEB-65
main_new.jsp -> sidebar left: first-level children's indentation is missing

added indentation for first-level children; swapped "span" and "i" in
<a ng-click="expanded = !expanded" href=""><span>{{item.name}}</span><i class="fa {{item.class}}"></i></a>
so that the icon did not appear to belong to the menu item above the current one (in some cases this occured).
2014-09-13 07:05:59 +10:00
Bruce Mayhew
e5b142c2ce WEB-25 Increased modal height to break in whitespace 2014-09-12 16:43:19 -04:00
diver-sity
bdb9d33bf6 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-09-13 06:05:57 +10:00
Bruce Mayhew
5f45e6e153 WEB-25 removed exception text that was accidently pasted in 2014-09-12 12:23:12 -04:00
Bruce Mayhew
aa07d14755 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-09-12 12:10:33 -04:00
Bruce Mayhew
39bf431ca2 WEB-22 Added Spider Web Logo 2014-09-12 12:07:52 -04:00
Jeff
d7ed16296c WEB-25 updated text for about page. 2014-09-12 10:32:40 -04:00
Bruce Mayhew
1e0460c6f2 WEB-25 about content 2014-09-12 09:52:30 -04:00
Rick Lawson
1e5e9c0b8b WEB-25 - Content for About Page
WEB-24 - Unauthenticated access should redirect to login page
2014-09-12 08:18:25 -04:00
diver-sity
d72d1f0262 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-09-12 21:13:07 +10:00
Bruce Mayhew
c9e6d1f7a7 WEB-48 Updated useful tools 2014-09-11 18:49:53 -04:00
Rick Lawson
809ef80e18 autowire servlet context instead of getting from request 2014-09-11 09:27:25 -04:00
Rick Lawson
fc8d4d495a move hints up 2014-09-11 08:05:35 -04:00
Rick Lawson
706a574d5f style login and logout pages to match new look 2014-09-11 07:54:53 -04:00
Rick Lawson
5241af57cc Fix mailto link on top right 2014-09-11 07:23:02 -04:00
Rick Lawson
96ec99e65a show user and role in logout menu 2014-09-11 07:16:41 -04:00
Rick Lawson
b04622ff86 add tooltips to nav buttons on right 2014-09-11 06:59:04 -04:00
Bruce Mayhew
35559d657b WEB-66 updated headers 2014-09-10 18:15:03 -04:00
diver-sity
1cfbe2b843 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Conflicts:
	.gitignore
2014-09-10 21:25:45 +10:00
nbaars
8eac6ef898 fixed WEB-53 2014-09-10 08:46:45 +02:00
nbaars
5c8e545185 fixed WEB-27 2014-09-10 07:52:15 +02:00
mayhew64
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
nbaars
9fe1982eee Removed adding title with h1 to the page and removing it 2014-09-09 18:19:34 +02:00
nbaars
f9d14c9b79 Added service for fetching the title of a lesson 2014-09-09 18:18:45 +02:00
rlawson
ac46ddd4d9 mail and user buttons 2014-09-08 08:20:45 -04:00
lawson89@gmail.com
e9cd630a95 get the info button functioning 2014-09-07 23:39:05 -04:00
Bruce Mayhew
be7d40706a WEB-49 Added title to all lessons 2014-09-07 16:59:56 -04:00
nbaars
c7d7926147 Moved images files etc from lesson_solutions_1 to lesson_solutions 2014-09-07 12:50:56 +02:00
Jason White
b06a0a2c7c cookies and params modification. Hints update as well 2014-09-07 01:36:10 -04:00
nbaars
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
Jason White
91029ed3a6 reworked cookies/params and modified button layout some 2014-09-04 20:02:23 -04:00
diver-sity
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
diver-sity
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
lawson89
2a87ee669c pull in changes from Ali 2014-09-03 21:58:10 -04:00
Jason White
05cdeda1ba minor changes from this AM 2014-09-03 21:21:45 -04:00
Jason White
19e3eff325 added view portion of cookies, to be updated per new mock-up 2014-09-03 08:02:22 -04:00
Jason White
50f936f395 basic params working from cookie/params button. 2014-09-01 23:40:14 -04:00
Jason White
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