Renamed templates + added some filters for mail order

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 4da017eb54c8748efa2e5256f021486b0ae22683..fb60ceb11c45acdbde89baad0bb456837136ef1d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -258,6 +258,10 @@ inc/extensions/ext-yacy.php svneol=native#text/plain
 inc/extensions/ext-yoomedia.php svneol=native#text/plain
 inc/extensions/forced/.htaccess svneol=native#text/plain
 inc/extensions/forced/mode-setup.php svneol=native#text/plain
+inc/extensions/holiday/.htaccess svneol=native#text/plain
+inc/extensions/holiday/mode-update.php svneol=native#text/plain
+inc/extensions/html_mail/.htaccess svneol=native#text/plain
+inc/extensions/html_mail/mode-update.php svneol=native#text/plain
 inc/extensions/network/.htaccess svneol=native#text/plain
 inc/extensions/network/mode-setup.php svneol=native#text/plain
 inc/extensions/order/.htaccess svneol=native#text/plain
@@ -303,6 +307,7 @@ inc/filter/coupon_filter.php svneol=native#text/plain
 inc/filter/doubler_filter.php svneol=native#text/plain
 inc/filter/earning_filter.php svneol=native#text/plain
 inc/filter/forced_filter.php svneol=native#text/plain
+inc/filter/holiday_filter.php svneol=native#text/plain
 inc/filter/html_mail_filter.php svneol=native#text/plain
 inc/filter/mediadata_filter.php svneol=native#text/plain
 inc/filter/menu_filter.php svneol=native#text/plain
@@ -1020,6 +1025,9 @@ templates/de/emails/admin/admin_sponsor_settings.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-ordr.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-reflink.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-unconfirmed.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_ordr.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_reflink.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_unconfirmed.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_depleted.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_pending.tpl svneol=native#text/plain
@@ -1144,6 +1152,9 @@ templates/de/emails/member/member_sub_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-ordr.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-reflink.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-unconfirmed.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_ordr.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_reflink.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_unconfirmed.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_low_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_url_active_deleted.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_url_active_pending.tpl svneol=native#text/plain