dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,323 Commits 11 Branches 78 Tags
Commit Graph

1323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Morato
70ab7edbf1 Merge pull request #111 from misfir3/master 
#103: removing ace directory, not in use
 2015-10-21 11:40:53 -04:00
Jason White
28ea340307 #103: removing ace directory, not in use 2015-10-21 11:11:43 -04:00
Nanne
1752df894e Merge pull request #110 from nbaars/master 
The jar snapshot doesn't run #108 (2)
 2015-10-07 22:52:26 +02:00
Nanne Baars
f6c2c4bacb The jar snapshot doesn't run #108 (2) 2015-10-07 22:47:39 +02:00
Nanne
3c1cc87035 Merge pull request #109 from nbaars/master 
The jar snapshot doesn't run #108
 2015-10-07 22:27:04 +02:00
Nanne Baars
316771fde3 The jar snapshot doesn't run #108 2015-10-07 22:19:46 +02:00
mayhew64
7bdfb54ea1 Merge pull request #106 from nbaars/master 
Removed credits from lessons
 2015-10-07 08:08:41 -04:00
Nanne Baars
e1829e209c Implemented lesson information which gives a mapping between the menu and the actual WebGoat-Lessons project. 2015-10-04 11:56:12 +02:00
Nanne Baars
a6a1b32939 Removed credits from lessons 2015-10-03 18:21:54 +02:00
mayhew64
16b8eeb439 Merge pull request #105 from nbaars/master 
Fixed classloading issues with Goathills lessons
 2015-10-01 16:52:50 -04:00
Nanne Baars
487bc71df1 Moved the logic to the plugin loader which makes the context listener obsolete 2015-09-30 23:08:10 +02:00
Nanne Baars
219b38315b Make sure WEB-INF/lib dir is available 2015-09-30 19:10:33 +02:00
Nanne Baars
2ca5dda37b Reloading finished 2015-09-30 19:03:49 +02:00
Nanne Baars
6a00d66f8b Plugins are now reloaded 2015-09-29 21:41:36 +02:00
Nanne Baars
33d251a147 Fixed goathills lesson with JSP now load correctly again(2) 2015-09-29 20:39:09 +02:00
Nanne Baars
c59e253606 Merge remote-tracking branch 'upstream/master' 2015-09-28 23:30:30 +02:00
Nanne Baars
d4450da5d7 Fixed goathills lesson with JSP now load correctly again 2015-09-28 23:27:58 +02:00
mayhew64
49c7fb7871 Merge pull request #102 from nbaars/master 
i8n highlighting #96
 2015-09-25 12:40:54 -04:00
Nanne Baars
c0d727d1f2 Merge remote-tracking branch 'upstream/master' 2015-09-24 10:09:38 +02:00
Nanne Baars
86e4fd1c85 i8n highlighting #96 2015-09-24 10:09:07 +02:00
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
mayhew64
5adf3a45c2 Merge pull request #99 from nbaars/master 
Button to force plugin reloading #93
 2015-09-23 09:57:58 -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
9218a0dbb0 Updated the README.MD with reloading functionality of plugins 2015-09-22 21:17:09 +02: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
Doug Morato
e13c959990 Merge pull request #98 from misfir3/master 
#97, Hint controls for CHALLENGE Category lessons
 2015-09-22 13:00:34 -04:00
Jason White
dc57827cfc #97, Hint controls for CHALLENGE Category lessons 2015-09-21 21:24:10 -04:00
mayhew64
e625c445c5 Merge pull request #94 from misfir3/master 
#23, #24 - LessonInfo Service now used for TitleView and HelpControsView
 2015-09-21 08:28:00 -04:00
Jason White
6e670c4ac5 #23, #24 - LessonInfo Service now used for TitleView and HelpControlsView 2015-09-20 00:09:38 -04:00
mayhew64
aaa66cbc63 Merge pull request #88 from nbaars/master 
Properties are appended when loading plugins (#29)
 2015-09-19 05:59:56 -04:00
Nanne Baars
901eff682f Properties are appended when loading plugins (#29) 2015-09-19 08:07:54 +02:00
Nanne
3535626ad9 Merge pull request #85 from mayhew64/master 
Added a lesson restart for lesson specific restart actions
 2015-09-18 22:11:00 +02:00
mayhew64
5788fe7afe Added a lesson restart for lesson specific restart actions 2015-09-18 15:46:39 -04:00
mayhew64
ff0d5af9d2 Merge pull request #82 from mayhew64/master 
Updated contributors and sponsors
 2015-09-18 15:31:41 -04:00
mayhew64
1e860928e6 Revert "Added a lesson restart call to allow lesson specific restart functionality" 
This reverts commit 5365f632e7d2277fa024b5a0863654c416c0b3bc.
 2015-09-18 15:30:17 -04:00
mayhew64
376a26c3fb Merge pull request #83 from dougmorato/master 
Fixing inconsistent merge issues implementing nbaars fixes
 2015-09-18 13:33:20 -04:00
mayhew64
5365f632e7 Added a lesson restart call to allow lesson specific restart functionality 2015-09-18 13:30:32 -04:00
Doug Morato
6147aebf61 Fixing inconsistent merge issues implementing nbaars fixes 2015-09-18 12:40:05 -04:00
mayhew64
7ce8273376 Updated contributors and sponsors 2015-09-18 08:39:15 -04:00
Nanne
c427db4f56 Merge pull request #78 from dougmorato/coverity_scan 
Adding Coverity Static Code Analysis Scan integration
 2015-09-18 07:41:15 +02: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
3f43f56c90 Merge change from Nanne on testing/loading plugins 
* nbaars-master:
  Fixed loading plugins: sometimes failed file was not correctly extracted
 2015-09-17 22:47:10 -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
0d543908f9 Merge branch 'dougmorato-release_and_docs_wip' 2015-09-18 00:25:04 +02:00
Nanne Baars
5d37de731c Fixed typo and updated contributor information 2015-09-18 00:22:12 +02:00
Nanne Baars
ce75fadc1b Merge remote-tracking branch 'upstream/master' 2015-09-17 07:51:07 +02:00
Nanne Baars
9474f66d96 Fixed loading plugins: sometimes failed file was not correctly extracted 2015-09-17 07:29:51 +02:00