RayEhrhardt 96a86ff730 Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x ... # Conflicts: # copy_this/modules/d3/d3_googleanalytics/metadata.php # copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php # copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl # setup+doku/Precheck/d3precheck.php # setup+doku/changelog.txt		2017-11-27 11:00:45 +01:00
..
controllers/admin	Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x	2017-11-27 11:00:45 +01:00
core/smarty/plugins	add further parameters	2014-05-02 21:12:23 +00:00
models	Neue Versionsnummer	2017-11-27 10:57:34 +01:00
modules	Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x	2017-11-27 11:00:45 +01:00
out/src	add adblock detection in admin panel, because of blocked config pages in case of activated adblocker	2017-06-29 14:21:45 +02:00
setup	Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x	2017-11-27 11:00:45 +01:00
translations	Neue Versionsnummer	2017-11-27 10:57:34 +01:00
views	Merge remote-tracking branch 'origin/rel_3.x' into rel_4.x	2017-11-27 11:00:45 +01:00
IntelliSenseHelper.php	add category tracking for ecommerce items	2014-07-15 15:40:34 +00:00
menu.xml	add first implementation	2014-10-13 13:23:06 +00:00
metadata.php	Neue Versionsnummer	2017-11-27 10:57:34 +01:00
picture.png	fix folder name	2012-12-21 10:30:15 +00:00