Fix for #138 and some 'empty version' fixed

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 3113150ad23f73e166b0b3cd0e333446be77eaef..2db984e69aaeba201616bc5bbc76ff352c52f7c7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -195,6 +195,7 @@ inc/install-functions.php -text
 inc/install-inc.php -text
 inc/js/.htaccess -text
 inc/js/js- -text
+inc/js/js-cookies_disabled.php -text
 inc/js/js-jquery.php -text
 inc/js/js-order_send.php -text
 inc/js/js-surfbar_member_book.php -text
@@ -255,6 +256,7 @@ inc/language/user_de.php -text
 inc/language/wernis_de.php -text
 inc/language/yoomedia_de.php -text
 inc/libs/.htaccess -text
+inc/libs/_functions.php -text
 inc/libs/active_functions.php -text
 inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
@@ -270,6 +272,7 @@ inc/libs/holiday_functions.php -text
 inc/libs/html_mail_functions.php -text
 inc/libs/jackpot_functions.php -text
 inc/libs/mediadata_functions.php -text
+inc/libs/network_functions.php -text
 inc/libs/newsletter_functions.php -text
 inc/libs/nickname_functions.php -text
 inc/libs/online_functions.php -text
@@ -407,7 +410,6 @@ inc/modules/admin/what-config_yoomedia.php -text
 inc/modules/admin/what-del_email.php -text
 inc/modules/admin/what-del_holiday.php -text
 inc/modules/admin/what-del_sponsor.php -text
-inc/modules/admin/what-del_task.php -text
 inc/modules/admin/what-del_transfer.php -text
 inc/modules/admin/what-del_user.php -text
 inc/modules/admin/what-edit_emails.php -text
@@ -750,8 +752,6 @@ templates/de/emails/admin/admin_wernis_request.tpl -text
 templates/de/emails/admins/.htaccess -text
 templates/de/emails/admins/admins_mail_contct_admin.tpl -text
 templates/de/emails/admins/admins_msg_contct_admin.tpl -text
-templates/de/emails/admins_mail_contct_admin.tpl -text
-templates/de/emails/admins_msg_contct_admin.tpl -text
 templates/de/emails/back-admin.tpl -text
 templates/de/emails/back-member.tpl -text
 templates/de/emails/beg/.htaccess -text
@@ -869,6 +869,7 @@ templates/de/html/admin/admin_add_banner.tpl -text
 templates/de/html/admin/admin_add_cat.tpl -text
 templates/de/html/admin/admin_add_country.tpl -text
 templates/de/html/admin/admin_add_max.tpl -text
+templates/de/html/admin/admin_add_network.tpl -text
 templates/de/html/admin/admin_add_payment.tpl -text
 templates/de/html/admin/admin_add_points.tpl -text
 templates/de/html/admin/admin_add_points_all.tpl -text
@@ -991,6 +992,8 @@ templates/de/html/admin/admin_edit_cats_row.tpl -text
 templates/de/html/admin/admin_edit_email.tpl -text
 templates/de/html/admin/admin_edit_email_row.tpl -text
 templates/de/html/admin/admin_edit_email_select.tpl -text
+templates/de/html/admin/admin_edit_networks.tpl -text
+templates/de/html/admin/admin_edit_networks_row.tpl -text
 templates/de/html/admin/admin_edit_payments.tpl -text
 templates/de/html/admin/admin_edit_payments_row.tpl -text
 templates/de/html/admin/admin_edit_rallyes.tpl -text
@@ -1014,7 +1017,6 @@ templates/de/html/admin/admin_extensions_delete_row.tpl -text
 templates/de/html/admin/admin_extensions_delete_row_404.tpl -text
 templates/de/html/admin/admin_extensions_edit.tpl -text
 templates/de/html/admin/admin_extensions_edit_row.tpl -text
-templates/de/html/admin/admin_extensions_installed.tpl -text
 templates/de/html/admin/admin_extensions_row.tpl -text
 templates/de/html/admin/admin_extensions_text.tpl -text
 templates/de/html/admin/admin_footer.tpl -text
@@ -1042,6 +1044,8 @@ templates/de/html/admin/admin_list_bonus_rows.tpl -text
 templates/de/html/admin/admin_list_cats.tpl -text
 templates/de/html/admin/admin_list_cats_404.tpl -text
 templates/de/html/admin/admin_list_cats_row.tpl -text
+templates/de/html/admin/admin_list_chk_reg.tpl -text
+templates/de/html/admin/admin_list_chk_reg_row.tpl -text
 templates/de/html/admin/admin_list_country.tpl -text
 templates/de/html/admin/admin_list_country_del_row.tpl -text
 templates/de/html/admin/admin_list_country_edit_row.tpl -text
@@ -1063,6 +1067,8 @@ templates/de/html/admin/admin_list_links_problem.tpl -text
 templates/de/html/admin/admin_list_links_row.tpl -text
 templates/de/html/admin/admin_list_mods.tpl -text
 templates/de/html/admin/admin_list_mods_row.tpl -text
+templates/de/html/admin/admin_list_networks.tpl -text
+templates/de/html/admin/admin_list_networks_row.tpl -text
 templates/de/html/admin/admin_list_notify_emails.tpl -text
 templates/de/html/admin/admin_list_notify_emails_row.tpl -text
 templates/de/html/admin/admin_list_online.tpl -text
@@ -1157,6 +1163,7 @@ templates/de/html/admin/admin_mods_stats.tpl -text
 templates/de/html/admin/admin_mods_stats2.tpl -text
 templates/de/html/admin/admin_mods_stats2_row.tpl -text
 templates/de/html/admin/admin_mods_stats_row.tpl -text
+templates/de/html/admin/admin_network_added.tpl -text
 templates/de/html/admin/admin_newsletter.tpl -text
 templates/de/html/admin/admin_newsletter_nohtml.tpl -text
 templates/de/html/admin/admin_next_link.tpl -text
@@ -1191,9 +1198,7 @@ templates/de/html/admin/admin_refbanner.tpl -text
 templates/de/html/admin/admin_refbanner_edit.tpl -text
 templates/de/html/admin/admin_refbanner_edit_row.tpl -text
 templates/de/html/admin/admin_refbanner_row.tpl -text
-templates/de/html/admin/admin_reg.tpl -text
 templates/de/html/admin/admin_reg_form.tpl -text
-templates/de/html/admin/admin_reg_row.tpl -text
 templates/de/html/admin/admin_reset_pass_done.tpl -text
 templates/de/html/admin/admin_reset_password.tpl -text
 templates/de/html/admin/admin_reset_password_form.tpl -text
@@ -1251,6 +1256,7 @@ templates/de/html/copyright.tpl -text
 templates/de/html/copyright_backlink.tpl -text
 templates/de/html/css_inline.tpl -text
 templates/de/html/doubler/.htaccess -text
+templates/de/html/doubler/doubler_banner.tpl -text
 templates/de/html/doubler/doubler_footer.tpl -text
 templates/de/html/doubler/doubler_header.tpl -text
 templates/de/html/doubler/doubler_index.tpl -text
@@ -1395,6 +1401,7 @@ templates/de/html/install/install_page3.tpl -text
 templates/de/html/install/install_page5.tpl -text
 templates/de/html/install/install_welcome.tpl -text
 templates/de/html/js/.htaccess -text
+templates/de/html/js/js_cookies_disabled.tpl -text
 templates/de/html/js/js_jquery.tpl -text
 templates/de/html/js/js_order_send.tpl -text
 templates/de/html/js/js_surfbar_member_book.tpl -text
@@ -1627,6 +1634,7 @@ theme/business/css/install.css -text
 theme/business/css/register.css -text
 theme/business/css/sponsor.css -text
 theme/business/css/surfbar.css -text
+theme/business/css/task.css -text
 theme/business/css/top10.css -text
 theme/business/css/transfer.css -text
 theme/business/css/uberwach.css -text
@@ -1643,6 +1651,7 @@ theme/default/css/install.css -text
 theme/default/css/register.css -text
 theme/default/css/sponsor.css -text
 theme/default/css/surfbar.css -text
+theme/default/css/task.css -text
 theme/default/css/top10.css -text
 theme/default/css/transfer.css -text
 theme/default/css/uberwach.css -text
@@ -1654,13 +1663,12 @@ theme/desert/css/beg.css -text
 theme/desert/css/bonus.css -text
 theme/desert/css/doubler.css -text
 theme/desert/css/general.css -text
-theme/desert/css/help.css -text
 theme/desert/css/imprint.css -text
 theme/desert/css/install.css -text
-theme/desert/css/paidlinks.css -text
 theme/desert/css/register.css -text
 theme/desert/css/sponsor.css -text
 theme/desert/css/surfbar.css -text
+theme/desert/css/task.css -text
 theme/desert/css/top10.css -text
 theme/desert/css/transfer.css -text
 theme/desert/css/uberwach.css -text