mayhew64
fb191dcaac
Merge pull request #8 from nbaars/master
...
Added a method so we can fetch the absolute path of a lesson
2015-07-12 22:45:35 -04:00
Nanne Baars
1f14aa7c9b
WEB-214: Fixed build failure while downloading javax.transaction dependency
...
Conflicts:
.gitignore
2015-07-12 12:30:54 +02:00
Jason White
7ace23ec0c
additonal help control changes
2015-07-08 19:54:29 -04:00
Jason White
6312b1a08c
Merge branch 'master' of github.com:misfir3/WebGoat
2015-07-01 20:01:14 -04:00
misfir3
354a1b935d
Merge pull request #1 from WebGoat/master
...
manually creating pull request from WebGoat Master to my fork
2015-07-01 20:00:47 -04:00
Jason White
ebfcdba3dd
LessonHint code and more work toward LessonHelpControls
2015-07-01 19:19:24 -04:00
Nanne Baars
efc047b030
Added compiler version to pom.xml
2015-07-01 22:36:34 +02: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
0bd7b76d98
Merge remote-tracking branch 'upstream/master'
2015-06-26 11:07:58 +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
mayhew64
91eb9c1a8f
Merge pull request #7 from nbaars/master
...
Fixed rewriting paths in the jsp/js and css resources
2015-06-23 17:41:33 -04:00
Nanne Baars
df0034cbc2
Fixed rewriting paths in the jsp/js and css resources
2015-06-23 22:56:56 +02:00
mayhew64
1e7edc83ef
Merge pull request #6 from nbaars/master
...
Classloader introduced
2015-06-22 09:47:00 -04:00
Nanne Baars
09cd0fcb3a
fixed merge issue
2015-06-22 13:38:58 +02:00
Nanne Baars
9d6ae40665
Updated README for the new classloader module
2015-06-22 13:24:27 +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
d1d31e158c
Adding gitgnore
2015-06-19 14:50:19 +02:00
Nanne Baars
bcad926986
Adding the release directory
2015-06-19 14:47:58 +02:00
Nanne Baars
896dc18a50
Adding the classloader directory
2015-06-19 14:47:20 +02:00
Nanne Baars
d5e7977f05
Merge branch 'classloading'
2015-06-19 13:53:37 +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
ba86d2d6d6
Merge remote-tracking branch 'upstream/master'
2015-06-18 18:18:18 -04: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
mayhew64
b01aef83f8
Merge pull request #5 from iammyr/patch-1
...
Instructions for manual deployment
2015-06-17 08:49:16 -04:00
Myriam Leggieri
edc57f1b5a
Instructions for manual deployment
...
Include instructions for developers on how to manually deploy the project in tomcat. In particular, it wouldn't be immediate otherwise, to figure out that it is necessary to clone WebGoat-Lessons first. Otherwise the app would be stuck on the login page.
2015-06-17 10:00:03 +01:00
Jason White
e6411f76a3
some clean up/ modifying comments
2015-06-10 21:35:43 -04:00
Jason White
68a22453a8
one more update
2015-06-09 22:43:13 -04:00
Jason White
35209fb3f9
minor change
2015-06-09 20:14:48 -04:00
Jason White
d1f90e1a65
Update with instructions for UI fork
2015-06-09 20:13:52 -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
1c444ccdea
Merge remote-tracking branch 'upstream/master'
2015-05-12 22:33:37 -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
mayhew64
a80313b26b
Merge pull request #4 from nbaars/master
...
Renamed the jar file
2015-05-11 12:58:40 -04:00
Nanne Baars
c24f556544
Renamed the jar file
2015-05-11 18:38:54 +03: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
mayhew64
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
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
mayhew64
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
Nanne Baars
7ce17e7404
Merge remote-tracking branch 'upstream/master'
2015-05-03 07:56:35 +02: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
