New extension added, update activated, TODO extended:

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 1a68632c5c5dc5a1150ffd10d2eea41ada1b6c9c..7e7e3213b671d1fd4cad5d145cc36ade5bb3795a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -112,8 +112,10 @@ inc/extensions/ext-country.php -text
 inc/extensions/ext-debug.php -text
 inc/extensions/ext-demo.php -text
 inc/extensions/ext-doubler.php -text
+inc/extensions/ext-events.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
+inc/extensions/ext-iso3166.php -text
 inc/extensions/ext-mailid.php -text
 inc/extensions/ext-maintenance.php -text
 inc/extensions/ext-mediadata.php -text
@@ -580,6 +582,9 @@ inc/phpmailer/test/phpmailer_test.php -text
 inc/phpmailer/test/phpunit.php -text
 inc/phpmailer/test/test.png -text
 inc/pool-update.php -text
+inc/pool/.htaccess -text
+inc/pool/pool-bonus.php -text
+inc/pool/pool-user.php -text
 inc/profile-updte.php -text
 inc/rdf.class.php -text
 inc/reset/.htaccess -text
@@ -619,8 +624,10 @@ install/tables.sql -text
 /surfbar.php -text
 templates/.htaccess -text
 templates/de/.htaccess -text
+templates/de/emails/.htaccess -text
 templates/de/emails/add-points.tpl -text
 templates/de/emails/admin-del_links.tpl -text
+templates/de/emails/admin/.htaccess -text
 templates/de/emails/admin/admin_autopurge_del_mails.tpl -text
 templates/de/emails/admin/admin_autopurge_delete.tpl -text
 templates/de/emails/admin/admin_autopurge_inactive.tpl -text
@@ -630,6 +637,7 @@ templates/de/emails/admin/admin_autopurge_turbo.tpl -text
 templates/de/emails/admin/admin_autopurge_unconfirmed.tpl -text
 templates/de/emails/admin/admin_del_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl -text
+templates/de/emails/admin/admin_ext_deactivated.tpl -text
 templates/de/emails/admin/admin_holiday_deactivated.tpl -text
 templates/de/emails/admin/admin_holiday_request.tpl -text
 templates/de/emails/admin/admin_holiday_unlock.tpl -text
@@ -665,6 +673,9 @@ templates/de/emails/admin/admin_surfbar_url_depleted.tpl -text
 templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl -text
 templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/admin/admin_surfbar_url_reg.tpl -text
@@ -699,10 +710,12 @@ templates/de/emails/del-user.tpl -text
 templates/de/emails/del_sponsor.tpl -text
 templates/de/emails/done-admin.tpl -text
 templates/de/emails/done-member.tpl -text
+templates/de/emails/guest/.htaccess -text
 templates/de/emails/guest/guest_request_confirm.tpl -text
 templates/de/emails/header.tpl -text
 templates/de/emails/lock-user.tpl -text
 templates/de/emails/lock_sponsor.tpl -text
+templates/de/emails/member/.htaccess -text
 templates/de/emails/member/member_autopurge_delete.tpl -text
 templates/de/emails/member/member_autopurge_inactive.tpl -text
 templates/de/emails/member/member_autopurge_points.tpl -text
@@ -749,6 +762,9 @@ templates/de/emails/member/member_surfbar_url_depleted.tpl -text
 templates/de/emails/member/member_surfbar_url_locked_deleted.tpl -text
 templates/de/emails/member/member_surfbar_url_locked_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_migrate.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/member/member_surfbar_url_reg.tpl -text
@@ -775,6 +791,7 @@ templates/de/emails/order-reject.tpl -text
 templates/de/emails/profile-updte.tpl -text
 templates/de/emails/register-admin.tpl -text
 templates/de/emails/register-member.tpl -text
+templates/de/emails/sponsor/.htaccess -text
 templates/de/emails/sponsor/sponsor_activate.tpl -text
 templates/de/emails/sponsor/sponsor_add_points.tpl -text
 templates/de/emails/sponsor/sponsor_change_data.tpl -text
@@ -1198,6 +1215,7 @@ templates/de/html/ext/ext_country.tpl -text
 templates/de/html/ext/ext_debug.tpl -text
 templates/de/html/ext/ext_demo.tpl -text
 templates/de/html/ext/ext_doubler.tpl -text
+templates/de/html/ext/ext_events.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
 templates/de/html/ext/ext_mailid.tpl -text
@@ -1480,6 +1498,8 @@ templates/de/html/surfbar/surfbar_frame_top.tpl -text
 templates/de/html/surfbar/surfbar_frameset.tpl -text
 templates/de/html/surfbar/surfbar_start_banner.tpl -text
 templates/de/html/surfbar/surfbar_stopped.tpl -text
+templates/de/html/task/.htaccess -text
+templates/de/html/task/task_ext_deactivated.tpl -text
 templates/de/html/theme_one.tpl -text
 templates/de/html/theme_select_box.tpl -text
 templates/de/html/theme_select_form.tpl -text
@@ -1538,30 +1558,4 @@ theme/desert/images/help/left.jpg -text
 theme/desert/images/help/right.jpg -text
 theme/desert/images/help/up.jpg -text
 theme/desert/theme.php -text
-unsupported/affiliblatt/inc/extensions/ext-affiliblatt.php -text
-unsupported/affiliblatt/inc/language/affiliblatt_de.php -text
-unsupported/affiliblatt/inc/libs/affiliblatt_functions.php -text
-unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php -text
-unsupported/affiliblatt/inc/modules/admin/what-list_affiliblatt_tm.php -text
-unsupported/affiliblatt/inc/reset/reset_affiliblatt.php -text
-unsupported/affiliblatt/templates/de/html/admin/admin_affiliblatt_error.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_config_affiliblatt.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm_already.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm_row.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_send_affiliblatt.tpl -text
-unsupported/affiliblatt/templates/de/html/ext/ext_affiliblatt.tpl -text
-unsupported/gollox/inc/extensions/ext-gollox.php -text
-unsupported/gollox/inc/language/gollox_de.php -text
-unsupported/gollox/inc/libs/gollox_functions.php -text
-unsupported/gollox/inc/modules/admin/what-config_gollox.php -text
-unsupported/gollox/inc/modules/admin/what-list_gollox_tm.php -text
-unsupported/gollox/inc/reset/reset_gollox.php -text
-unsupported/gollox/templates/de/html/admin/admin_config_gollox.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_gollox_error.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm_already.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm_row.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_send_gollox.tpl -text
-unsupported/gollox/templates/de/html/ext/ext_gollox.tpl -text
 /view.php -text