Fixed category saving, added unique key, removed deprecated templates:

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index f4dc8022d17dbab6c6b694fb830b75e946e8db99..8bd09ccaa104f36f4fb66357a8f4c013c02a54ce 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -125,6 +125,7 @@ inc/extensions/ext-active.php -text svneol=unset#text/plain
 inc/extensions/ext-admins.php -text svneol=unset#text/plain
 inc/extensions/ext-admintheme1.php -text svneol=unset#text/plain
 inc/extensions/ext-admintheme_default.php -text svneol=unset#text/plain
+inc/extensions/ext-announcement.php -text svneol=unset#text/plain
 inc/extensions/ext-autopurge.php -text svneol=unset#text/plain
 inc/extensions/ext-autoreg.php -text svneol=unset#text/plain
 inc/extensions/ext-bank.php -text svneol=unset#text/plain
@@ -294,6 +295,7 @@ inc/libs/holiday_functions.php -text svneol=unset#text/plain
 inc/libs/html_mail_functions.php -text svneol=unset#text/plain
 inc/libs/jackpot_functions.php -text svneol=unset#text/plain
 inc/libs/mailid_functions.php svneol=native#text/plain
+inc/libs/maintenance_functions.php svneol=native#text/plain
 inc/libs/mediadata_functions.php -text svneol=unset#text/plain
 inc/libs/network_functions.php -text svneol=unset#text/plain
 inc/libs/newsletter_functions.php -text svneol=unset#text/plain
@@ -409,6 +411,7 @@ inc/modules/admin/what-config_imprint.php -text svneol=unset#text/plain
 inc/modules/admin/what-config_mediadata.php -text svneol=unset#text/plain
 inc/modules/admin/what-config_menu.php -text svneol=unset#text/plain
 inc/modules/admin/what-config_mods.php -text svneol=unset#text/plain
+inc/modules/admin/what-config_networks.php -text svneol=unset#text/plain
 inc/modules/admin/what-config_newsletter.php -text svneol=unset#text/plain
 inc/modules/admin/what-config_nickname.php -text svneol=unset#text/plain
 inc/modules/admin/what-config_order.php -text svneol=unset#text/plain
@@ -567,6 +570,7 @@ inc/modules/member/what-bank_withdraw.php -text svneol=unset#text/plain
 inc/modules/member/what-beg.php -text svneol=unset#text/plain
 inc/modules/member/what-beg2.php -text svneol=unset#text/plain
 inc/modules/member/what-bonus.php -text svneol=unset#text/plain
+inc/modules/member/what-booking.php -text svneol=unset#text/plain
 inc/modules/member/what-categories.php -text svneol=unset#text/plain
 inc/modules/member/what-doubler.php -text svneol=unset#text/plain
 inc/modules/member/what-guest.php -text svneol=unset#text/plain
@@ -893,7 +897,6 @@ templates/de/emails/order-admin.tpl -text svneol=unset#text/plain
 templates/de/emails/order-deleted.tpl -text svneol=unset#text/plain
 templates/de/emails/order-member.tpl -text svneol=unset#text/plain
 templates/de/emails/order-reject.tpl -text svneol=unset#text/plain
-templates/de/emails/profile-updte.tpl -text svneol=unset#text/plain
 templates/de/emails/register-admin.tpl -text svneol=unset#text/plain
 templates/de/emails/register-member.tpl -text svneol=unset#text/plain
 templates/de/emails/sponsor/.htaccess -text svneol=unset#text/plain
@@ -1020,36 +1023,36 @@ templates/de/html/admin/admin_config_validator.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_config_wernis.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_config_yoomedia.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_contct_user_form.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_admin_menu.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_admin_menu_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_admins.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_admins_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_del_bank_packages.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_del_bank_packages_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_cats.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_cats_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_email_bonus.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_email_normal.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_email_notify.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_guest_menu.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_guest_menu_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_member_menu.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_member_menu_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_network_params.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_network_params_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_network_types.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_network_types_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_networks.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_networks_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_payments.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_payments_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_reflevel.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_reflevel_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_sponsor.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_del_surfbar_urls.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_del_surfbar_urls_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_transfer_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_del_user.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_admin_menu.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_admin_menu_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_admins.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_admins_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_cats.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_cats_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_email_bonus.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_email_normal.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_email_notify.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_guest_menu.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_guest_menu_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_member_menu.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_member_menu_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_network_params.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_network_params_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_network_types.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_network_types_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_networks.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_networks_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_payments.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_payments_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_reflevel.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_reflevel_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_sponsor.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_transfer_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_delete_user.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_admin_menu.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_admin_menu_form.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_admin_menu_row.tpl -text svneol=unset#text/plain
@@ -1067,6 +1070,8 @@ templates/de/html/admin/admin_edit_guest_menu_form.tpl -text svneol=unset#text/p
 templates/de/html/admin/admin_edit_guest_menu_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_member_menu.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_member_menu_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_edit_mods.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_edit_mods_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_network_params.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_network_params_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_network_types.tpl -text svneol=unset#text/plain
@@ -1086,6 +1091,8 @@ templates/de/html/admin/admin_edit_sponsor_edit.tpl -text svneol=unset#text/plai
 templates/de/html/admin/admin_edit_sponsor_sub_points.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_surfbar_urls.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_surfbar_urls_row.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_edit_theme.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_edit_theme_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_edit_user.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_email_archiv.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_email_archiv_row.tpl -text svneol=unset#text/plain
@@ -1104,7 +1111,13 @@ templates/de/html/admin/admin_extensions_edit_row.tpl -text svneol=unset#text/pl
 templates/de/html/admin/admin_extensions_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_extensions_text.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_footer.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_form_selection_box.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_guest_menu_status.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_header.tpl svneol=native#text/plain
+templates/de/html/admin/admin_import_theme.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_import_theme_form.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_import_theme_none.tpl svneol=native#text/plain
+templates/de/html/admin/admin_import_theme_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_admins.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_admins_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_autopurge.tpl -text svneol=unset#text/plain
@@ -1147,6 +1160,8 @@ templates/de/html/admin/admin_list_mods.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_mods_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_network_api_translation.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_api_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_params.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_network_params_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_network_types.tpl -text svneol=unset#text/plain
@@ -1232,7 +1247,6 @@ templates/de/html/admin/admin_main_header.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_maintenance_form.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_member_menu_overview.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_member_menu_status.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_member_selection_box.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_menu_404_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_menu_failed.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_menu_hints.tpl -text svneol=unset#text/plain
@@ -1240,8 +1254,6 @@ templates/de/html/admin/admin_menu_hints_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_menu_overview_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_menu_status_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_mini_online.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_mods_edit.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_mods_edit_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_mods_stats.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_mods_stats2.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_mods_stats2_row.tpl -text svneol=unset#text/plain
@@ -1293,12 +1305,6 @@ templates/de/html/admin/admin_surfbar_url_stats.tpl -text svneol=unset#text/plai
 templates/de/html/admin/admin_surfbar_url_stats_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_task_holiday.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_task_order.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_theme_edit.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_theme_edit_row.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_theme_import.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_theme_import_form.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_theme_import_none.tpl -text svneol=unset#text/plain
-templates/de/html/admin/admin_theme_import_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_theme_installed.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_undelete_surfbar_urls.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl -text svneol=unset#text/plain
@@ -1340,10 +1346,12 @@ templates/de/html/doubler/doubler_header.tpl -text svneol=unset#text/plain
 templates/de/html/doubler/doubler_index.tpl -text svneol=unset#text/plain
 templates/de/html/doubler/doubler_reflink.tpl -text svneol=unset#text/plain
 templates/de/html/ext/.htaccess -text svneol=unset#text/plain
+templates/de/html/ext/ext_ -text svneol=unset#text/plain
 templates/de/html/ext/ext_active.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_admins.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_admintheme1.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_admintheme_default.tpl -text svneol=unset#text/plain
+templates/de/html/ext/ext_announcement.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_autopurge.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_autoreg.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_bank.tpl -text svneol=unset#text/plain