29 Commits

Author SHA1 Message Date
mayhew64
77f3c5135f Merge pull request #101 from misfir3/master
#97, updating controls for hints, source, solution and plans on lessons
2015-09-23 10:00:12 -04:00
Jason White
1bd6a9e0e7 #97, updating controls for hints, source, solution and plans on lessons in challenge roles 2015-09-23 09:01:45 -04:00
Nanne Baars
87d196c427 Return indication that plugins have been reloaded 2015-09-22 21:13:41 +02:00
Nanne Baars
6f8befd9a4 Merge remote-tracking branch 'upstream/master' 2015-09-22 20:40:02 +02:00
Nanne Baars
8d2771c108 Adding the ability to reload plugins directly from the interface instead of restarting Tomcat 2015-09-22 20:38:19 +02:00
Jason White
dc57827cfc #97, Hint controls for CHALLENGE Category lessons 2015-09-21 21:24:10 -04:00
Jason White
6e670c4ac5 #23, #24 - LessonInfo Service now used for TitleView and HelpControlsView 2015-09-20 00:09:38 -04:00
Nanne Baars
901eff682f Properties are appended when loading plugins (#29) 2015-09-19 08:07:54 +02:00
mayhew64
5788fe7afe Added a lesson restart for lesson specific restart actions 2015-09-18 15:46:39 -04:00
Doug Morato
6147aebf61 Fixing inconsistent merge issues implementing nbaars fixes 2015-09-18 12:40:05 -04:00
Doug Morato
06abc6e08a Merge pull request #80 from misfir3/master
#72, defaulting to firstLesson on initial redirect
2015-09-17 22:53:25 -04:00
Doug Morato
214d52685f Merge fixes from Nanne
# By Nanne Baars
# Via Nanne Baars
* 'master' of git://github.com/nbaars/WebGoat:
  Fixed loading plugins: sometimes failed file was not correctly extracted

# Conflicts:
#	webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
#	webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
#	webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
#	webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
2015-09-17 22:45:14 -04:00
Jason White
9613e703f1 #72, defaulting to firstLesson on initial redirect 2015-09-17 22:24:57 -04:00
Nanne Baars
9474f66d96 Fixed loading plugins: sometimes failed file was not correctly extracted 2015-09-17 07:29:51 +02:00
Doug Morato
e8b9b17107 Fix javadoc errors in order to comply with Maven OSS requirements 2015-09-15 22:24:11 -04:00
Nanne Baars
d142407de3 Discover Clues in HTML lesson doesn't work #70 2015-09-15 23:36:24 +02:00
Nanne Baars
f31150ffdf Property files are now detected while extracting the plugin 2015-09-15 18:27:11 +02:00
Nanne Baars
18204c62c6 LessonAdapter did not read the 'New Lesson Instructions.txt' (IOException) 2015-09-05 09:43:03 +02:00
Nanne Baars
112386b43e Lab - DOM-based cross-site scripting: Java Source produces XSS alert #38 2015-09-02 23:22:24 +02:00
Nanne Baars
5ca36502d3 Weird JDK 8 issue about unable to find properties files, applied a fix and added extra logging 2015-09-01 22:52:43 +02:00
Nanne Baars
2f43c16cc1 Clicking on 'LAB: Role Based Access Control' produces 'Invalid Session' in UI #44 2015-08-28 16:24:04 +02:00
Nanne Baars
a44e08cbfd Adjusted LabelProvider to use other loader 2015-08-28 07:55:49 +02:00
Nanne Baars
010404d2e1 Increase performance while extracting the plugins 2015-08-28 07:07:12 +02:00
Nanne Baars
e81cbd34ca Http Basics lessons fails to load #53 2015-08-27 08:44:25 +02:00
Nanne Baars
7b5e702bcd Null Pointer Exception on every page #47 2015-08-25 00:43:04 +02:00
mayhew64
b2316c6ca2 Merge pull request #43 from misfir3/master
menu and routing work
2015-08-23 07:59:51 -04:00
Jason White
7c16319c34 #42, support for stages in client router and LessonMenuService 2015-08-22 21:13:03 -04:00
Nanne Baars
69350a6e0c Fixed not serializable error when stopping/starting Tomcat 2015-08-22 10:40:42 +02:00
Nanne Baars
42f373d66a Moved Maven multiproject setup 2015-08-11 21:57:12 +02:00