Missing 'points subjects' and 'subject' added

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 40a522f9cfdf4d8aa8693cbe72003705d5273703..22227754c175a869aaf0b590e8b675b9f3154e2d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -61,6 +61,7 @@ DOCS/en/rewrite/.htaccess svneol=native#text/plain
 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/tpl-validator.php svneol=native#text/plain
 /admin.php svneol=native#text/plain
 /agb.php svneol=native#text/plain
@@ -144,9 +145,11 @@ inc/extensions/ext-coupon.php svneol=native#text/plain
 inc/extensions/ext-debug.php svneol=native#text/plain
 inc/extensions/ext-demo.php svneol=native#text/plain
 inc/extensions/ext-doubler.php svneol=native#text/plain
+inc/extensions/ext-earning.php svneol=native#text/plain
 inc/extensions/ext-events.php svneol=native#text/plain
 inc/extensions/ext-forced.php svneol=native#text/plain
 inc/extensions/ext-funcoins.php svneol=native#text/plain
+inc/extensions/ext-geoip.php svneol=native#text/plain
 inc/extensions/ext-grade.php svneol=native#text/plain
 inc/extensions/ext-holiday.php svneol=native#text/plain
 inc/extensions/ext-html_mail.php svneol=native#text/plain
@@ -211,6 +214,7 @@ inc/filter/bonus_filter.php svneol=native#text/plain
 inc/filter/booking_filter.php svneol=native#text/plain
 inc/filter/cache_filter.php svneol=native#text/plain
 inc/filter/coupon_filter.php svneol=native#text/plain
+inc/filter/earning_filter.php svneol=native#text/plain
 inc/filter/forced_filter.php svneol=native#text/plain
 inc/filter/mediadata_filter.php svneol=native#text/plain
 inc/filter/online_filter.php svneol=native#text/plain
@@ -273,6 +277,7 @@ inc/language/coupon_de.php svneol=native#text/plain
 inc/language/de.php svneol=native#text/plain
 inc/language/debug_de.php svneol=native#text/plain
 inc/language/doubler_de.php svneol=native#text/plain
+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
@@ -330,6 +335,7 @@ inc/libs/country_functions.php svneol=native#text/plain
 inc/libs/coupon_functions.php svneol=native#text/plain
 inc/libs/debug_functions.php svneol=native#text/plain
 inc/libs/doubler_functions.php svneol=native#text/plain
+inc/libs/earning_functions.php svneol=native#text/plain
 inc/libs/events_functions.php svneol=native#text/plain
 inc/libs/forced_functions.php svneol=native#text/plain
 inc/libs/funcoins_functions.php svneol=native#text/plain
@@ -372,11 +378,13 @@ inc/loader/.htaccess svneol=native#text/plain
 inc/loader/load- svneol=native#text/plain
 inc/loader/load-admins.php svneol=native#text/plain
 inc/loader/load-config.php svneol=native#text/plain
+inc/loader/load-earning.php svneol=native#text/plain
 inc/loader/load-extension.php svneol=native#text/plain
 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-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
 inc/loader/load-revision.php svneol=native#text/plain
@@ -527,12 +535,15 @@ inc/modules/admin/what-list_coupon.php svneol=native#text/plain
 inc/modules/admin/what-list_doubler.php svneol=native#text/plain
 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_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_params.php svneol=native#text/plain
 inc/modules/admin/what-list_network_types.php svneol=native#text/plain
 inc/modules/admin/what-list_networks.php svneol=native#text/plain
+inc/modules/admin/what-list_nickname.php svneol=native#text/plain
 inc/modules/admin/what-list_notifications.php svneol=native#text/plain
 inc/modules/admin/what-list_payouts.php svneol=native#text/plain
 inc/modules/admin/what-list_point_accounts.php svneol=native#text/plain
@@ -644,6 +655,8 @@ inc/modules/member/what-booking.php svneol=native#text/plain
 inc/modules/member/what-cash_coupon.php svneol=native#text/plain
 inc/modules/member/what-categories.php svneol=native#text/plain
 inc/modules/member/what-doubler.php svneol=native#text/plain
+inc/modules/member/what-earning.php svneol=native#text/plain
+inc/modules/member/what-earnings.php svneol=native#text/plain
 inc/modules/member/what-guest.php svneol=native#text/plain
 inc/modules/member/what-holiday.php svneol=native#text/plain
 inc/modules/member/what-html_mail.php svneol=native#text/plain
@@ -813,6 +826,8 @@ 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_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_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_holiday_deactivated.tpl svneol=native#text/plain
@@ -919,6 +934,8 @@ 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_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_holiday_activated.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_removed.tpl svneol=native#text/plain
@@ -939,6 +956,7 @@ templates/de/emails/member/member_profile.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_bronce.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_gold.tpl svneol=native#text/plain
+templates/de/emails/member/member_rallye_expired_other.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_silver.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_notify.tpl svneol=native#text/plain
 templates/de/emails/member/member_refback.tpl svneol=native#text/plain
@@ -1264,6 +1282,8 @@ templates/de/html/admin/admin_list_country_no_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_country_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_coupon.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_coupon_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_coupon_usr.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_coupon_usr_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_already.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_overview.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_waiting.tpl svneol=native#text/plain
@@ -1506,9 +1526,11 @@ templates/de/html/ext/ext_coupon.tpl svneol=native#text/plain
 templates/de/html/ext/ext_debug.tpl svneol=native#text/plain
 templates/de/html/ext/ext_demo.tpl svneol=native#text/plain
 templates/de/html/ext/ext_doubler.tpl svneol=native#text/plain
+templates/de/html/ext/ext_earning.tpl svneol=native#text/plain
 templates/de/html/ext/ext_events.tpl svneol=native#text/plain
 templates/de/html/ext/ext_forced.tpl svneol=native#text/plain
 templates/de/html/ext/ext_funcoins.tpl svneol=native#text/plain
+templates/de/html/ext/ext_geoip.tpl svneol=native#text/plain
 templates/de/html/ext/ext_grade.tpl svneol=native#text/plain
 templates/de/html/ext/ext_holiday.tpl svneol=native#text/plain
 templates/de/html/ext/ext_html_mail.tpl svneol=native#text/plain
@@ -1692,6 +1714,11 @@ templates/de/html/member/member_content_right.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
+templates/de/html/member/member_earning.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_data_invalid.tpl svneol=native#text/plain
+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_footer.tpl svneol=native#text/plain
 templates/de/html/member/member_goto_top.tpl svneol=native#text/plain
@@ -1858,6 +1885,8 @@ templates/de/html/removeip_level.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_row.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_table.tpl svneol=native#text/plain
 templates/de/html/select/.htaccess svneol=native#text/plain
+templates/de/html/select/select_admins_box.tpl svneol=native#text/plain
+templates/de/html/select/select_admins_option.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_ads_type_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_ads_type_option.tpl svneol=native#text/plain
 templates/de/html/select/select_network_box.tpl svneol=native#text/plain