Fixes/rewrites for content-type

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 771eb88ed1a63ee5d2c3aeb373ec5cff6b4f7d1b..7d5fb46af872caa33226c4c45f2181204c201dbd 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -28,6 +28,7 @@ DOCS/de/country/countries-full.sql -text
 DOCS/de/country/countries-sorted.sql -text
 DOCS/de/doubler/README.txt -text
 DOCS/de/engine/README.txt -text
+DOCS/de/network/README.txt -text
 DOCS/de/promoter.txt -text
 DOCS/de/rallye/README.txt -text
 DOCS/de/rewrite/.htaccess -text
@@ -96,7 +97,7 @@ inc/autopurge/purge-tsks.php -text
 inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
 inc/cache/_compiled/.htaccess -text
-inc/cache/_compiled/templates/.htaccess -text
+inc/cache/_compiled/html/.htaccess -text
 inc/classes/.htaccess -text
 inc/classes/cachesystem.class.php -text
 inc/classes/rdf.class.php -text
@@ -112,6 +113,7 @@ inc/debug/client/.htaccess -text
 inc/debug/relay/.htaccess -text
 inc/debug/request_ -text
 inc/debug/server/.htaccess -text
+inc/expression-functions.php -text
 inc/extensions-functions.php -text
 inc/extensions/.htaccess -text
 inc/extensions/ext- -text
@@ -132,6 +134,7 @@ inc/extensions/ext-debug.php -text
 inc/extensions/ext-demo.php -text
 inc/extensions/ext-doubler.php -text
 inc/extensions/ext-events.php -text
+inc/extensions/ext-grade.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
 inc/extensions/ext-imprint.php -text
@@ -432,6 +435,7 @@ inc/modules/admin/what-list_country.php -text
 inc/modules/admin/what-list_doubler.php -text
 inc/modules/admin/what-list_holiday.php -text
 inc/modules/admin/what-list_links.php -text
+inc/modules/admin/what-list_network_params.php -text
 inc/modules/admin/what-list_network_types.php -text
 inc/modules/admin/what-list_networks.php -text
 inc/modules/admin/what-list_notifications.php -text
@@ -661,6 +665,7 @@ inc/reset/reset_holiday.php -text
 inc/reset/reset_profile.php -text
 inc/reset/reset_surfbar.php -text
 inc/reset/reset_yoomedia.php -text
+inc/revision-functions.php -text
 inc/session-functions.php -text
 inc/session.php -text
 inc/sql-functions.php -text
@@ -873,6 +878,8 @@ 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_network_params.tpl -text
+templates/de/html/admin/admin_add_network_type.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
@@ -979,6 +986,8 @@ templates/de/html/admin/admin_del_cats_row.tpl -text
 templates/de/html/admin/admin_del_email_bonus.tpl -text
 templates/de/html/admin/admin_del_email_normal.tpl -text
 templates/de/html/admin/admin_del_email_notify.tpl -text
+templates/de/html/admin/admin_del_network_types.tpl -text
+templates/de/html/admin/admin_del_network_types_row.tpl -text
 templates/de/html/admin/admin_del_networks.tpl -text
 templates/de/html/admin/admin_del_networks_row.tpl -text
 templates/de/html/admin/admin_del_payments.tpl -text
@@ -997,6 +1006,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_network_types.tpl -text
+templates/de/html/admin/admin_edit_network_types_row.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
@@ -1012,6 +1023,7 @@ 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_email_nav_row.tpl -text
+templates/de/html/admin/admin_expert_settings_form.tpl -text
 templates/de/html/admin/admin_ext_notes.tpl -text
 templates/de/html/admin/admin_ext_reg_form.tpl -text
 templates/de/html/admin/admin_ext_sql_row.tpl -text
@@ -1072,6 +1084,10 @@ 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_network_params.tpl -text
+templates/de/html/admin/admin_list_network_params_row.tpl -text
+templates/de/html/admin/admin_list_network_types.tpl -text
+templates/de/html/admin/admin_list_network_types_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
@@ -1169,6 +1185,8 @@ 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_network_request_param_added.tpl -text
+templates/de/html/admin/admin_network_type_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
@@ -1216,6 +1234,7 @@ templates/de/html/admin/admin_send_bonus_select.tpl -text
 templates/de/html/admin/admin_send_reset_link.tpl -text
 templates/de/html/admin/admin_send_yoomedia.tpl -text
 templates/de/html/admin/admin_settings_saved.tpl -text
+templates/de/html/admin/admin_settings_unsaved.tpl -text
 templates/de/html/admin/admin_sponsor_paytypes.tpl -text
 templates/de/html/admin/admin_sub_points.tpl -text
 templates/de/html/admin/admin_sub_points_all.tpl -text
@@ -1249,6 +1268,7 @@ templates/de/html/admin/admin_welcome.tpl -text
 templates/de/html/admin/admin_welcome_admins.tpl -text
 templates/de/html/admin/admin_yoomedia_error.tpl -text
 templates/de/html/agb.tpl -text
+templates/de/html/app_die_message.tpl -text
 templates/de/html/beg/.htaccess -text
 templates/de/html/beg/beg_banner.tpl -text
 templates/de/html/beg/beg_done.tpl -text
@@ -1288,6 +1308,7 @@ templates/de/html/ext/ext_debug.tpl -text
 templates/de/html/ext/ext_demo.tpl -text
 templates/de/html/ext/ext_doubler.tpl -text
 templates/de/html/ext/ext_events.tpl -text
+templates/de/html/ext/ext_grade.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
 templates/de/html/ext/ext_imprint.tpl -text
@@ -1477,7 +1498,6 @@ templates/de/html/member/member_menu_title.tpl -text
 templates/de/html/member/member_menu_whats.tpl -text
 templates/de/html/member/member_mydata_button.tpl -text
 templates/de/html/member/member_mydata_edit.tpl -text
-templates/de/html/member/member_mydata_locked.tpl -text
 templates/de/html/member/member_mydata_overview.tpl -text
 templates/de/html/member/member_newsletter.tpl -text
 templates/de/html/member/member_nickname_form.tpl -text
@@ -1602,6 +1622,7 @@ templates/de/html/show_bonus_header.tpl -text
 templates/de/html/show_bonus_msg.tpl -text
 templates/de/html/show_bonus_yr.tpl -text
 templates/de/html/show_timings.tpl -text
+templates/de/html/sponsor/.htaccess -text
 templates/de/html/sponsor/sponsor_account_form.tpl -text
 templates/de/html/sponsor/sponsor_action.tpl -text
 templates/de/html/sponsor/sponsor_fillup_form.tpl -text