 Marcus Bointon
|
346e6f81e8
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# xml/RELEASE_NOTES.md
# xml/source/client_info.xml
# xml/source/snippets/company_info.xml
# xml/source/snippets/offerte/en/conditions.xml
# xml/source/snippets/offerte/en/crystal-box.xml
# xml/source/snippets/offerte/en/disclaimer.xml
# xml/source/snippets/offerte/en/disclaimer_code-audit.xml
# xml/source/snippets/offerte/en/examplewaiver.xml
# xml/source/snippets/offerte/en/grey-box.xml
# xml/source/snippets/offerte/en/introandscope.xml
# xml/source/snippets/offerte/en/introandscope_retest.xml
# xml/source/snippets/offerte/en/methodology_code-audit.xml
# xml/source/snippets/offerte/en/prerequisites_training.xml
# xml/source/snippets/offerte/en/projectoverview.xml
# xml/source/snippets/offerte/en/projectoverview_retest.xml
# xml/source/snippets/offerte/en/projectoverview_training.xml
# xml/source/snippets/offerte/en/teamandreporting.xml
# xml/xslt/auto.xslt
|
2017-04-13 11:26:29 +02:00 |
|
|
Marcus Bointon
|
c1eae6905d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# xml/RELEASE_NOTES.md
# xml/source/client_info.xml
# xml/source/snippets/company_info.xml
# xml/source/snippets/offerte/en/conditions.xml
# xml/source/snippets/offerte/en/crystal-box.xml
# xml/source/snippets/offerte/en/disclaimer.xml
# xml/source/snippets/offerte/en/disclaimer_code-audit.xml
# xml/source/snippets/offerte/en/examplewaiver.xml
# xml/source/snippets/offerte/en/grey-box.xml
# xml/source/snippets/offerte/en/introandscope.xml
# xml/source/snippets/offerte/en/introandscope_retest.xml
# xml/source/snippets/offerte/en/methodology_code-audit.xml
# xml/source/snippets/offerte/en/prerequisites_training.xml
# xml/source/snippets/offerte/en/projectoverview.xml
# xml/source/snippets/offerte/en/projectoverview_retest.xml
# xml/source/snippets/offerte/en/projectoverview_training.xml
# xml/source/snippets/offerte/en/teamandreporting.xml
# xml/xslt/auto.xslt
|
2017-04-13 11:26:29 +02:00 |
|
|
Marcus Bointon
|
004bacbe25
|
Update snippets when building a new doc
|
2017-04-13 11:25:12 +02:00 |
|
|
Marcus Bointon
|
30140c5bdd
|
Update snippets when building a new doc
|
2017-04-13 11:25:12 +02:00 |
|
 skyanth
|
2c73209516
|
implemented finding count placeholder (cont.)
|
2017-03-29 11:40:42 +02:00 |
|
|
skyanth
|
c346872da0
|
implemented finding count placeholder (cont.)
|
2017-03-29 11:40:42 +02:00 |
|
|
skyanth
|
964b655c84
|
implemented finding count placeholder
|
2017-03-29 11:40:12 +02:00 |
|
|
skyanth
|
40f1ecfb06
|
implemented finding count placeholder
|
2017-03-29 11:40:12 +02:00 |
|
|
skyanth
|
a401806ea1
|
allowed <code> in <pre> (oops)
|
2017-03-29 11:31:12 +02:00 |
|
|
skyanth
|
3f1efca457
|
allowed <code> in <pre> (oops)
|
2017-03-29 11:31:12 +02:00 |
|
 melanierieback
|
afa0d146c9
|
Update README.md
|
2017-03-28 13:41:27 +00:00 |
|
|
melanierieback
|
d6c998b797
|
Update README.md
|
2017-03-28 13:41:27 +00:00 |
|
|
melanierieback
|
405e4c7c64
|
Update README.md
|
2017-03-28 13:40:48 +00:00 |
|
|
melanierieback
|
ce5fa5778d
|
Update README.md
|
2017-03-28 13:40:48 +00:00 |
|
|
melanierieback
|
f9ae9b71c4
|
Update README.md
|
2017-03-28 13:40:16 +00:00 |
|
|
melanierieback
|
754d5be3e4
|
Update README.md
|
2017-03-28 13:40:16 +00:00 |
|
|
melanierieback
|
b9de456fb2
|
Update README.md
|
2017-03-28 13:38:54 +00:00 |
|
|
melanierieback
|
ae45256dff
|
Update README.md
|
2017-03-28 13:38:54 +00:00 |
|
 Peter Mosmans
|
262566e4fd
|
Implemented correct conversion for non-findings, closes #26
|
2017-03-24 20:43:33 +08:00 |
|
|
Peter Mosmans
|
def0931641
|
Implemented correct conversion for non-findings, closes #26
|
2017-03-24 20:43:33 +08:00 |
|
|
skyanth
|
ec49890e46
|
adding correct ratecard.xml
|
2017-03-21 14:11:14 +01:00 |
|
|
skyanth
|
b3bd339d08
|
adding correct ratecard.xml
|
2017-03-21 14:11:14 +01:00 |
|
|
skyanth
|
0e5b8f3837
|
Merge branch 'master' of https://github.com/radicallyopensecurity/pentext
|
2017-03-21 13:21:27 +01:00 |
|
|
skyanth
|
92b289e71d
|
Merge branch 'master' of https://github.com/radicallyopensecurity/pentext
|
2017-03-21 13:21:27 +01:00 |
|
|
skyanth
|
734cd9edd1
|
Updated readme with correct rate card info
|
2017-03-21 13:17:40 +01:00 |
|
|
skyanth
|
61a50a62ad
|
Updated readme with correct rate card info
|
2017-03-21 13:17:40 +01:00 |
|
|
skyanth
|
a308ec0497
|
Updated Rate Card text
|
2017-03-21 13:17:40 +01:00 |
|
|
skyanth
|
c2e3bbf6b3
|
Updated Rate Card text
|
2017-03-21 13:17:40 +01:00 |
|
|
skyanth
|
d563c15604
|
Added extra line to clarify invoice_extra_field
|
2017-03-21 13:17:40 +01:00 |
|
|
skyanth
|
45ba16705a
|
Added extra line to clarify invoice_extra_field
|
2017-03-21 13:17:40 +01:00 |
|
|
skyanth
|
30c4daad91
|
Added handler for rate cards
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
1e1cc54208
|
Added handler for rate cards
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
4b8c62caa2
|
added generate_average_rate placeholder
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
738f25ba16
|
added generate_average_rate placeholder
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
1ef199cde8
|
fixed space between ‘[N]’ and ‘-day’ in service desc
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
8ef13d9ffb
|
fixed space between ‘[N]’ and ‘-day’ in service desc
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
f31ba8d8ed
|
fixed ‘my’ namespace in result doc
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
8f7319f58f
|
fixed ‘my’ namespace in result doc
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
c40d42a609
|
Fixed retest quote language selector
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
6b7f465e1b
|
Fixed retest quote language selector
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
80f52bc4e3
|
Fixed ToC block attribute call
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
b25c4dd1d0
|
Fixed ToC block attribute call
|
2017-03-21 13:17:39 +01:00 |
|
|
skyanth
|
c327ce51f6
|
fixed ratecard.xml
|
2017-03-21 13:17:30 +01:00 |
|
|
skyanth
|
befad507b9
|
fixed ratecard.xml
|
2017-03-21 13:17:30 +01:00 |
|
|
skyanth
|
4c659f1acc
|
Implemented Rate Cards
|
2017-03-21 13:15:12 +01:00 |
|
|
skyanth
|
9d6b7f6e29
|
Implemented Rate Cards
|
2017-03-21 13:15:12 +01:00 |
|
|
skyanth
|
1ce4dea272
|
Updated readme with correct rate card info
|
2017-03-21 12:14:55 +01:00 |
|
|
skyanth
|
ab1b3423cf
|
Updated readme with correct rate card info
|
2017-03-21 12:14:55 +01:00 |
|
|
skyanth
|
9425242a81
|
Updated Rate Card text
|
2017-03-21 11:20:38 +01:00 |
|
|
skyanth
|
5f532cc158
|
Updated Rate Card text
|
2017-03-21 11:20:38 +01:00 |
|