Jason White
|
a36697bf0d
|
Merge remote-tracking branch 'upstream/master'
|
2015-08-19 05:34:39 -04:00 |
|
Jason White
|
1d70da301e
|
initial cut of paramView re-enabled
|
2015-08-19 05:34:08 -04:00 |
|
mayhew64
|
ef9a30b72a
|
Merge pull request #18 from dougmorato/master
Removing doc directory which contained 6 year old stale files
|
2015-08-15 14:13:10 -04:00 |
|
Douglas Morato
|
fba88af9b3
|
Removing doc directory which contained 6 year old stale files
|
2015-08-14 20:28:39 -04:00 |
|
misfir3
|
fb871d3040
|
Merge pull request #17 from silicakes/master
First pull request, minor fix
|
2015-08-14 12:54:22 -04:00 |
|
Michael Katz
|
d13d8166bc
|
removed redundant require call
|
2015-08-14 17:25:55 +03:00 |
|
Michael Katz
|
68d952eb5d
|
fixed a global scope issue on LessonController | fixed the listenTo yntax for goatRouter.js
|
2015-08-14 17:24:34 +03:00 |
|
misfir3
|
8330d411e3
|
Merge pull request #16 from misfir3/master
cookie view re-enabled, going ahead with pull
|
2015-08-13 21:54:32 -04:00 |
|
Jason White
|
1351f0e6a2
|
cookie view re-enabled
|
2015-08-13 21:46:13 -04:00 |
|
Nanne Baars
|
da5a63453b
|
Removed webgoat-release from parent pom
|
2015-08-11 22:10:51 +02:00 |
|
Nanne Baars
|
33b51dd6db
|
Fixed travis setup
|
2015-08-11 22:00:14 +02:00 |
|
Nanne Baars
|
42f373d66a
|
Moved Maven multiproject setup
|
2015-08-11 21:57:12 +02:00 |
|
Nanne Baars
|
28a2d01ba3
|
Moved extra dependencies of tomcat plugin to right place
Updated documentation
|
2015-08-11 07:40:37 +02:00 |
|
Nanne Baars
|
2c55ec5747
|
Fixed Travis-CI script
|
2015-08-09 13:46:21 +02:00 |
|
Nanne Baars
|
d207ee8849
|
Switch to JDK7
|
2015-08-09 13:45:22 +02:00 |
|
Nanne Baars
|
da68feb3f2
|
Fixed build for Travis-CI
|
2015-08-09 13:26:44 +02:00 |
|
Nanne Baars
|
9be61ad869
|
First attempt with Travis CI
|
2015-08-09 09:54:13 +02:00 |
|
Nanne Baars
|
87a621fa27
|
Merge remote-tracking branch 'upstream/master'
|
2015-08-09 07:46:43 +02:00 |
|
misfir3
|
f0ec42a4a0
|
Merge pull request #15 from misfir3/master
Incremental UI changes - Merging to main repository
|
2015-08-05 19:04:02 -04:00 |
|
Jason White
|
2b37e88d94
|
hints working, restar working and complete decorations (still need to wire up menu update on lesson completion)
|
2015-08-04 19:32:27 -04:00 |
|
Nanne Baars
|
0d79d74ef8
|
plugin_extracted directory should be created if it does not exists
|
2015-08-04 19:57:08 +02:00 |
|
Nanne Baars
|
abaa8ac1de
|
Applied the changes to README.txt to README.MD
|
2015-07-31 06:24:45 +02:00 |
|
mayhew64
|
d92b9436c1
|
Update README.MD
|
2015-07-31 00:35:22 +02:00 |
|
Jeff
|
a79c374233
|
WEB-204 fixes based on review
|
2015-07-31 00:34:45 +02:00 |
|
Jeff
|
1d429b6ab9
|
WEB-204 additonal fix.
|
2015-07-31 00:34:22 +02:00 |
|
Jeff
|
f36eaede45
|
WEB-204 Syntax fix.
|
2015-07-31 00:34:00 +02:00 |
|
Jeff
|
c6d258795e
|
WEB-204 minor change.
|
2015-07-31 00:33:34 +02:00 |
|
Jeff
|
af26543cf2
|
WEB-204 updated readme with MD syntax. Removed .txt file.
Conflicts:
README.txt
|
2015-07-31 00:32:30 +02:00 |
|
Nanne Baars
|
48f16d4638
|
Added UserDatabase.mv.db to .gitignore
|
2015-07-30 23:59:42 +02:00 |
|
Jason White
|
fc6151f767
|
Merge remote-tracking branch 'upstream/master'
|
2015-07-26 16:49:00 -04:00 |
|
Jason White
|
5590d07419
|
initial re-enabling of help buttons (source/plan/solution at least). Still need styling work etc.
|
2015-07-26 09:51:49 +02:00 |
|
Jason White
|
f5227f4b6b
|
initial re-enabling of help buttons (source/plan/solution at least). Still need styling work etc.
|
2015-07-26 01:30:24 -04:00 |
|
mayhew64
|
c31f60f5d9
|
Merge pull request #11 from nbaars/master
Merge pull request #48 from michaeldever/master
|
2015-07-25 17:13:41 -04:00 |
|
Nanne Baars
|
29159b1c6d
|
Merge pull request #48 from michaeldever/master from WebGoat-Legacy to WebGoat
|
2015-07-25 17:58:24 +02:00 |
|
Nanne Baars
|
482267129c
|
Fixing Windows issue with goatRouter --> GoatRouter
|
2015-07-25 17:44:25 +02:00 |
|
Nanne Baars
|
dfac438ec0
|
goatRouter --> GoatRouter.js is a problem on a Windows platform
|
2015-07-25 17:43:05 +02:00 |
|
misfir3
|
7908bae11d
|
Merge pull request #10 from misfir3/master
restoring READMe.txt
|
2015-07-13 09:04:25 -04:00 |
|
Jason White
|
9e787e96bc
|
restoring READMe.txt
|
2015-07-13 09:02:26 -04:00 |
|
misfir3
|
858380e95b
|
Merge pull request #9 from misfir3/master
Initial cut-over of backbone port
|
2015-07-13 08:55:20 -04:00 |
|
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 |
|