Extension ext-surfbar continued, fixes:

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index b928345c9a34e35b318839cb5a4376d357946d11..0230b49198786a9354e67122013595379e3cf789 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -89,6 +89,7 @@ inc/cache/.htaccess svneol=native#text/plain
 inc/cache/_compiled/.htaccess svneol=native#text/plain
 inc/cache/_compiled/emails/.htaccess svneol=native#text/plain
 inc/cache/_compiled/html/.htaccess svneol=native#text/plain
+inc/callback-functions.php svneol=native#text/plain
 inc/classes/.htaccess svneol=native#text/plain
 inc/classes/cachesystem.class.php svneol=native#text/plain
 inc/classes/rdf.class.php svneol=native#text/plain
@@ -224,6 +225,7 @@ inc/filter/user_filter.php svneol=native#text/plain
 inc/filters.php svneol=native#text/plain
 inc/fix_filters.php svneol=native#text/plain
 inc/fix_menu.php svneol=native#text/plain
+inc/fix_user_points.php svneol=native#text/plain
 inc/footer.php svneol=native#text/plain
 inc/functions.php svneol=native#text/plain
 inc/gen_mediadata.php svneol=native#text/plain
@@ -399,6 +401,7 @@ inc/modules/admin/action-country.php svneol=native#text/plain
 inc/modules/admin/action-coupon.php svneol=native#text/plain
 inc/modules/admin/action-doubler.php svneol=native#text/plain
 inc/modules/admin/action-email.php svneol=native#text/plain
+inc/modules/admin/action-grade.php svneol=native#text/plain
 inc/modules/admin/action-holiday.php svneol=native#text/plain
 inc/modules/admin/action-login.php svneol=native#text/plain
 inc/modules/admin/action-logout.php svneol=native#text/plain
@@ -520,6 +523,7 @@ inc/modules/admin/what-list_network_types.php svneol=native#text/plain
 inc/modules/admin/what-list_networks.php svneol=native#text/plain
 inc/modules/admin/what-list_notifications.php svneol=native#text/plain
 inc/modules/admin/what-list_payouts.php svneol=native#text/plain
+inc/modules/admin/what-list_point_accounts.php svneol=native#text/plain
 inc/modules/admin/what-list_primera.php svneol=native#text/plain
 inc/modules/admin/what-list_rallyes.php svneol=native#text/plain
 inc/modules/admin/what-list_refs.php svneol=native#text/plain
@@ -722,6 +726,7 @@ inc/pool/pool-bonus.php svneol=native#text/plain
 inc/pool/pool-user.php svneol=native#text/plain
 inc/purge/.htaccess svneol=native#text/plain
 inc/purge/purge- svneol=native#text/plain
+inc/purge/purge-coupon.php svneol=native#text/plain
 inc/purge/purge-general.php svneol=native#text/plain
 inc/purge/purge-inact.php svneol=native#text/plain
 inc/purge/purge-mails.php svneol=native#text/plain
@@ -786,7 +791,10 @@ templates/de/emails/admin/admin_autopurge_unconfirmed.tpl svneol=native#text/pla
 templates/de/emails/admin/admin_coupon.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon_cashed.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon_code.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_coupon_purge.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_coupon_purge_row.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_del_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_holiday_deactivated.tpl svneol=native#text/plain
@@ -890,6 +898,7 @@ templates/de/emails/member/member_coupon.tpl svneol=native#text/plain
 templates/de/emails/member/member_coupon_code.tpl svneol=native#text/plain
 templates/de/emails/member/member_del_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_links.tpl svneol=native#text/plain
+templates/de/emails/member/member_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_doubler.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_activated.tpl svneol=native#text/plain
@@ -1124,6 +1133,8 @@ templates/de/html/admin/admin_delete_payouts_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_reflevel.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_reflevel_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_sponsor.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_transfer_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_user.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu.tpl svneol=native#text/plain
@@ -1135,6 +1146,7 @@ templates/de/html/admin/admin_edit_admins_acls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admins_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_bank_packages.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_bank_packages_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_bonus_email.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email.tpl svneol=native#text/plain
@@ -1197,6 +1209,7 @@ templates/de/html/admin/admin_import_theme.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme_none.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_links_bonus_mail.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_admins.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_admins_acls.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_admins_acls_row.tpl svneol=native#text/plain