Commit Graph

15 Commits

Author SHA1 Message Date
6d777cd9f5 ... 2017-05-30 16:17:39 +02:00
47476ca025 Merge branch 'rel_1.x' of https://github.com/d3datadevelopment/TPL-development-helper into rel_1.x
# Conflicts:
#	copy_this/modules/d3/d3dev/IntelliSenseHelper.php
#	copy_this/modules/d3/d3dev/controllers/d3dev.php
#	copy_this/modules/d3/d3dev/metadata.php
#	copy_this/modules/d3/d3dev/modules/controllers/d3_dev_thankyou.php
#	copy_this/modules/d3/d3dev/modules/models/d3_dev_oxemail.php
2017-05-30 16:15:30 +02:00
f1369d0b4d ... 2017-05-30 16:00:47 +02:00
4ccbdf0623 add inquiry templates to debug 2015-12-16 17:44:47 +01:00
39d5de8448 sae session challenge, to get former order in thankyou 2015-07-10 17:06:30 +02:00
50b5ac3d06 add missing vendormetadata file 2015-05-05 13:22:59 +02:00
b4eabc7682 clear order nr parameter in dev tool links 2015-03-10 16:16:24 +01:00
a05ad3a52d add basket total discount calculation 2015-02-04 17:03:02 +01:00
d1aba87fd9 add used vouchers to order 2015-02-04 16:41:20 +01:00
fd3f10017f add 4.7.7 compatibility 2014-11-21 15:01:54 +01:00
13735e61f7 Merge pull request #1 from SeifertDaniel/rel_1.x
add contents to rel_1.x branch again
2014-11-21 14:01:10 +01:00
8e18e0e24b add initial development 2014-11-21 13:54:43 +01:00
10d58daa22 clear master 2014-11-21 13:44:13 +01:00
39ff4f1776 add changelog 2014-11-21 13:13:35 +01:00
520d43a8e8 add initial development 2014-11-21 12:19:50 +01:00