|
|
1c444ccdea
|
Merge remote-tracking branch 'upstream/master'
|
2015-05-12 22:33:37 -04:00 |
|
|
|
8aa4b8109f
|
incremental progress on new UI code, mod to AbstractLesson for menu
|
2015-05-12 22:32:56 -04:00 |
|
|
|
53c4ffc1cf
|
update for client side routing menu links
|
2015-05-12 19:04:53 -04:00 |
|
|
|
a80313b26b
|
Merge pull request #4 from nbaars/master
Renamed the jar file
|
2015-05-11 12:58:40 -04:00 |
|
|
|
c24f556544
|
Renamed the jar file
|
2015-05-11 18:38:54 +03:00 |
|
|
|
f85132284f
|
recent merge from upstream
|
2015-05-07 18:19:10 -04:00 |
|
|
|
33dc855da7
|
merging from upstream
Merge remote-tracking branch 'upstream/master'
|
2015-05-07 18:15:47 -04:00 |
|
|
|
717f4a3258
|
Merge pull request #3 from nbaars/fixing-classloader-issue
Fixed classloading issues when a lesson contains an inner class. The plu...
|
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
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 |
|
|
|
6e8d8562d6
|
WEB-203 deprecated getCredits - credits moved to the about page
|
2015-05-03 16:31:52 -04:00 |
|
|
|
547fd36507
|
Merge pull request #2 from nbaars/master
Generate separate jar file to use in the lessons project
|
2015-05-03 07:27:32 -04:00 |
|
|
|
7ce17e7404
|
Merge remote-tracking branch 'upstream/master'
|
2015-05-03 07:56:35 +02:00 |
|
|
|
6866208ca2
|
Changed pom.xml to also build a jar file and upload it to the repository
|
2015-05-03 07:50:29 +02:00 |
|
|
|
8a55a73a01
|
Update pom.xml
Change the artifact to be lower case; web goat-container vs WebGoat-Container
|
2015-05-02 19:15:49 -04:00 |
|
|
|
7a5c8083f5
|
recent changes, commit prior to merge
|
2015-04-25 22:12:52 -04:00 |
|
|
|
22c4ed27e4
|
merging from upstream WebGoat
Merge remote-tracking branch 'upstream/master'
|
2015-04-24 07:04:30 -04:00 |
|
|
|
b0fc816fbf
|
Merge pull request #1 from nbaars/master
Bug fix: lesson solution not showing
|
2015-04-23 16:09:48 -04:00 |
|
|
|
1f4024d158
|
Initial cutover to backbone/underscore/require
|
2015-04-21 18:40:14 -04:00 |
|
|
|
35c8c79138
|
Fixing pom warnings during maven build
|
2015-04-11 07:18:57 +02:00 |
|
|
|
b439c6100e
|
Added error logging for missing lesson solution
|
2015-04-06 18:45:13 +02:00 |
|
|
|
edbb09250c
|
Solution was no longer showing in WebGoat
|
2015-04-06 18:33:38 +02:00 |
|
|
|
6116b8e368
|
Merge pull request #42 from nbaars/webgoat-container
Webgoat container
|
2015-03-06 08:25:28 -05:00 |
|
|
|
3e9331d46e
|
Refactoring creation of the lesson moving it towards the plugin
|
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
|
2015-03-01 15:49:27 +01:00 |
|
|
|
b6257c0fbc
|
Merge pull request #41 from nbaars/webgoat-container
Webgoat container
|
2015-02-27 13:19:34 -05:00 |
|
|
|
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 |
|
|
|
a815692149
|
Added plugin_extracted to gitignore
|
2015-02-23 20:29:09 +01:00 |
|
|
|
f140669edf
|
WEB-197 Images referenced in the plans are not changed by the plugin loader
|
2015-02-23 12:45:19 +01:00 |
|
|
|
32b6ef9c53
|
Fixed WEB-198 Text of the lesson plan not above the assignment
|
2015-02-23 12:43:26 +01:00 |
|
|
|
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 |
|
|
|
cce6e2ff99
|
Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container
|
2015-02-11 17:46:48 +01:00 |
|
|
|
6460314bcb
|
Merge pull request #35 from nbaars/webgoat-container
Added separate log file for testing purposes
|
2015-02-10 19:03:38 -05:00 |
|
|
|
b447c2a119
|
WEB-183 Loading of Admin screens
|
2015-02-10 15:54:25 -05:00 |
|
|
|
d9ef5fc2ce
|
Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container
|
2015-02-10 16:23:07 +01:00 |
|
|
|
450c0f673f
|
Added separate log file for testing purposes
|
2015-02-10 14:56:02 +01:00 |
|
|
|
f6a839251a
|
Merge pull request #34 from nbaars/webgoat-container
This looks good. Nice improvements
|
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
|
2015-02-08 14:12:01 +01:00 |
|
|
|
861f3e9d37
|
Moved loading to separate object. Added a unit test for loading the properties
|
2015-02-07 12:40:17 +01:00 |
|
|
|
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 |
|
|
|
cbc58dc4fa
|
Merge branch 'webgoat-container' of https://github.com/WebGoat/WebGoat into webgoat-container
|
2015-01-28 07:02:26 -05:00 |
|
|
|
887b81e1a4
|
removing residual plugin files for sql injection
|
2015-01-28 06:58:41 -05:00 |
|
|
|
6fc708a705
|
Merge pull request #33 from nbaars/webgoat-container
Webgoat container
|
2015-01-28 06:50:54 -05:00 |
|
|
|
5d2019fb18
|
making the images work as well
|
2015-01-15 21:38:11 +01:00 |
|
|
|
9b033a360a
|
new lessons jar
|
2015-01-13 19:27:20 +01:00 |
|
|
|
b0619ef5db
|
clean up course class
|
2015-01-11 18:52:55 +01:00 |
|
|
|
bb0d27d14b
|
properties now correctly loaden
|
2015-01-10 10:43:00 +01:00 |
|
|
|
2828e5143e
|
restored local controller
|
2015-01-10 10:35:46 +01:00 |
|
|
|
36ea6ad12d
|
clean i18n directory when first time loading
|
2015-01-10 10:24:51 +01:00 |
|
|
|
3d6236242f
|
properties loaded from plugin
|
2015-01-10 10:12:08 +01:00 |
|
|
|
3d8a345264
|
Added the resource bundles in the already present WebGoatLabels.properties temporary workaround
|
2015-01-07 17:34:33 +01:00 |
|
