825 Commits

Author SHA1 Message Date
Richard Lawson
5a9b5091a3 Merge pull request #17 from WebGoat/master
Bring master up to date from next
2014-09-25 07:36:44 -04:00
Jason White
f6ac85168b change to fix WEB-164, some other UI updates 2014-09-24 21:07:30 -04:00
mayhew64
fbf37c7941 Merge pull request #16 from WebGoat/WEB-148
Remove old Tomcat startup scripts-- WEB-148
2014-09-21 19:30:16 -04:00
Bruce Mayhew
302aff54a3 WEB-86 disabled lesson until refactor 2014-09-21 19:28:16 -04:00
Dave
b415df2605 Remove old Tomcat startup scripts-- WEB-148 2014-09-21 19:13:50 -04:00
Bruce Mayhew
f706825ba8 WEB-74 disabled until lesson can be refactored 2014-09-21 15:57:05 -04:00
mayhew64
22f3baf2d3 Merge pull request #15 from nbaars/WEB-162
Replaced the contents of the jsp with the about page
2014-09-21 12:47:06 -04:00
nbaars
fd29d440aa Replaced the contents of the jsp with the about page 2014-09-21 14:31:01 +02:00
Jason White
867b692f52 rounded out work on restart lesson and finished implementing showSource/showHints through UI, now that they come as metadata for a lesson 2014-09-20 21:35:16 -04:00
Jason White
4ff73d0215 restart Lesson button implemented and attack link modification for CSRF lesson 2014-09-20 16:03:52 -06:00
mayhew64
e8a273efb2 Merge pull request #14 from nbaars/WEB-150
Removed the ! in the title, with the ! the solution will not load
2014-09-20 09:43:31 -06:00
mayhew64
3814b35aa8 Merge pull request #13 from TomConner/next
Fix WEB-151 - tolerate missing user cookie attribute in challenge stage2
2014-09-20 09:40:22 -06:00
Rick Lawson
b53094b587 more showHints and showSource changes 2014-09-20 11:18:05 -04:00
nbaars
14ea2c1fbe Removed the ! in the title, with the ! the solution will not load 2014-09-20 09:56:27 +02:00
unknown
ac410be6d9 Fix WEB-151 - tolerate missing user cookie attribute in challenge stage2 2014-09-20 01:37:51 -04:00
Rick Lawson
3fd7b34536 more changes for showSource and showHints 2014-09-19 21:06:46 -04:00
Rick Lawson
5c1b3e1916 Add flags to lesson menu items if the lesson should show source or hints 2014-09-19 20:38:43 -04:00
Jason White
13e3bb87c4 Update for WEB-69. Fix for JSONInjection lesson. Stub in javascript for CSRF lesson update/fix 2014-09-19 15:37:45 -06:00
Jason White
bcf7c9a159 fix for some lessons that were not loading correctly ... fixes special characters that were getting rendering into id's 2014-09-19 11:33:26 -06:00
Bruce Mayhew
13a95c3b24 WEB-146 - fixed some code references to English, not reference en 2014-09-19 11:27:40 -06:00
Jason White
d07e52d5e0 changes for menu decoration and related code updates 2014-09-19 10:55:26 -06:00
mayhew64
c9bde0dcdd Merge pull request #12 from WebGoat/WEB-146
Web 146
2014-09-19 09:37:48 -06:00
Rick Lawson
1460b80c7f Change to bet a designattion 2014-09-18 19:17:15 -04:00
nbaars
034d1d5277 Deleted the directory English 2014-09-18 20:51:47 +02:00
nbaars
c0e8c06189 Copied changes from English to en if newer 2014-09-18 20:50:15 +02:00
nbaars
b2dcb85b13 Changed default language to en instead of English 2014-09-18 20:48:44 +02:00
Dave
9ad9d31f69 get ready to merge next onto master.
we want to prefer anything on next.
Merge branch 'master' into next
2014-09-17 18:32:26 -04:00
Bruce Mayhew
a0723fdbf5 WEB-126 some additional grammer cleanup and tomcat configuration cleanup 2014-09-17 12:27:37 -04:00
Bruce Mayhew
63435393f8 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next 2014-09-17 11:07:03 -04:00
Bruce Mayhew
624c2833bc WEB-126 some additional grammer cleanup 2014-09-17 11:06:27 -04:00
Jason White
24f937f6e3 css fix for visual off-by-one lesson complete decoration 2014-09-17 08:34:50 -06:00
Rick Lawson
0ab1d9a6f1 fix issue where "Person" menu took 2 clicks to open 2014-09-17 08:06:30 -04:00
Rick Lawson
faf9e84626 WEB-136 Lesson Restart
add service
2014-09-17 07:54:37 -04:00
Jason White
5372d79ec8 menu decoration updates 2014-09-16 22:08:31 -06:00
Dave Cowden
1a1a8bf6ee Merge pull request #11 from WebGoat/WEB-139
Web 139
2014-09-16 18:20:10 -04:00
nbaars
8f2fc26aa1 Changed the layout of the table 2014-09-16 22:09:50 +02:00
nbaars
f69d512c1b Merge branch 'next' into WEB-139
Conflicts:
	src/main/java/org/owasp/webgoat/lessons/PasswordStrength.java
2014-09-16 18:28:32 +02:00
Jason White
9708292ae5 params fixed too 2014-09-15 22:35:08 -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
Bruce Mayhew
149e7ecc40 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Conflicts:
	src/main/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java
	src/main/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java
	src/main/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java
	src/main/java/org/owasp/webgoat/lessons/WsSqlInjection.java
2014-09-15 21:59:30 -04:00
Bruce Mayhew
4202c12c18 Replaced WebScarab references with OWASP ZAP in java code only 2014-09-15 21:41:25 -04:00
Dave Cowden
da6b465619 Merge pull request #9 from WebGoat/WEB-130
Replaced the tabs with spaces so we do not mess up the formatting, used ...
2014-09-15 19:31:17 -04:00
nbaars
5d2f50fa96 Fixed typo 2014-09-15 22:53:22 +02:00
nbaars
0d4be250e4 Updated the solution page and images 2014-09-15 21:30:51 +02:00
nbaars
a8500cdedb Fixed problems with answers and updated the lesson plan page 2014-09-15 20:59:49 +02: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
nbaars
3ae898784f Replaced the tabs with spaces so we do not mess up the formatting, used the expand command from linux 2014-09-15 16:40:51 +02:00
nbaars
0da280c4f8 Merge branch 'next' into WEB-139 2014-09-15 15:52:57 +02:00
nbaars
a3bf6d0e6f Created the lesson with new online password checker 2014-09-15 15:49:18 +02:00