1601 Commits

Author SHA1 Message Date
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
mayhew64
d126124649 Merge pull request #57 from WebGoat/mayhew64-patch-1
Update README.MD
2015-08-28 11:35:02 -04:00
mayhew64
a1b1b4a28d Merge pull request #55 from nbaars/master
Increase performance while extracting the plugins
2015-08-28 11:34:47 -04:00
mayhew64
16f5ca4d0b Update README.MD 2015-08-28 11:33:08 -04:00
Nanne
4ba2520d33 Merge pull request #56 from dougmorato/integration_tests
Do NOT run Integration tests on pull requests
2015-08-28 16:26:50 +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
Doug Morato
13b63651da Replacing Maven package/verify goals by maven install, which runs all of them 2015-08-28 09:35:34 -04:00
Doug Morato
de6f1cf289 Change travis buils to not run Integration Tests on pull requests 2015-08-28 09:07:32 -04: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
mayhew64
649cc08cb0 Merge pull request #54 from nbaars/master
Http Basics lessons fails to load #53
2015-08-27 08:52:50 -04:00
Jason White
4a237d2df7 Merge remote-tracking branch 'upstream/master' 2015-08-27 06:19:43 -04:00
Nanne Baars
e81cbd34ca Http Basics lessons fails to load #53 2015-08-27 08:44:25 +02:00
mayhew64
c67bd73768 Merge pull request #50 from dougmorato/testing_work
Adding headless Integration Tests with Sauce Labs
2015-08-26 09:16:36 -04:00
Jason White
5921a098d7 Fix for #46 (Lesson Help toggle plus cleaning up button text) && fix for #39 2015-08-26 06:01:28 +02:00
Jason White
65621e51cf Fix for #46 (Lesson Help toggle plus cleaning up button text) && fix for #39 2015-08-25 21:11:47 -04:00
Doug Morato
2223bf8eb2 Integration tests only run on verify/install/deploy 2015-08-24 19:44:12 -04:00
Doug Morato
8ed67ef62e Replace sauce labs config by Environment Properties 2015-08-24 19:38:37 -04:00
Doug Morato
62db0bfdef Adding basic Integration Tests with Sauce Labs integration 2015-08-24 19:24:22 -04:00
Doug Morato
2212bd0805 Initial push of testing work 2015-08-24 19:24:21 -04:00
Nanne
cc9ae0a6a9 Merge pull request #48 from nbaars/master
Null Pointer Exception on every page #47
2015-08-25 00:48:36 +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
mayhew64
06d025daf0 Merge pull request #36 from nbaars/master
Fixed not serializable error when stopping/starting Tomcat
2015-08-23 07:59:05 -04:00
Jason White
a61f9c8a41 Issue #22, reloading menu on content load. Can use enhancements/optimizations, but working for now 2015-08-23 00:22:09 -04:00
Jason White
7c16319c34 #42, support for stages in client router and LessonMenuService 2015-08-22 21:13:03 -04:00
Jason White
9b4c97e468 Fixes for issue #32 - lessons/menu not loading 2015-08-22 05:59:48 -04:00
Nanne Baars
69350a6e0c Fixed not serializable error when stopping/starting Tomcat 2015-08-22 10:40:42 +02:00
mayhew64
16c262f3bc Merge pull request #35 from dougmorato/developer_bootstrap
Improved README, fixed copy lessons instructions, added developer bootstrap
2015-08-21 17:17:42 -04:00
Doug Morato
d171c3d01d Fix developer_bootstrap script to check for correct directory names 2015-08-21 17:11:02 -04:00
Doug Morato
9d03fe5b10 Adding developer_bootstrap script 2015-08-21 16:42:03 -04:00
Doug Morato
e579578c53 Improved README, fixed lesson copy instructions, added steps for a developer bootstrap 2015-08-21 16:33:57 -04:00
Doug Morato
e19f3bd72c Updated the Travis build to now include the lessons .jar files when
packaging the WAR and exec.jar
2015-08-21 20:44:59 +02:00
mayhew64
978ee8522c Merge pull request #31 from dougmorato/docs
Improved Travis Build and Instructions on Readme
2015-08-21 08:37:05 -04:00
Doug Morato
f08959f530 Remove slack badge, as it's breaking formatting 2015-08-20 22:34:36 -04:00
Doug Morato
1e19a8a98b Some more README updates. Try to fix slack badge 2015-08-20 22:31:58 -04:00
Doug Morato
ba8fb13526 Updated README instrauctions and formatting. Updated links to download from Amazon S3 2015-08-20 22:19:41 -04:00
Doug Morato
65f239457f On deploy to S3 if build from WebGoat/WebGoat repo on Master branch 2015-08-20 21:44:54 -04:00
Doug Morato
1fbfb8bb66 Also deploy non-exec jar. Only deploy for JDK8 builds 2015-08-20 21:40:51 -04:00
Doug Morato
cf040af06b Move artifacts to folder, then deploy folder to S3 2015-08-20 21:33:58 -04:00
Doug Morato
cb5a7a5773 Fix variable for S3 deploy 2015-08-20 21:17:49 -04:00
Doug Morato
6ea7507488 Deploy S3 using maven parent version 2015-08-20 21:14:03 -04:00
misfir3
5586888da5 Merge pull request #30 from misfir3/master
recent modifications from my branch
2015-08-20 20:48:33 -04:00
Doug Morato
d96fe2a71e specify files for S# upload 2015-08-20 20:47:15 -04:00
Jason White
0e474d9de8 cleanup, refactoring some view and model names, some minor fixes 2015-08-20 20:41:21 -04:00
Doug Morato
71effddccb Update S3 deployment to upload jar/war files only 2015-08-20 20:37:49 -04:00
Doug Morato
950fe974a7 replace ./ for /Users/dm in travis S3 uploader 2015-08-20 20:05:12 -04:00
Doug Morato
e5a475eff8 fix directory to upload to S3 2015-08-20 20:00:30 -04:00