305 Commits

Author SHA1 Message Date
Nanne Baars
dfac438ec0 goatRouter --> GoatRouter.js is a problem on a Windows platform 2015-07-25 17:43:05 +02:00
misfir3
858380e95b Merge pull request #9 from misfir3/master
Initial cut-over of backbone port
2015-07-13 08:55:20 -04:00
Jason White
7ace23ec0c additonal help control changes 2015-07-08 19:54:29 -04:00
Jason White
ebfcdba3dd LessonHint code and more work toward LessonHelpControls 2015-07-01 19:19:24 -04:00
Jason White
bcfc1be59c Merge remote-tracking branch 'upstream/master' 2015-06-28 18:08:06 -04:00
Jason White
998401a631 Plan, Source and Solution View (and models), initial stub for HelpControlsView 2015-06-26 18:05:21 -04:00
Nanne Baars
3382ec8f8b include choice between relative path and reference with context root included 2015-06-26 15:49:17 +02:00
Nanne Baars
21d450f320 Added a method so we can fetch the absolute path of a lesson 2015-06-26 11:00:18 +02:00
Nanne Baars
df0034cbc2 Fixed rewriting paths in the jsp/js and css resources 2015-06-23 22:56:56 +02:00
Nanne Baars
08beac23b5 Added methods for retrieving the correct directory in which resources resided (like js, jsp etc) 2015-06-22 13:13:48 +02:00
Nanne Baars
c71d774abf Fixed classloading issue when using a jsp in a lesson 2015-06-19 13:52:43 +02:00
Jason White
226c9b9960 TitleView implemented. Need to add way to handle on route, not just click. 2015-06-18 18:17:51 -04:00
Jason White
e6411f76a3 some clean up/ modifying comments 2015-06-10 21:35:43 -04:00
Jason White
471829c420 hooking forms with ajax callback, clean up 2015-06-05 16:58:56 -04:00
Jason White
b6ed151e1d menu slide/Up Down working, other clean up 2015-06-05 12:57:13 -04:00
Jason White
5e47459962 more menu work 2015-06-05 10:04:22 -04:00
Jason White
d362e0253b fix from previous commit/push that was out of sync 2015-06-05 00:04:41 -04:00
Jason White
219671061d increment commit on menu 2015-06-04 23:22:56 -04:00
Jason White
c0aeaa25dc intial layin of lesson menu 2015-05-19 21:52:44 -04:00
Jason White
8aa4b8109f incremental progress on new UI code, mod to AbstractLesson for menu 2015-05-12 22:32:56 -04:00
Jason White
53c4ffc1cf update for client side routing menu links 2015-05-12 19:04:53 -04:00
Jason White
f85132284f recent merge from upstream 2015-05-07 18:19:10 -04:00
Jason White
33dc855da7 merging from upstream
Merge remote-tracking branch 'upstream/master'
2015-05-07 18:15:47 -04:00
Nanne Baars
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
Also needed to rewrite the findClass method to lookup the class in the list instead of loading the class from the byte array.
2015-05-04 15:25:28 +02:00
mayhew64
6e8d8562d6 WEB-203 deprecated getCredits - credits moved to the about page 2015-05-03 16:31:52 -04:00
Nanne Baars
6866208ca2 Changed pom.xml to also build a jar file and upload it to the repository 2015-05-03 07:50:29 +02:00
Jason White
7a5c8083f5 recent changes, commit prior to merge 2015-04-25 22:12:52 -04:00
Jason White
22c4ed27e4 merging from upstream WebGoat
Merge remote-tracking branch 'upstream/master'
2015-04-24 07:04:30 -04:00
Jason White
1f4024d158 Initial cutover to backbone/underscore/require 2015-04-21 18:40:14 -04:00
nbaars
b439c6100e Added error logging for missing lesson solution 2015-04-06 18:45:13 +02:00
nbaars
edbb09250c Solution was no longer showing in WebGoat 2015-04-06 18:33:38 +02:00
nbaars
3e9331d46e Refactoring creation of the lesson moving it towards the plugin 2015-03-01 15:59:42 +01:00
nbaars
4865a4b606 Solution and Java source are optional they don't need to be presnt in a plugin 2015-03-01 15:49:27 +01:00
nbaars
6e25026391 Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container
Conflicts:
	src/main/java/org/owasp/webgoat/session/Course.java
2015-02-23 20:33:22 +01:00
nbaars
f140669edf WEB-197 Images referenced in the plans are not changed by the plugin loader 2015-02-23 12:45:19 +01:00
nbaars
32b6ef9c53 Fixed WEB-198 Text of the lesson plan not above the assignment 2015-02-23 12:43:26 +01:00
mayhew64
4c30957a2d Merge pull request #36 from WebGoat/legacy-loader
WEB-183 Loading of Admin screens
Nanne +1'd
2015-02-12 12:37:46 -05:00
Bruce Mayhew
b447c2a119 WEB-183 Loading of Admin screens 2015-02-10 15:54:25 -05:00
nbaars
450c0f673f Added separate log file for testing purposes 2015-02-10 14:56:02 +01:00
nbaars
bc21a86b68 Fixed hard coded rewriting of html files was fixed on SqlStringInjection
Added testcases for this situation
2015-02-08 14:12:01 +01:00
nbaars
861f3e9d37 Moved loading to separate object. Added a unit test for loading the properties 2015-02-07 12:40:17 +01:00
Bruce Mayhew
1d7ecb0627 moved global properties from lessons to container, added loading of global properties to course, updated SqlInjection lesson 2015-02-06 08:49:06 -05:00
Bruce Mayhew
cbc58dc4fa Merge branch 'webgoat-container' of https://github.com/WebGoat/WebGoat into webgoat-container 2015-01-28 07:02:26 -05:00
Bruce Mayhew
887b81e1a4 removing residual plugin files for sql injection 2015-01-28 06:58:41 -05:00
nbaars
5d2019fb18 making the images work as well 2015-01-15 21:38:11 +01:00
nbaars
9b033a360a new lessons jar 2015-01-13 19:27:20 +01:00
nbaars
b0619ef5db clean up course class 2015-01-11 18:52:55 +01:00
nbaars
bb0d27d14b properties now correctly loaden 2015-01-10 10:43:00 +01:00
nbaars
2828e5143e restored local controller 2015-01-10 10:35:46 +01:00
nbaars
36ea6ad12d clean i18n directory when first time loading 2015-01-10 10:24:51 +01:00