Commit Graph

  • 85f18bc6d5 Merge pull request #59 from nbaars/master misfir3 2015-09-09 06:29:42 -04:00
  • 9fa79292b1 Merge remote-tracking branch 'upstream/master' Jason White 2015-09-08 18:39:08 -04:00
  • 543e35caa1 Removed duplicate css import Nanne Baars 2015-09-06 11:51:00 +02:00
  • e22ad201e6 Re-enable/update WebGoat Info link #26 Nanne Baars 2015-09-05 16:53:23 +02:00
  • e294bd39b9 User Info/Logout Links #25 Nanne Baars 2015-09-05 16:03:18 +02:00
  • 5365679b7c Removed webgoat-release project now part of Travis build Nanne Baars 2015-09-05 11:25:45 +02:00
  • 18204c62c6 LessonAdapter did not read the 'New Lesson Instructions.txt' (IOException) Nanne Baars 2015-09-05 09:43:03 +02:00
  • 112386b43e Lab - DOM-based cross-site scripting: Java Source produces XSS alert #38 Nanne Baars 2015-09-02 23:22:24 +02:00
  • 5ca36502d3 Weird JDK 8 issue about unable to find properties files, applied a fix and added extra logging Nanne Baars 2015-09-01 22:43:45 +02:00
  • 4b79d990e2 Merge remote-tracking branch 'upstream/master' Jason White 2015-09-01 06:39:14 -04:00
  • d126124649 Merge pull request #57 from WebGoat/mayhew64-patch-1 mayhew64 2015-08-28 11:35:02 -04:00
  • a1b1b4a28d Merge pull request #55 from nbaars/master mayhew64 2015-08-28 11:34:47 -04:00
  • 16f5ca4d0b Update README.MD mayhew64 2015-08-28 11:33:08 -04:00
  • 4ba2520d33 Merge pull request #56 from dougmorato/integration_tests Nanne 2015-08-28 16:26:50 +02:00
  • 2f43c16cc1 Clicking on 'LAB: Role Based Access Control' produces 'Invalid Session' in UI #44 Nanne Baars 2015-08-28 16:24:04 +02:00
  • 13b63651da Replacing Maven package/verify goals by maven install, which runs all of them Doug Morato 2015-08-28 09:35:34 -04:00
  • de6f1cf289 Change travis buils to not run Integration Tests on pull requests Doug Morato 2015-08-28 09:07:32 -04:00
  • a44e08cbfd Adjusted LabelProvider to use other loader Nanne Baars 2015-08-28 07:44:24 +02:00
  • 010404d2e1 Increase performance while extracting the plugins Nanne Baars 2015-08-28 06:40:27 +02:00
  • 649cc08cb0 Merge pull request #54 from nbaars/master mayhew64 2015-08-27 08:52:50 -04:00
  • 4a237d2df7 Merge remote-tracking branch 'upstream/master' Jason White 2015-08-27 06:19:43 -04:00
  • e81cbd34ca Http Basics lessons fails to load #53 Nanne Baars 2015-08-27 07:57:03 +02:00
  • c67bd73768 Merge pull request #50 from dougmorato/testing_work mayhew64 2015-08-26 09:16:36 -04:00
  • 5921a098d7 Fix for #46 (Lesson Help toggle plus cleaning up button text) && fix for #39 Jason White 2015-08-25 21:11:47 -04:00
  • 65621e51cf Fix for #46 (Lesson Help toggle plus cleaning up button text) && fix for #39 Jason White 2015-08-25 21:11:47 -04:00
  • 2223bf8eb2 Integration tests only run on verify/install/deploy Doug Morato 2015-08-24 19:44:12 -04:00
  • 8ed67ef62e Replace sauce labs config by Environment Properties Doug Morato 2015-08-24 19:38:37 -04:00
  • 62db0bfdef Adding basic Integration Tests with Sauce Labs integration Doug Morato 2015-08-24 19:23:38 -04:00
  • 2212bd0805 Initial push of testing work Doug Morato 2015-08-22 13:39:42 -04:00
  • cc9ae0a6a9 Merge pull request #48 from nbaars/master Nanne 2015-08-25 00:48:36 +02:00
  • 7b5e702bcd Null Pointer Exception on every page #47 Nanne Baars 2015-08-25 00:43:04 +02:00
  • b2316c6ca2 Merge pull request #43 from misfir3/master mayhew64 2015-08-23 07:59:51 -04:00
  • 06d025daf0 Merge pull request #36 from nbaars/master mayhew64 2015-08-23 07:59:05 -04:00
  • a61f9c8a41 Issue #22, reloading menu on content load. Can use enhancements/optimizations, but working for now Jason White 2015-08-23 00:22:09 -04:00
  • 7c16319c34 #42, support for stages in client router and LessonMenuService Jason White 2015-08-22 21:13:03 -04:00
  • 9b4c97e468 Fixes for issue #32 - lessons/menu not loading Jason White 2015-08-22 05:59:48 -04:00
  • 69350a6e0c Fixed not serializable error when stopping/starting Tomcat Nanne Baars 2015-08-22 10:40:42 +02:00
  • 16c262f3bc Merge pull request #35 from dougmorato/developer_bootstrap mayhew64 2015-08-21 17:17:42 -04:00
  • d171c3d01d Fix developer_bootstrap script to check for correct directory names Doug Morato 2015-08-21 17:11:02 -04:00
  • 9d03fe5b10 Adding developer_bootstrap script Doug Morato 2015-08-21 16:42:03 -04:00
  • e579578c53 Improved README, fixed lesson copy instructions, added steps for a developer bootstrap Doug Morato 2015-08-21 16:33:57 -04:00
  • e19f3bd72c Updated the Travis build to now include the lessons .jar files when packaging the WAR and exec.jar Doug Morato 2015-08-21 13:33:08 -04:00
  • 978ee8522c Merge pull request #31 from dougmorato/docs mayhew64 2015-08-21 08:37:05 -04:00
  • f08959f530 Remove slack badge, as it's breaking formatting Doug Morato 2015-08-20 22:34:36 -04:00
  • 1e19a8a98b Some more README updates. Try to fix slack badge Doug Morato 2015-08-20 22:31:58 -04:00
  • ba8fb13526 Updated README instrauctions and formatting. Updated links to download from Amazon S3 Doug Morato 2015-08-20 22:19:41 -04:00
  • 65f239457f On deploy to S3 if build from WebGoat/WebGoat repo on Master branch Doug Morato 2015-08-20 21:44:54 -04:00
  • 1fbfb8bb66 Also deploy non-exec jar. Only deploy for JDK8 builds Doug Morato 2015-08-20 21:40:51 -04:00
  • cf040af06b Move artifacts to folder, then deploy folder to S3 Doug Morato 2015-08-20 21:33:58 -04:00
  • cb5a7a5773 Fix variable for S3 deploy Doug Morato 2015-08-20 21:17:49 -04:00
  • 6ea7507488 Deploy S3 using maven parent version Doug Morato 2015-08-20 21:14:03 -04:00
  • 5586888da5 Merge pull request #30 from misfir3/master misfir3 2015-08-20 20:48:33 -04:00
  • d96fe2a71e specify files for S# upload Doug Morato 2015-08-20 20:47:15 -04:00
  • 0e474d9de8 cleanup, refactoring some view and model names, some minor fixes Jason White 2015-08-20 20:41:21 -04:00
  • 71effddccb Update S3 deployment to upload jar/war files only Doug Morato 2015-08-20 20:37:49 -04:00
  • 950fe974a7 replace ./ for /Users/dm in travis S3 uploader Doug Morato 2015-08-20 20:05:12 -04:00
  • e5a475eff8 fix directory to upload to S3 Doug Morato 2015-08-20 20:00:30 -04:00
  • 68cf2c033f fix directory to upload to S3 Doug Morato 2015-08-20 19:07:59 -04:00
  • 5fba3a05cd Travis should only deploy target directory Doug Morato 2015-08-20 19:02:28 -04:00
  • 5f58bf40ae Fix Amazon S3 settings for Travis Doug Morato 2015-08-20 18:46:55 -04:00
  • 03f3851a2b Updating .war file download link to Amazon S3 Doug Morato 2015-08-20 18:35:03 -04:00
  • bab6fab744 Adding Amazzon S3 .war artifact upload Doug Morato 2015-08-20 17:28:22 -04:00
  • 656a37a403 Update travis.yml to build for JDK8 and also call the package goal Doug Morato 2015-08-20 17:09:49 -04:00
  • 62a526f3bb updating README to reflect 7.0-SNAPSHOT.war Doug Morato 2015-08-20 17:08:47 -04:00
  • 7e2b98e78a Adding Slack badge on the README file Doug Morato 2015-08-20 16:56:32 -04:00
  • 640b9001c4 Fix URL for tomcat7:deploy goal Doug Morato 2015-08-19 22:28:37 -04:00
  • 4d26d84eef Fixing all build warnings during Maven build Doug Morato 2015-08-19 21:00:40 -04:00
  • fb63a325f7 Update parent pom.xml to version 7.0-SNAPSHOT. Fix indentation Doug Morato 2015-08-19 20:34:10 -04:00
  • 0a4b17dff8 Update README with WIP info, point to WG-Legacy for stable Doug Morato 2015-08-19 20:17:04 -04:00
  • 4815eecaea Add TravisCI build badge, cleanup README file Doug Morato 2015-08-19 20:07:31 -04:00
  • 1f63e93d47 Update README - still some TBDs until we have a release build mayhew64 2015-08-15 18:34:25 -04:00
  • 6307f102f0 re-enabliing ajaxifyAttachHref for some CSRF & XSS lessons. Some cleanup along the way Jason White 2015-08-20 05:58:36 -04:00
  • 7c12ac4c9b Merge pull request #21 from misfir3/master misfir3 2015-08-19 08:38:44 -04:00
  • a36697bf0d Merge remote-tracking branch 'upstream/master' Jason White 2015-08-19 05:34:39 -04:00
  • 1d70da301e initial cut of paramView re-enabled Jason White 2015-08-19 05:34:08 -04:00
  • ef9a30b72a Merge pull request #18 from dougmorato/master mayhew64 2015-08-15 14:13:10 -04:00
  • fba88af9b3 Removing doc directory which contained 6 year old stale files Douglas Morato 2015-08-14 20:28:39 -04:00
  • fb871d3040 Merge pull request #17 from silicakes/master misfir3 2015-08-14 12:54:22 -04:00
  • d13d8166bc removed redundant require call Michael Katz 2015-08-14 17:25:55 +03:00
  • 68d952eb5d fixed a global scope issue on LessonController | fixed the listenTo yntax for goatRouter.js Michael Katz 2015-08-14 17:24:34 +03:00
  • 8330d411e3 Merge pull request #16 from misfir3/master misfir3 2015-08-13 21:54:32 -04:00
  • 1351f0e6a2 cookie view re-enabled Jason White 2015-08-13 21:46:13 -04:00
  • da5a63453b Removed webgoat-release from parent pom Nanne Baars 2015-08-11 22:10:51 +02:00
  • 33b51dd6db Fixed travis setup Nanne Baars 2015-08-11 22:00:14 +02:00
  • 42f373d66a Moved Maven multiproject setup Nanne Baars 2015-08-11 21:57:12 +02:00
  • 28a2d01ba3 Moved extra dependencies of tomcat plugin to right place Updated documentation Nanne Baars 2015-08-11 07:40:37 +02:00
  • 2c55ec5747 Fixed Travis-CI script Nanne Baars 2015-08-09 13:46:21 +02:00
  • d207ee8849 Switch to JDK7 Nanne Baars 2015-08-09 13:45:22 +02:00
  • da68feb3f2 Fixed build for Travis-CI Nanne Baars 2015-08-09 13:26:44 +02:00
  • 9be61ad869 First attempt with Travis CI Nanne Baars 2015-08-09 09:54:13 +02:00
  • 87a621fa27 Merge remote-tracking branch 'upstream/master' Nanne Baars 2015-08-09 07:46:43 +02:00
  • f0ec42a4a0 Merge pull request #15 from misfir3/master misfir3 2015-08-05 19:04:02 -04:00
  • 2b37e88d94 hints working, restar working and complete decorations (still need to wire up menu update on lesson completion) Jason White 2015-08-04 19:32:27 -04:00
  • 0d79d74ef8 plugin_extracted directory should be created if it does not exists Nanne Baars 2015-08-04 19:57:08 +02:00
  • abaa8ac1de Applied the changes to README.txt to README.MD Nanne Baars 2015-07-31 06:24:45 +02:00
  • d92b9436c1 Update README.MD mayhew64 2015-06-05 12:14:24 -04:00
  • a79c374233 WEB-204 fixes based on review Jeff 2015-04-24 15:03:40 -04:00
  • 1d429b6ab9 WEB-204 additonal fix. Jeff 2015-04-24 14:58:20 -04:00
  • f36eaede45 WEB-204 Syntax fix. Jeff 2015-04-24 14:57:42 -04:00
  • c6d258795e WEB-204 minor change. Jeff 2015-04-24 14:56:59 -04:00