Commit Graph

2919 Commits

Author SHA1 Message Date
9be61ad869 First attempt with Travis CI 2015-08-09 09:54:13 +02:00
87a621fa27 Merge remote-tracking branch 'upstream/master' 2015-08-09 07:46:43 +02:00
f0ec42a4a0 Merge pull request #15 from misfir3/master
Incremental UI changes - Merging to main repository
2015-08-05 19:04:02 -04:00
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
0d79d74ef8 plugin_extracted directory should be created if it does not exists 2015-08-04 19:57:08 +02:00
abaa8ac1de Applied the changes to README.txt to README.MD 2015-07-31 06:24:45 +02:00
d92b9436c1 Update README.MD 2015-07-31 00:35:22 +02:00
a79c374233 WEB-204 fixes based on review 2015-07-31 00:34:45 +02:00
1d429b6ab9 WEB-204 additonal fix. 2015-07-31 00:34:22 +02:00
f36eaede45 WEB-204 Syntax fix. 2015-07-31 00:34:00 +02:00
c6d258795e WEB-204 minor change. 2015-07-31 00:33:34 +02:00
af26543cf2 WEB-204 updated readme with MD syntax. Removed .txt file.
Conflicts:
	README.txt
2015-07-31 00:32:30 +02:00
48f16d4638 Added UserDatabase.mv.db to .gitignore 2015-07-30 23:59:42 +02:00
fc6151f767 Merge remote-tracking branch 'upstream/master' 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. 2015-07-26 09:51:49 +02:00
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
c31f60f5d9 Merge pull request #11 from nbaars/master
Merge pull request #48 from michaeldever/master
2015-07-25 17:13:41 -04:00
29159b1c6d Merge pull request #48 from michaeldever/master from WebGoat-Legacy to WebGoat 2015-07-25 17:58:24 +02:00
482267129c Fixing Windows issue with goatRouter --> GoatRouter 2015-07-25 17:44:25 +02:00
dfac438ec0 goatRouter --> GoatRouter.js is a problem on a Windows platform 2015-07-25 17:43:05 +02:00
7908bae11d Merge pull request #10 from misfir3/master
restoring READMe.txt
2015-07-13 09:04:25 -04:00
9e787e96bc restoring READMe.txt 2015-07-13 09:02:26 -04:00
858380e95b Merge pull request #9 from misfir3/master
Initial cut-over of backbone port
2015-07-13 08:55:20 -04:00
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
1f14aa7c9b WEB-214: Fixed build failure while downloading javax.transaction dependency
Conflicts:
	.gitignore
2015-07-12 12:30:54 +02:00
7ace23ec0c additonal help control changes 2015-07-08 19:54:29 -04:00
6312b1a08c Merge branch 'master' of github.com:misfir3/WebGoat 2015-07-01 20:01:14 -04:00
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
ebfcdba3dd LessonHint code and more work toward LessonHelpControls 2015-07-01 19:19:24 -04:00
efc047b030 Added compiler version to pom.xml 2015-07-01 22:36:34 +02:00
bcfc1be59c Merge remote-tracking branch 'upstream/master' 2015-06-28 18:08:06 -04:00
998401a631 Plan, Source and Solution View (and models), initial stub for HelpControlsView 2015-06-26 18:05:21 -04:00
3382ec8f8b include choice between relative path and reference with context root included 2015-06-26 15:49:17 +02:00
0bd7b76d98 Merge remote-tracking branch 'upstream/master' 2015-06-26 11:07:58 +02:00
21d450f320 Added a method so we can fetch the absolute path of a lesson 2015-06-26 11:00:18 +02:00
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
df0034cbc2 Fixed rewriting paths in the jsp/js and css resources 2015-06-23 22:56:56 +02:00
1e7edc83ef Merge pull request #6 from nbaars/master
Classloader introduced
2015-06-22 09:47:00 -04:00
09cd0fcb3a fixed merge issue 2015-06-22 13:38:58 +02:00
9d6ae40665 Updated README for the new classloader module 2015-06-22 13:24:27 +02:00
08beac23b5 Added methods for retrieving the correct directory in which resources resided (like js, jsp etc) 2015-06-22 13:13:48 +02:00
d1d31e158c Adding gitgnore 2015-06-19 14:50:19 +02:00
bcad926986 Adding the release directory 2015-06-19 14:47:58 +02:00
896dc18a50 Adding the classloader directory 2015-06-19 14:47:20 +02:00
d5e7977f05 Merge branch 'classloading' 2015-06-19 13:53:37 +02:00
c71d774abf Fixed classloading issue when using a jsp in a lesson 2015-06-19 13:52:43 +02:00
ba86d2d6d6 Merge remote-tracking branch 'upstream/master' 2015-06-18 18:18:18 -04:00
226c9b9960 TitleView implemented. Need to add way to handle on route, not just click. 2015-06-18 18:17:51 -04:00
b01aef83f8 Merge pull request #5 from iammyr/patch-1
Instructions for manual deployment
2015-06-17 08:49:16 -04:00
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