Commit Graph

  • af26543cf2 WEB-204 updated readme with MD syntax. Removed .txt file. Jeff 2015-04-24 14:55:25 -04:00
  • 48f16d4638 Added UserDatabase.mv.db to .gitignore Nanne Baars 2015-07-30 23:59:42 +02:00
  • fc6151f767 Merge remote-tracking branch 'upstream/master' Jason White 2015-07-26 16:49:00 -04:00
  • 5590d07419 initial re-enabling of help buttons (source/plan/solution at least). Still need styling work etc. Jason White 2015-07-26 01:30:24 -04:00
  • f5227f4b6b initial re-enabling of help buttons (source/plan/solution at least). Still need styling work etc. Jason White 2015-07-26 01:30:24 -04:00
  • c31f60f5d9 Merge pull request #11 from nbaars/master mayhew64 2015-07-25 17:13:41 -04:00
  • 29159b1c6d Merge pull request #48 from michaeldever/master from WebGoat-Legacy to WebGoat Nanne Baars 2015-07-25 17:58:24 +02:00
  • 482267129c Fixing Windows issue with goatRouter --> GoatRouter Nanne Baars 2015-07-25 17:43:54 +02:00
  • dfac438ec0 goatRouter --> GoatRouter.js is a problem on a Windows platform Nanne Baars 2015-07-25 17:43:05 +02:00
  • 7908bae11d Merge pull request #10 from misfir3/master misfir3 2015-07-13 09:04:25 -04:00
  • 9e787e96bc restoring READMe.txt Jason White 2015-07-13 09:02:26 -04:00
  • 858380e95b Merge pull request #9 from misfir3/master misfir3 2015-07-13 08:55:20 -04:00
  • fb191dcaac Merge pull request #8 from nbaars/master mayhew64 2015-07-12 22:45:35 -04:00
  • 1f14aa7c9b WEB-214: Fixed build failure while downloading javax.transaction dependency Nanne Baars 2015-07-12 12:16:59 +02:00
  • 7ace23ec0c additonal help control changes Jason White 2015-07-08 19:54:29 -04:00
  • 6312b1a08c Merge branch 'master' of github.com:misfir3/WebGoat Jason White 2015-07-01 20:01:14 -04:00
  • 354a1b935d Merge pull request #1 from WebGoat/master misfir3 2015-07-01 20:00:47 -04:00
  • ebfcdba3dd LessonHint code and more work toward LessonHelpControls Jason White 2015-07-01 19:19:24 -04:00
  • efc047b030 Added compiler version to pom.xml Nanne Baars 2015-07-01 22:36:34 +02:00
  • bcfc1be59c Merge remote-tracking branch 'upstream/master' Jason White 2015-06-28 18:08:06 -04:00
  • 998401a631 Plan, Source and Solution View (and models), initial stub for HelpControlsView Jason White 2015-06-26 18:05:21 -04:00
  • 3382ec8f8b include choice between relative path and reference with context root included Nanne Baars 2015-06-26 15:48:11 +02:00
  • 0bd7b76d98 Merge remote-tracking branch 'upstream/master' Nanne Baars 2015-06-26 11:07:58 +02:00
  • 21d450f320 Added a method so we can fetch the absolute path of a lesson Nanne Baars 2015-06-26 11:00:18 +02:00
  • 91eb9c1a8f Merge pull request #7 from nbaars/master mayhew64 2015-06-23 17:41:33 -04:00
  • df0034cbc2 Fixed rewriting paths in the jsp/js and css resources Nanne Baars 2015-06-23 22:56:56 +02:00
  • 1e7edc83ef Merge pull request #6 from nbaars/master mayhew64 2015-06-22 09:47:00 -04:00
  • 09cd0fcb3a fixed merge issue Nanne Baars 2015-06-22 13:38:58 +02:00
  • 9d6ae40665 Updated README for the new classloader module Nanne Baars 2015-06-22 13:24:27 +02:00
  • 08beac23b5 Added methods for retrieving the correct directory in which resources resided (like js, jsp etc) Nanne Baars 2015-06-22 13:13:48 +02:00
  • d1d31e158c Adding gitgnore Nanne Baars 2015-06-19 14:50:19 +02:00
  • bcad926986 Adding the release directory Nanne Baars 2015-06-19 14:47:58 +02:00
  • 896dc18a50 Adding the classloader directory Nanne Baars 2015-06-19 14:47:20 +02:00
  • d5e7977f05 Merge branch 'classloading' Nanne Baars 2015-06-19 13:53:37 +02:00
  • c71d774abf Fixed classloading issue when using a jsp in a lesson Nanne Baars 2015-06-14 13:20:27 +02:00
  • ba86d2d6d6 Merge remote-tracking branch 'upstream/master' Jason White 2015-06-18 18:18:18 -04:00
  • 226c9b9960 TitleView implemented. Need to add way to handle on route, not just click. Jason White 2015-06-18 18:17:51 -04:00
  • b01aef83f8 Merge pull request #5 from iammyr/patch-1 mayhew64 2015-06-17 08:49:16 -04:00
  • edc57f1b5a Instructions for manual deployment Myriam Leggieri 2015-06-17 10:00:03 +01:00
  • e6411f76a3 some clean up/ modifying comments Jason White 2015-06-10 21:35:43 -04:00
  • 68a22453a8 one more update Jason White 2015-06-09 22:43:13 -04:00
  • 35209fb3f9 minor change Jason White 2015-06-09 20:14:48 -04:00
  • d1f90e1a65 Update with instructions for UI fork Jason White 2015-06-09 20:13:52 -04:00
  • 471829c420 hooking forms with ajax callback, clean up Jason White 2015-06-05 16:58:56 -04:00
  • b6ed151e1d menu slide/Up Down working, other clean up Jason White 2015-06-05 12:57:13 -04:00
  • 5e47459962 more menu work Jason White 2015-06-05 10:04:22 -04:00
  • d362e0253b fix from previous commit/push that was out of sync Jason White 2015-06-05 00:04:41 -04:00
  • 219671061d increment commit on menu Jason White 2015-06-04 23:22:56 -04:00
  • c0aeaa25dc intial layin of lesson menu Jason White 2015-05-19 21:52:44 -04:00
  • 1c444ccdea Merge remote-tracking branch 'upstream/master' Jason White 2015-05-12 22:33:37 -04:00
  • 8aa4b8109f incremental progress on new UI code, mod to AbstractLesson for menu Jason White 2015-05-12 22:32:56 -04:00
  • 53c4ffc1cf update for client side routing menu links Jason White 2015-05-12 19:04:53 -04:00
  • a80313b26b Merge pull request #4 from nbaars/master mayhew64 2015-05-11 12:58:40 -04:00
  • c24f556544 Renamed the jar file Nanne Baars 2015-05-11 18:36:04 +03:00
  • f85132284f recent merge from upstream Jason White 2015-05-07 18:19:10 -04:00
  • 33dc855da7 merging from upstream Jason White 2015-05-07 18:15:47 -04:00
  • 717f4a3258 Merge pull request #3 from nbaars/fixing-classloader-issue mayhew64 2015-05-04 12:37:34 -04:00
  • 264824eb14 Fixed classloading issues when a lesson contains an inner class. The plugin classloader only expected the lesson to be loaded, now we keep track of all the classes loaded for each plugin. For each class found in the plugin a plugin classloader was created we need one classloader per plugin Nanne Baars 2015-05-04 15:25:28 +02:00
  • 6e8d8562d6 WEB-203 deprecated getCredits - credits moved to the about page mayhew64 2015-05-03 16:31:52 -04:00
  • 547fd36507 Merge pull request #2 from nbaars/master mayhew64 2015-05-03 07:27:32 -04:00
  • 7ce17e7404 Merge remote-tracking branch 'upstream/master' Nanne Baars 2015-05-03 07:56:35 +02:00
  • 6866208ca2 Changed pom.xml to also build a jar file and upload it to the repository Nanne Baars 2015-05-03 07:50:29 +02:00
  • 8a55a73a01 Update pom.xml mayhew64 2015-05-02 19:15:49 -04:00
  • 7a5c8083f5 recent changes, commit prior to merge Jason White 2015-04-25 22:12:52 -04:00
  • 22c4ed27e4 merging from upstream WebGoat Jason White 2015-04-24 07:04:30 -04:00
  • b0fc816fbf Merge pull request #1 from nbaars/master mayhew64 2015-04-23 16:09:48 -04:00
  • 1f4024d158 Initial cutover to backbone/underscore/require Jason White 2015-04-21 18:40:14 -04:00
  • 35c8c79138 Fixing pom warnings during maven build nbaars 2015-04-11 07:18:57 +02:00
  • b439c6100e Added error logging for missing lesson solution nbaars 2015-04-06 18:36:35 +02:00
  • edbb09250c Solution was no longer showing in WebGoat nbaars 2015-04-06 18:33:38 +02:00
  • 6116b8e368 Merge pull request #42 from nbaars/webgoat-container mayhew64 2015-03-06 08:25:28 -05:00
  • 3e9331d46e Refactoring creation of the lesson moving it towards the plugin nbaars 2015-03-01 15:59:42 +01:00
  • 4865a4b606 Solution and Java source are optional they don't need to be presnt in a plugin nbaars 2015-03-01 15:49:27 +01:00
  • b6257c0fbc Merge pull request #41 from nbaars/webgoat-container mayhew64 2015-02-27 13:19:34 -05:00
  • 6e25026391 Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container nbaars 2015-02-23 20:33:22 +01:00
  • a815692149 Added plugin_extracted to gitignore nbaars 2015-02-23 20:29:09 +01:00
  • f140669edf WEB-197 Images referenced in the plans are not changed by the plugin loader nbaars 2015-02-23 12:45:19 +01:00
  • 32b6ef9c53 Fixed WEB-198 Text of the lesson plan not above the assignment nbaars 2015-02-23 12:43:26 +01:00
  • 4c30957a2d Merge pull request #36 from WebGoat/legacy-loader mayhew64 2015-02-12 12:37:46 -05:00
  • cce6e2ff99 Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container nbaars 2015-02-11 17:46:48 +01:00
  • 6460314bcb Merge pull request #35 from nbaars/webgoat-container mayhew64 2015-02-10 19:03:38 -05:00
  • b447c2a119 WEB-183 Loading of Admin screens Bruce Mayhew 2015-02-10 15:54:25 -05:00
  • d9ef5fc2ce Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container nbaars 2015-02-10 16:23:07 +01:00
  • 450c0f673f Added separate log file for testing purposes nbaars 2015-02-10 14:56:02 +01:00
  • f6a839251a Merge pull request #34 from nbaars/webgoat-container mayhew64 2015-02-08 10:24:24 -05:00
  • bc21a86b68 Fixed hard coded rewriting of html files was fixed on SqlStringInjection Added testcases for this situation nbaars 2015-02-08 14:12:01 +01:00
  • 861f3e9d37 Moved loading to separate object. Added a unit test for loading the properties nbaars 2015-02-07 11:37:53 +01:00
  • 1d7ecb0627 moved global properties from lessons to container, added loading of global properties to course, updated SqlInjection lesson Bruce Mayhew 2015-02-06 08:49:06 -05:00
  • cbc58dc4fa Merge branch 'webgoat-container' of https://github.com/WebGoat/WebGoat into webgoat-container Bruce Mayhew 2015-01-28 07:02:26 -05:00
  • 887b81e1a4 removing residual plugin files for sql injection Bruce Mayhew 2015-01-28 06:58:41 -05:00
  • 6fc708a705 Merge pull request #33 from nbaars/webgoat-container mayhew64 2015-01-28 06:50:54 -05:00
  • 5d2019fb18 making the images work as well nbaars 2015-01-15 21:38:11 +01:00
  • 9b033a360a new lessons jar nbaars 2015-01-13 19:27:20 +01:00
  • b0619ef5db clean up course class nbaars 2015-01-11 18:52:55 +01:00
  • bb0d27d14b properties now correctly loaden nbaars 2015-01-10 10:43:00 +01:00
  • 2828e5143e restored local controller nbaars 2015-01-10 10:35:46 +01:00
  • 36ea6ad12d clean i18n directory when first time loading nbaars 2015-01-10 10:24:51 +01:00
  • 3d6236242f properties loaded from plugin nbaars 2015-01-10 10:12:08 +01:00
  • 3d8a345264 Added the resource bundles in the already present WebGoatLabels.properties temporary workaround nbaars 2015-01-07 17:34:33 +01:00
  • 744630ca4c Lesson source file, lesson plan and lesson solution are loaded from the plugin. nbaars 2015-01-07 13:45:27 +01:00