Sub id tracking continued:

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e0acc3d33564f30ace7bb244a828d4c9df6919d7..a1cfd2f84513081197d1f7e79682b75da2527e8a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -64,6 +64,7 @@ DOCS/en/rewrite/README.txt svneol=native#text/plain
 DOCS/en/task/README.txt svneol=native#text/plain
 DOCS/en/themes/README.txt svneol=native#text/plain
 DOCS/geoip_LICENSE.txt svneol=native#text/plain
+DOCS/package.json -text
 DOCS/tpl-validator.php svneol=native#text/plain
 /admin.php svneol=native#text/plain
 /agb.php svneol=native#text/plain
@@ -117,6 +118,7 @@ inc/daily/daily_doubler.php svneol=native#text/plain
 inc/daily/daily_earning.php svneol=native#text/plain
 inc/daily/daily_engine.php svneol=native#text/plain
 inc/daily/daily_holiday.php svneol=native#text/plain
+inc/daily/daily_order.php svneol=native#text/plain
 inc/daily/daily_profile.php svneol=native#text/plain
 inc/daily/daily_surfbar.php svneol=native#text/plain
 inc/daily/daily_user.php svneol=native#text/plain
@@ -198,6 +200,8 @@ inc/extensions/ext-report.php svneol=native#text/plain
 inc/extensions/ext-rewrite.php svneol=native#text/plain
 inc/extensions/ext-safe.php svneol=native#text/plain
 inc/extensions/ext-seo.php svneol=native#text/plain
+inc/extensions/ext-shredder.php svneol=native#text/plain
+inc/extensions/ext-signup.php svneol=native#text/plain
 inc/extensions/ext-sponsor.php svneol=native#text/plain
 inc/extensions/ext-sql_patches.php svneol=native#text/plain
 inc/extensions/ext-support.php svneol=native#text/plain
@@ -234,6 +238,7 @@ inc/filter/mediadata_filter.php svneol=native#text/plain
 inc/filter/online_filter.php svneol=native#text/plain
 inc/filter/order_filter.php svneol=native#text/plain
 inc/filter/other_filter.php svneol=native#text/plain
+inc/filter/politician-stop_filter.php svneol=native#text/plain
 inc/filter/politician_stop_filter.php svneol=native#text/plain
 inc/filter/rallye_filter.php svneol=native#text/plain
 inc/filter/register_filter.php svneol=native#text/plain
@@ -262,6 +267,16 @@ inc/img/.htaccess svneol=native#text/plain
 inc/inc-functions.php svneol=native#text/plain
 inc/install-functions.php svneol=native#text/plain
 inc/install-inc.php svneol=native#text/plain
+inc/install/.htaccess svneol=native#text/plain
+inc/install/install-inc_ svneol=native#text/plain
+inc/install/install_page_ svneol=native#text/plain
+inc/install/install_page_1.php svneol=native#text/plain
+inc/install/install_page_2.php svneol=native#text/plain
+inc/install/install_page_3.php svneol=native#text/plain
+inc/install/install_page_5.php svneol=native#text/plain
+inc/install/install_page_finalize.php svneol=native#text/plain
+inc/install/install_page_finished.php svneol=native#text/plain
+inc/install/install_page_welcome.php svneol=native#text/plain
 inc/js/.htaccess svneol=native#text/plain
 inc/js/js- svneol=native#text/plain
 inc/js/js-admin_ajax.php svneol=native#text/plain
@@ -297,6 +312,7 @@ inc/language/earning_de.php svneol=native#text/plain
 inc/language/en.php svneol=native#text/plain
 inc/language/forced_de.php svneol=native#text/plain
 inc/language/funcoins_de.php svneol=native#text/plain
+inc/language/grade_de.php svneol=native#text/plain
 inc/language/holiday_de.php svneol=native#text/plain
 inc/language/html_mail_de.php svneol=native#text/plain
 inc/language/imprint_de.php svneol=native#text/plain
@@ -370,6 +386,7 @@ inc/libs/optimize_functions.php svneol=native#text/plain
 inc/libs/order_functions.php svneol=native#text/plain
 inc/libs/other_functions.php svneol=native#text/plain
 inc/libs/payout_functions.php svneol=native#text/plain
+inc/libs/politician-stop_functions.php svneol=native#text/plain
 inc/libs/politician_stop_functions.php svneol=native#text/plain
 inc/libs/primera_functions.php svneol=native#text/plain
 inc/libs/profile_functions.php svneol=native#text/plain
@@ -401,6 +418,7 @@ inc/loader/load-extensions.php svneol=native#text/plain
 inc/loader/load-filter.php svneol=native#text/plain
 inc/loader/load-imprint.php svneol=native#text/plain
 inc/loader/load-modules.php svneol=native#text/plain
+inc/loader/load-payments.php svneol=native#text/plain
 inc/loader/load-points_data.php svneol=native#text/plain
 inc/loader/load-refdepths.php svneol=native#text/plain
 inc/loader/load-refsystem.php svneol=native#text/plain
@@ -544,6 +562,7 @@ inc/modules/admin/what-guest_add.php svneol=native#text/plain
 inc/modules/admin/what-guestedit.php svneol=native#text/plain
 inc/modules/admin/what-holiday_list.php svneol=native#text/plain
 inc/modules/admin/what-holiday_remove.php svneol=native#text/plain
+inc/modules/admin/what-list_ svneol=native#text/plain
 inc/modules/admin/what-list_admins_acls.php svneol=native#text/plain
 inc/modules/admin/what-list_autopurge.php svneol=native#text/plain
 inc/modules/admin/what-list_bank_package.php svneol=native#text/plain
@@ -557,6 +576,7 @@ inc/modules/admin/what-list_email_max_rec.php svneol=native#text/plain
 inc/modules/admin/what-list_forced_ads.php svneol=native#text/plain
 inc/modules/admin/what-list_forced_campaigns.php svneol=native#text/plain
 inc/modules/admin/what-list_forced_costs.php svneol=native#text/plain
+inc/modules/admin/what-list_grade_data.php svneol=native#text/plain
 inc/modules/admin/what-list_holiday.php svneol=native#text/plain
 inc/modules/admin/what-list_links.php svneol=native#text/plain
 inc/modules/admin/what-list_network_api_translation.php svneol=native#text/plain
@@ -667,6 +687,8 @@ inc/modules/member/action-rals.php svneol=native#text/plain
 inc/modules/member/action-stats.php svneol=native#text/plain
 inc/modules/member/action-surfbar.php svneol=native#text/plain
 inc/modules/member/action-themes.php svneol=native#text/plain
+inc/modules/member/subid- svneol=native#text/plain
+inc/modules/member/subid-stats.php svneol=native#text/plain
 inc/modules/member/what- svneol=native#text/plain
 inc/modules/member/what-bank_create.php svneol=native#text/plain
 inc/modules/member/what-bank_deposit.php svneol=native#text/plain
@@ -703,6 +725,7 @@ inc/modules/member/what-sponsor_list.php svneol=native#text/plain
 inc/modules/member/what-start_surfbar.php svneol=native#text/plain
 inc/modules/member/what-stats.php svneol=native#text/plain
 inc/modules/member/what-stats_surfbar.php svneol=native#text/plain
+inc/modules/member/what-subids.php svneol=native#text/plain
 inc/modules/member/what-support.php svneol=native#text/plain
 inc/modules/member/what-surfbar_book.php svneol=native#text/plain
 inc/modules/member/what-surfbar_list.php svneol=native#text/plain
@@ -788,6 +811,7 @@ inc/purge/purge-inact.php svneol=native#text/plain
 inc/purge/purge-mails.php svneol=native#text/plain
 inc/purge/purge-tasks.php svneol=native#text/plain
 inc/purge/purge-unconfirmed.php svneol=native#text/plain
+inc/purge/purge-user.php svneol=native#text/plain
 inc/referal-functions.php svneol=native#text/plain
 inc/referral-functions.php svneol=native#text/plain
 inc/request-functions.php svneol=native#text/plain
@@ -852,6 +876,7 @@ templates/de/emails/.htaccess svneol=native#text/plain
 templates/de/emails/add-points.tpl svneol=native#text/plain
 templates/de/emails/admin-del_links.tpl svneol=native#text/plain
 templates/de/emails/admin/.htaccess svneol=native#text/plain
+templates/de/emails/admin/admin_add_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_admin_add_all_direct.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_admin_add_all_ref_referral.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_admin_add_all_referral.tpl svneol=native#text/plain
@@ -874,12 +899,14 @@ 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_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_earning_added.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_earning_updated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_forced_ads.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_forced_costs.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_points_data.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_forced_campaign_pending_active.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_holiday_deactivated.tpl svneol=native#text/plain
@@ -987,6 +1014,7 @@ templates/de/emails/lock-user.tpl svneol=native#text/plain
 templates/de/emails/lock_sponsor.tpl svneol=native#text/plain
 templates/de/emails/member/.htaccess svneol=native#text/plain
 templates/de/emails/member/member_add_points.tpl svneol=native#text/plain
+templates/de/emails/member/member_add_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_admin_add_all_direct.tpl svneol=native#text/plain
 templates/de/emails/member/member_admin_add_all_ref_referral.tpl svneol=native#text/plain
 templates/de/emails/member/member_admin_add_all_referral.tpl svneol=native#text/plain
@@ -1010,10 +1038,12 @@ 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_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_doubler.tpl svneol=native#text/plain
 templates/de/emails/member/member_earning_added.tpl svneol=native#text/plain
 templates/de/emails/member/member_earning_updated.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/member/member_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_forced_campaign_pending_active.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_activated.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_removed.tpl svneol=native#text/plain
@@ -1642,6 +1672,7 @@ templates/de/html/admin/admin_yoomedia_error.tpl svneol=native#text/plain
 templates/de/html/agb.tpl svneol=native#text/plain
 templates/de/html/ajax_test_passed.tpl svneol=native#text/plain
 templates/de/html/app_die_message.tpl svneol=native#text/plain
+templates/de/html/app_exit_message.tpl svneol=native#text/plain
 templates/de/html/beg/.htaccess svneol=native#text/plain
 templates/de/html/beg/beg_banner.tpl svneol=native#text/plain
 templates/de/html/beg/beg_done.tpl svneol=native#text/plain
@@ -1731,6 +1762,8 @@ templates/de/html/ext/ext_report.tpl svneol=native#text/plain
 templates/de/html/ext/ext_rewrite.tpl svneol=native#text/plain
 templates/de/html/ext/ext_safe.tpl svneol=native#text/plain
 templates/de/html/ext/ext_seo.tpl svneol=native#text/plain
+templates/de/html/ext/ext_shredder.tpl svneol=native#text/plain
+templates/de/html/ext/ext_signup.tpl svneol=native#text/plain
 templates/de/html/ext/ext_sponsor.tpl svneol=native#text/plain
 templates/de/html/ext/ext_sql_patches.tpl svneol=native#text/plain
 templates/de/html/ext/ext_support.tpl svneol=native#text/plain
@@ -1880,6 +1913,7 @@ templates/de/html/mediadata_extra_hrow.tpl svneol=native#text/plain
 templates/de/html/mediadata_extra_row.tpl svneol=native#text/plain
 templates/de/html/mediadata_extra_row2.tpl svneol=native#text/plain
 templates/de/html/member/.htaccess svneol=native#text/plain
+templates/de/html/member/member_add_subid.tpl -text
 templates/de/html/member/member_advert.tpl svneol=native#text/plain
 templates/de/html/member/member_beg.tpl svneol=native#text/plain
 templates/de/html/member/member_beg_404.tpl svneol=native#text/plain
@@ -1896,6 +1930,8 @@ templates/de/html/member/member_cats_footer.tpl svneol=native#text/plain
 templates/de/html/member/member_cats_header.tpl svneol=native#text/plain
 templates/de/html/member/member_cats_row.tpl svneol=native#text/plain
 templates/de/html/member/member_content_right.tpl svneol=native#text/plain
+templates/de/html/member/member_delete_user_subids.tpl svneol=native#text/plain
+templates/de/html/member/member_delete_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler_list.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler_list_rows.tpl svneol=native#text/plain
@@ -1905,6 +1941,8 @@ templates/de/html/member/member_earning_data_popup.tpl svneol=native#text/plain
 templates/de/html/member/member_earning_popup_form_row.tpl svneol=native#text/plain
 templates/de/html/member/member_earning_popup_row.tpl svneol=native#text/plain
 templates/de/html/member/member_edit_refback.tpl svneol=native#text/plain
+templates/de/html/member/member_edit_user_subids.tpl svneol=native#text/plain
+templates/de/html/member/member_edit_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/member/member_footer.tpl svneol=native#text/plain
 templates/de/html/member/member_goto_top.tpl svneol=native#text/plain
 templates/de/html/member/member_header.tpl svneol=native#text/plain
@@ -1933,6 +1971,8 @@ templates/de/html/member/member_list_surfbar.tpl svneol=native#text/plain
 templates/de/html/member/member_list_surfbar_form.tpl svneol=native#text/plain
 templates/de/html/member/member_list_surfbar_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_surfbar_table.tpl svneol=native#text/plain
+templates/de/html/member/member_list_user_subids.tpl svneol=native#text/plain
+templates/de/html/member/member_list_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/member/member_login_js.tpl svneol=native#text/plain
 templates/de/html/member/member_mail_bonus_deleted.tpl svneol=native#text/plain
 templates/de/html/member/member_mail_bonus_new.tpl svneol=native#text/plain
@@ -2072,6 +2112,7 @@ templates/de/html/page_footer.tpl svneol=native#text/plain
 templates/de/html/page_header.tpl svneol=native#text/plain
 templates/de/html/politician_stop/.htaccess svneol=native#text/plain
 templates/de/html/politician_stop/politician_stop_snippet.tpl svneol=native#text/plain
+templates/de/html/politician_stop_snippet.tpl svneol=native#text/plain
 templates/de/html/premium-backlinks.tpl -text
 templates/de/html/rallye/.htaccess svneol=native#text/plain
 templates/de/html/rallye/rallye_test.tpl svneol=native#text/plain
@@ -2163,6 +2204,7 @@ templates/en/html/register_header.tpl svneol=native#text/plain
 templates/en/html/welcome.tpl svneol=native#text/plain
 templates/xml/.htaccess svneol=native#text/plain
 templates/xml/admin/.htaccess svneol=native#text/plain
+templates/xml/member/.htaccess svneol=native#text/plain
 theme/README.txt svneol=native#text/plain
 theme/business/images/code_bg.jpg -text svneol=unset#image/jpeg
 theme/business/images/code_bg.png -text svneol=unset#image/png