Reset rewritten, SQL fixed, zeros are now numeric

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index d014e9ac1ee4183d6378bcc5566cb58dfd576da4..98ad788718d16b52220ff304e423073a816e16a0 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -79,6 +79,7 @@ inc/.htaccess -text
 inc/.secret/.htaccess -text
 inc/autopurge.php -text
 inc/cache/.htaccess -text
 inc/.secret/.htaccess -text
 inc/autopurge.php -text
 inc/cache/.htaccess -text

+inc/check-reset.php -text

 inc/config.php -text
 inc/databases.php -text
 inc/db/.htaccess -text
 inc/config.php -text
 inc/databases.php -text
 inc/db/.htaccess -text


@@ -196,7 +197,6 @@ inc/libs/newsletter_functions.php -text
 inc/libs/nickname_functions.php -text
 inc/libs/optimize_functions.php -text
 inc/libs/order_functions.php -text
 inc/libs/nickname_functions.php -text
 inc/libs/optimize_functions.php -text
 inc/libs/order_functions.php -text

-inc/libs/output_functions.php -text

 inc/libs/payout_functions.php -text
 inc/libs/primera_functions.php -text
 inc/libs/rallye_functions.php -text
 inc/libs/payout_functions.php -text
 inc/libs/primera_functions.php -text
 inc/libs/rallye_functions.php -text


@@ -404,7 +404,6 @@ inc/modules/guest/what-impressum.php -text
 inc/modules/guest/what-infos.php -text
 inc/modules/guest/what-login.php -text
 inc/modules/guest/what-mediadata.php -text
 inc/modules/guest/what-infos.php -text
 inc/modules/guest/what-login.php -text
 inc/modules/guest/what-mediadata.php -text

-inc/modules/guest/what-my_weblog.php -text

 inc/modules/guest/what-rallyes.php -text
 inc/modules/guest/what-register.php -text
 inc/modules/guest/what-sponsor_agb.php -text
 inc/modules/guest/what-rallyes.php -text
 inc/modules/guest/what-register.php -text
 inc/modules/guest/what-sponsor_agb.php -text


@@ -591,9 +590,13 @@ templates/de/emails/admin/admin_autopurge_points.tpl -text
 templates/de/emails/admin/admin_autopurge_tsks.tpl -text
 templates/de/emails/admin/admin_autopurge_turbo.tpl -text
 templates/de/emails/admin/admin_autopurge_unconfirmed.tpl -text
 templates/de/emails/admin/admin_autopurge_tsks.tpl -text
 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_holiday_deactivated.tpl -text
 templates/de/emails/admin/admin_holiday_request.tpl -text
 templates/de/emails/admin/admin_holiday_unlock.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

+templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl -text
+templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl -text

 templates/de/emails/admin/admin_mydata_notify.tpl -text
 templates/de/emails/admin/admin_new_ext.tpl -text
 templates/de/emails/admin/admin_newsletter_request.tpl -text
 templates/de/emails/admin/admin_mydata_notify.tpl -text
 templates/de/emails/admin/admin_new_ext.tpl -text
 templates/de/emails/admin/admin_newsletter_request.tpl -text


@@ -659,11 +662,15 @@ templates/de/emails/member/member_birthday.tpl -text
 templates/de/emails/member/member_birthday_confirm.tpl -text
 templates/de/emails/member/member_bonus.tpl -text
 templates/de/emails/member/member_contct.tpl -text
 templates/de/emails/member/member_birthday_confirm.tpl -text
 templates/de/emails/member/member_bonus.tpl -text
 templates/de/emails/member/member_contct.tpl -text

+templates/de/emails/member/member_del_surfbar_urls.tpl -text

 templates/de/emails/member/member_doubler.tpl -text
 templates/de/emails/member/member_doubler.tpl -text

+templates/de/emails/member/member_edit_surfbar_urls.tpl -text

 templates/de/emails/member/member_holiday_activated.tpl -text
 templates/de/emails/member/member_holiday_removed.tpl -text
 templates/de/emails/member/member_holiday_request.tpl -text
 templates/de/emails/member/member_holiday_unlock.tpl -text
 templates/de/emails/member/member_holiday_activated.tpl -text
 templates/de/emails/member/member_holiday_removed.tpl -text
 templates/de/emails/member/member_holiday_request.tpl -text
 templates/de/emails/member/member_holiday_unlock.tpl -text

+templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl -text
+templates/de/emails/member/member_lock_locked_surfbar_urls.tpl -text

 templates/de/emails/member/member_mydata_notify.tpl -text
 templates/de/emails/member/member_newsletter_done.tpl -text
 templates/de/emails/member/member_newsletter_request.tpl -text
 templates/de/emails/member/member_mydata_notify.tpl -text
 templates/de/emails/member/member_newsletter_done.tpl -text
 templates/de/emails/member/member_newsletter_request.tpl -text


@@ -837,6 +844,8 @@ templates/de/html/admin/admin_del_email_normal.tpl -text
 templates/de/html/admin/admin_del_payments.tpl -text
 templates/de/html/admin/admin_del_payments_row.tpl -text
 templates/de/html/admin/admin_del_sponsor.tpl -text
 templates/de/html/admin/admin_del_payments.tpl -text
 templates/de/html/admin/admin_del_payments_row.tpl -text
 templates/de/html/admin/admin_del_sponsor.tpl -text

+templates/de/html/admin/admin_del_surfbar_urls.tpl -text
+templates/de/html/admin/admin_del_surfbar_urls_row.tpl -text

 templates/de/html/admin/admin_del_transfer_row.tpl -text
 templates/de/html/admin/admin_del_user.tpl -text
 templates/de/html/admin/admin_edit_admins.tpl -text
 templates/de/html/admin/admin_del_transfer_row.tpl -text
 templates/de/html/admin/admin_del_user.tpl -text
 templates/de/html/admin/admin_edit_admins.tpl -text


@@ -855,6 +864,8 @@ templates/de/html/admin/admin_edit_rallyes_row.tpl -text
 templates/de/html/admin/admin_edit_sponsor_add_points.tpl -text
 templates/de/html/admin/admin_edit_sponsor_edit.tpl -text
 templates/de/html/admin/admin_edit_sponsor_sub_points.tpl -text
 templates/de/html/admin/admin_edit_sponsor_add_points.tpl -text
 templates/de/html/admin/admin_edit_sponsor_edit.tpl -text
 templates/de/html/admin/admin_edit_sponsor_sub_points.tpl -text

+templates/de/html/admin/admin_edit_surfbar_urls.tpl -text
+templates/de/html/admin/admin_edit_surfbar_urls_row.tpl -text

 templates/de/html/admin/admin_edit_user.tpl -text
 templates/de/html/admin/admin_email_archiv.tpl -text
 templates/de/html/admin/admin_email_archiv_row.tpl -text
 templates/de/html/admin/admin_edit_user.tpl -text
 templates/de/html/admin/admin_email_archiv.tpl -text
 templates/de/html/admin/admin_email_archiv_row.tpl -text


@@ -953,6 +964,8 @@ templates/de/html/admin/admin_list_user_sort_form.tpl -text
 templates/de/html/admin/admin_list_wernis_main.tpl -text
 templates/de/html/admin/admin_list_wernis_row.tpl -text
 templates/de/html/admin/admin_lock_sponsor.tpl -text
 templates/de/html/admin/admin_list_wernis_main.tpl -text
 templates/de/html/admin/admin_list_wernis_row.tpl -text
 templates/de/html/admin/admin_lock_sponsor.tpl -text

+templates/de/html/admin/admin_lock_surfbar_urls.tpl -text
+templates/de/html/admin/admin_lock_surfbar_urls_row.tpl -text

 templates/de/html/admin/admin_lock_user.tpl -text
 templates/de/html/admin/admin_login_form.tpl -text
 templates/de/html/admin/admin_login_msg.tpl -text
 templates/de/html/admin/admin_lock_user.tpl -text
 templates/de/html/admin/admin_login_form.tpl -text
 templates/de/html/admin/admin_login_msg.tpl -text