Jason White
ab29afec3c
code cleanup
2015-10-24 13:15:14 -05:00
Jason White
fc2360b49b
#41 ... one more
2015-10-24 13:12:44 -05:00
Doug Morato
2c7b4fbc96
Merge pull request #120 from dougmorato/master
...
Copy whole target folder, not just individual file
2015-10-24 14:12:26 -04:00
Doug Morato
e4b6ed0244
Copy whole target folder, not just individual file
...
Instead of copying jar/war artifact individually, copy the whole target folder to the "Deployable Artifacts", which will then be uploaded to Amazon S3
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 14:11:37 -04:00
Jason White
e3df816fb9
#41 omitted on earlier commit
2015-10-24 13:10:43 -05:00
Doug Morato
d7ef02b06a
Merge pull request #119 from misfir3/master
...
Code cleanup and menu spinner
2015-10-24 13:49:33 -04:00
Jason White
45db051f30
removing redundant line, adding hasPlan to special challenge case handling
2015-10-24 11:45:49 -05:00
Jason White
d52dfe87c4
Merge remote-tracking branch 'upstream/master'
2015-10-24 09:12:02 -05:00
Jason White
3c1336a033
#41 : spinner implemented for menu loading
2015-10-23 15:15:57 -05:00
Nanne
7648369dfd
Merge pull request #117 from nbaars/master
...
Logging in sometimes goes to report card and misses category-menu #114
2015-10-23 07:02:21 +02:00
Nanne Baars
060b0cd8fa
Logging in sometimes goes to report card and misses category-menu #114
2015-10-23 06:54:14 +02:00
Doug Morato
ff9bae6290
Merge pull request #116 from dougmorato/master
...
Copy output and target info upload to S3 folder
2015-10-22 19:10:48 -04:00
Doug Morato
010a67744c
Copy output and target info upload to S3 folder
...
Instead of moving the the jar and war files from target, copy these files and the target direcotry into the WEBGOAT_ARTIFACTS_FOLDER so it's all uploaded to S3
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-22 18:51:43 -04:00
Jason White
648bd3bb95
code cleanup
2015-10-22 16:55:18 -05:00
Doug Morato
36aebbe68c
Merge pull request #115 from span/close-button
...
Fix #81 to activate close button in the modal footer
2015-10-22 16:32:32 -04:00
Daniel Kvist
c1e836360f
Fix #81 to activate close button in the modal footer
2015-10-22 22:14:09 +02:00
Doug Morato
be0dc297e7
Merge pull request #113 from span/deployment-descriptor
...
Fix #112 deployment descriptor elements in wrong order
2015-10-21 16:25:59 -04:00
Daniel Kvist
325b964559
Fix #112 deployment descriptor elements in wrong order and off white spacing
2015-10-21 21:57:35 +02:00
Doug Morato
70ab7edbf1
Merge pull request #111 from misfir3/master
...
#103 : removing ace directory, not in use
2015-10-21 11:40:53 -04:00
Jason White
28ea340307
#103 : removing ace directory, not in use
2015-10-21 11:11:43 -04:00
Nanne
1752df894e
Merge pull request #110 from nbaars/master
...
The jar snapshot doesn't run #108 (2)
2015-10-07 22:52:26 +02:00
Nanne Baars
f6c2c4bacb
The jar snapshot doesn't run #108 (2)
2015-10-07 22:47:39 +02:00
Nanne
3c1cc87035
Merge pull request #109 from nbaars/master
...
The jar snapshot doesn't run #108
2015-10-07 22:27:04 +02:00
Nanne Baars
316771fde3
The jar snapshot doesn't run #108
2015-10-07 22:19:46 +02:00
mayhew64
7bdfb54ea1
Merge pull request #106 from nbaars/master
...
Removed credits from lessons
2015-10-07 08:08:41 -04:00
Nanne Baars
e1829e209c
Implemented lesson information which gives a mapping between the menu and the actual WebGoat-Lessons project.
2015-10-04 11:56:12 +02:00
Nanne Baars
a6a1b32939
Removed credits from lessons
2015-10-03 18:21:54 +02:00
mayhew64
16b8eeb439
Merge pull request #105 from nbaars/master
...
Fixed classloading issues with Goathills lessons
2015-10-01 16:52:50 -04:00
Nanne Baars
487bc71df1
Moved the logic to the plugin loader which makes the context listener obsolete
2015-09-30 23:08:10 +02:00
Nanne Baars
219b38315b
Make sure WEB-INF/lib dir is available
2015-09-30 19:10:33 +02:00
Nanne Baars
2ca5dda37b
Reloading finished
2015-09-30 19:03:49 +02:00
Nanne Baars
6a00d66f8b
Plugins are now reloaded
2015-09-29 21:41:36 +02:00
Nanne Baars
33d251a147
Fixed goathills lesson with JSP now load correctly again(2)
2015-09-29 20:39:09 +02:00
Nanne Baars
c59e253606
Merge remote-tracking branch 'upstream/master'
2015-09-28 23:30:30 +02:00
Nanne Baars
d4450da5d7
Fixed goathills lesson with JSP now load correctly again
2015-09-28 23:27:58 +02:00
mayhew64
49c7fb7871
Merge pull request #102 from nbaars/master
...
i8n highlighting #96
2015-09-25 12:40:54 -04:00
Nanne Baars
c0d727d1f2
Merge remote-tracking branch 'upstream/master'
2015-09-24 10:09:38 +02:00
Nanne Baars
86e4fd1c85
i8n highlighting #96
2015-09-24 10:09:07 +02:00
mayhew64
77f3c5135f
Merge pull request #101 from misfir3/master
...
#97 , updating controls for hints, source, solution and plans on lessons
2015-09-23 10:00:12 -04:00
mayhew64
5adf3a45c2
Merge pull request #99 from nbaars/master
...
Button to force plugin reloading #93
2015-09-23 09:57:58 -04:00
Jason White
1bd6a9e0e7
#97 , updating controls for hints, source, solution and plans on lessons in challenge roles
2015-09-23 09:01:45 -04:00
Nanne Baars
9218a0dbb0
Updated the README.MD with reloading functionality of plugins
2015-09-22 21:17:09 +02:00
Nanne Baars
87d196c427
Return indication that plugins have been reloaded
2015-09-22 21:13:41 +02:00
Nanne Baars
6f8befd9a4
Merge remote-tracking branch 'upstream/master'
2015-09-22 20:40:02 +02:00
Nanne Baars
8d2771c108
Adding the ability to reload plugins directly from the interface instead of restarting Tomcat
2015-09-22 20:38:19 +02:00
Doug Morato
e13c959990
Merge pull request #98 from misfir3/master
...
#97 , Hint controls for CHALLENGE Category lessons
2015-09-22 13:00:34 -04:00
Jason White
dc57827cfc
#97 , Hint controls for CHALLENGE Category lessons
2015-09-21 21:24:10 -04:00
mayhew64
e625c445c5
Merge pull request #94 from misfir3/master
...
#23 , #24 - LessonInfo Service now used for TitleView and HelpControsView
2015-09-21 08:28:00 -04:00
Jason White
6e670c4ac5
#23 , #24 - LessonInfo Service now used for TitleView and HelpControlsView
2015-09-20 00:09:38 -04:00
mayhew64
aaa66cbc63
Merge pull request #88 from nbaars/master
...
Properties are appended when loading plugins (#29 )
2015-09-19 05:59:56 -04:00
