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

1298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Doug Morato
171a66de57 Adding Coverity Scans integration 2015-09-16 21:59:50 -04:00
Doug Morato
54b6a7e843 Adding WebGoatLabels_en.properties to fix warning on ENGLISH locale 2015-09-16 21:12:44 -04:00
Doug Morato
a8ce11ee14 Initial work on adding more browsers to SauceLabs testing 2015-09-16 21:11:54 -04:00
Doug Morato
f3b52d4423 Improving naming convention on tomcat execution goal for integration tests 2015-09-16 21:10:11 -04:00
Doug Morato
d56ff70370 Additional pom preparations for releasing into maven OSS 2015-09-16 21:08:51 -04:00
Doug Morato
e8b9b17107 Fix javadoc errors in order to comply with Maven OSS requirements 2015-09-15 22:24:11 -04:00
Doug Morato
7b43c89e1c Improve poms to comply with Maven OSS submission requirements 2015-09-15 22:22:40 -04:00
Doug Morato
ba6997f52f Merge pull request #74 from nbaars/master 
Property files are now detected while extracting the plugin
 2015-09-15 18:17:24 -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
mayhew64
aabdb5c401 Update webgoat_developer_bootstrap.sh 
Fixed a couple of typos
 2015-09-14 17:59:28 -04:00
misfir3
9a0ec81b64 Merge pull request #61 from misfir3/master 
Recent UI Fixes
 2015-09-13 00:22:05 -04:00
Jason White
78215a7f55 #28 reimplemented for 7.0/Backbone implementation 2015-09-13 00:15:19 -04:00
Jason White
9348a0d70e Should resolve issues #25 and #2 using a backbone view to control those nav buttons 2015-09-09 12:36:36 -04:00
Jason White
e928871d2a Merge remote-tracking branch 'upstream/master' 2015-09-09 06:30:10 -04:00
misfir3
85f18bc6d5 Merge pull request #59 from nbaars/master 
Lab - DOM-based cross-site scripting: Java Source produces XSS alert #38
 2015-09-09 06:29:42 -04:00
Jason White
9fa79292b1 Merge remote-tracking branch 'upstream/master' 2015-09-08 18:39:08 -04:00
Nanne Baars
543e35caa1 Removed duplicate css import 2015-09-06 11:51:00 +02:00
Nanne Baars
e22ad201e6 Re-enable/update WebGoat Info link #26 2015-09-05 16:53:23 +02:00
Nanne Baars
e294bd39b9 User Info/Logout Links #25 2015-09-05 16:03:18 +02:00
Nanne Baars
5365679b7c Removed webgoat-release project now part of Travis build 2015-09-05 11:25:45 +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
Jason White
4b79d990e2 Merge remote-tracking branch 'upstream/master' 2015-09-01 06:39:14 -04:00