66 Commits

Author SHA1 Message Date
nbaars
b2dcb85b13 Changed default language to en instead of English 2014-09-18 20:48:44 +02:00
Rick Lawson
0ab1d9a6f1 fix issue where "Person" menu took 2 clicks to open 2014-09-17 08:06:30 -04:00
Jason White
5372d79ec8 menu decoration updates 2014-09-16 22:08:31 -06:00
Jason White
80b776f7fd fixing my mess from earlier. hints, plans, solutions etc. working again. params still quirky 2014-09-15 22:16:26 -06:00
Jason White
c1b1d34e09 initial mod for menu resizing, some more angularization/splitting of the controllers 2014-09-15 14:30:44 -04:00
Jason White
b375cc091f committing before merging local stash 2014-09-15 14:30:44 -04:00
Rick Lawson
9bb1cb8d9c WEB-68 Service to return WebGoat Version and Build Number
-- add email, email list, version number and build number as parameters to about page
2014-09-15 08:17:40 -04:00
Rick Lawson
0074b7e0e4 change order of context listeners 2014-09-14 13:18:40 -04:00
Rick Lawson
81b009ccfb WEB-68 Service to return WebGoat Version and Build Number 2014-09-14 12:34:54 -04:00
Rick Lawson
a4c5be2943 WEB-68 Service to return WebGoat Version and Build Number 2014-09-14 11:47:25 -04:00
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
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
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
diver-sity
1cfbe2b843 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Conflicts:
	.gitignore
2014-09-10 21:25:45 +10: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
Jason White
b06a0a2c7c cookies and params modification. Hints update as well 2014-09-07 01:36:10 -04: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
19e3eff325 added view portion of cookies, to be updated per new mock-up 2014-09-03 08:02:22 -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
Jason White
d414d1a5e4 basic updates to UI, some js clean-up (moving some literals into goatConstants) 2014-08-30 21:33:20 -04:00
diver-sity
d6e68e4860 Merged branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-08-29 05:48:25 +10:00
rlawson
1c72097c24 make source render in pre tag 2014-08-27 22:09:17 -04:00
lawson89@gmail.com
5cf9b4752a show lesson solution 2014-08-27 21:59:29 -04:00
Jason White
ff76644664 moving buttons down off the header area, styles to be updated more later 2014-08-26 21:29:45 -04:00
lawson89@gmail.com
37aed7ffe1 show lesson solution 2014-08-26 08:03:08 -04:00
Jason White
5f378a7520 js file reorganization, basic name spacing 2014-08-25 21:02:31 -04:00
lawson89
53b6c16fb6 wire up show source service to button 2014-08-25 09:47:57 -04:00
Jason White
48c31458aa text of lesson title (no styling yet), place holder buttons for top functions laid in 2014-08-25 06:20:07 -04:00