Added listing of sub id enhanced referral links in member area + used sub id in refer...

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 483585893dd1d22f5874c95428ff02a29a12ab24..02f544e0e139a74e42f843b040d25bc26af00e03 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -96,8 +96,9 @@ inc/autopurge/purge-tsks.php svneol=native#text/plain
 inc/autopurge/purge-unconfirmed.php svneol=native#text/plain
 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/email/.htaccess svneol=native#text/plain
 inc/cache/_compiled/html/.htaccess svneol=native#text/plain
+inc/cache/_compiled/xml/.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
@@ -478,6 +479,8 @@ inc/modules/admin/action-user.php svneol=native#text/plain
 inc/modules/admin/action-wernis.php svneol=native#text/plain
 inc/modules/admin/admin-inc.php svneol=native#text/plain
 inc/modules/admin/overview-inc.php svneol=native#text/plain
+inc/modules/admin/subid- svneol=native#text/plain
+inc/modules/admin/subid-stats.php svneol=native#text/plain
 inc/modules/admin/what- svneol=native#text/plain
 inc/modules/admin/what-add_bank_package.php svneol=native#text/plain
 inc/modules/admin/what-add_guestnl_cat.php svneol=native#text/plain
@@ -581,6 +584,7 @@ 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
 inc/modules/admin/what-list_network_array_translation.php svneol=native#text/plain
+inc/modules/admin/what-list_network_data.php svneol=native#text/plain
 inc/modules/admin/what-list_network_params.php svneol=native#text/plain
 inc/modules/admin/what-list_network_request_params.php svneol=native#text/plain
 inc/modules/admin/what-list_network_types.php svneol=native#text/plain
@@ -602,6 +606,7 @@ inc/modules/admin/what-list_task.php svneol=native#text/plain
 inc/modules/admin/what-list_transfer.php svneol=native#text/plain
 inc/modules/admin/what-list_unconfirmed.php svneol=native#text/plain
 inc/modules/admin/what-list_user.php svneol=native#text/plain
+inc/modules/admin/what-list_user_subid.php svneol=native#text/plain
 inc/modules/admin/what-list_wernis.php svneol=native#text/plain
 inc/modules/admin/what-list_yoomedia_tm.php svneol=native#text/plain
 inc/modules/admin/what-lock_sponsor.php svneol=native#text/plain
@@ -687,6 +692,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
@@ -896,12 +903,14 @@ 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_mem_delete_user_subids.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_mem_edit_user_subids.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
@@ -1035,11 +1044,13 @@ 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_mem_delete_user_subids.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_mem_edit_user_subids.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
@@ -1295,6 +1306,9 @@ templates/de/html/admin/admin_delete_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_normal.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_notify.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_extensions.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_extensions_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_extensions_row_404.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_forced_ads.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_forced_ads_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_forced_costs.tpl svneol=native#text/plain
@@ -1303,6 +1317,8 @@ templates/de/html/admin/admin_delete_guest_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_guest_menu_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_member_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_member_menu_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_network_array_translation.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_network_array_translation_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_network_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_network_request_params.tpl svneol=native#text/plain
@@ -1326,6 +1342,8 @@ 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_delete_user_subids.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_row.tpl svneol=native#text/plain
@@ -1345,6 +1363,8 @@ templates/de/html/admin/admin_edit_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_select.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_extensions.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_extensions_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_forced_ads.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_forced_ads_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_forced_campaigns.tpl svneol=native#text/plain
@@ -1358,6 +1378,8 @@ templates/de/html/admin/admin_edit_member_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_member_menu_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_mods.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_mods_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_network_array_translation.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_network_array_translation_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_network_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_network_request_params.tpl svneol=native#text/plain
@@ -1390,6 +1412,8 @@ templates/de/html/admin/admin_edit_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_user_subids.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_archiv.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_archiv_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_nav_row.tpl svneol=native#text/plain
@@ -1460,6 +1484,8 @@ templates/de/html/admin/admin_list_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_emails.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_emails_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_extensions.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_extensions_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_forced_ads.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_forced_ads_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_forced_campaigns.tpl svneol=native#text/plain
@@ -1488,6 +1514,8 @@ templates/de/html/admin/admin_list_network_array_translation.tpl svneol=native#t
 templates/de/html/admin/admin_list_network_array_translation_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_config.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_config_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_network_data.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_network_data_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_request_params.tpl svneol=native#text/plain
@@ -1498,6 +1526,8 @@ templates/de/html/admin/admin_list_network_vcheck_params.tpl svneol=native#text/
 templates/de/html/admin/admin_list_network_vcheck_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_networks.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_networks_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_nickname_history.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_nickname_history_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_notify_emails.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_notify_emails_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_online.tpl svneol=native#text/plain
@@ -1564,6 +1594,10 @@ templates/de/html/admin/admin_list_user_pagenav.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_user_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_user_sort.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_user_sort_form.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid_stats.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid_stats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_wernis_main.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_wernis_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_yoomedia_tm.tpl svneol=native#text/plain
@@ -1963,8 +1997,12 @@ templates/de/html/member/member_list_referal_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_referral.tpl svneol=native#text/plain
 templates/de/html/member/member_list_referral_level.tpl svneol=native#text/plain
 templates/de/html/member/member_list_referral_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_reflink_user_subids.tpl svneol=native#text/plain
+templates/de/html/member/member_list_reflink_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_reflinks.tpl svneol=native#text/plain
 templates/de/html/member/member_list_reflinks_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_subid_stats.tpl svneol=native#text/plain
+templates/de/html/member/member_list_subid_stats_row.tpl svneol=native#text/plain
 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