Installation NG continued (still not fully working)

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 7534d13e67efb4428afb94af8f1b67368548ee81..f90a825e2d3ed0b744bcba741698116fc8d3e6bf 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -118,6 +118,7 @@ inc/daily/daily_order.php svneol=native#text/plain
 inc/daily/daily_profile.php svneol=native#text/plain
 inc/daily/daily_surfbar.php svneol=native#text/plain
 inc/daily/daily_user.php svneol=native#text/plain
+inc/daily/daily_user_subids.php svneol=native#text/plain
 inc/daily/daily_yoomedia.php svneol=native#text/plain
 inc/databases.php svneol=native#text/plain
 inc/db/.htaccess svneol=native#text/plain
@@ -423,6 +424,7 @@ inc/loader/load_cache- svneol=native#text/plain
 inc/mails/.htaccess svneol=native#text/plain
 inc/mails/_mails.php svneol=native#text/plain
 inc/mails/beg_mails.php svneol=native#text/plain
+inc/mails/birthday_mails.php -text
 inc/mails/bonus_mails.php svneol=native#text/plain
 inc/mails/doubler_mails.php svneol=native#text/plain
 inc/math-functions.php svneol=native#text/plain
@@ -526,6 +528,7 @@ inc/modules/admin/what-config_title.php svneol=native#text/plain
 inc/modules/admin/what-config_top10.php svneol=native#text/plain
 inc/modules/admin/what-config_transfer.php svneol=native#text/plain
 inc/modules/admin/what-config_user.php svneol=native#text/plain
+inc/modules/admin/what-config_user_subid.php svneol=native#text/plain
 inc/modules/admin/what-config_validator.php svneol=native#text/plain
 inc/modules/admin/what-config_wernis.php svneol=native#text/plain
 inc/modules/admin/what-config_yoomedia.php svneol=native#text/plain
@@ -582,6 +585,7 @@ inc/modules/admin/what-list_sponsor.php svneol=native#text/plain
 inc/modules/admin/what-list_sponsor_pay.php svneol=native#text/plain
 inc/modules/admin/what-list_sponsor_pays.php svneol=native#text/plain
 inc/modules/admin/what-list_surfbar_actions.php svneol=native#text/plain
+inc/modules/admin/what-list_surfbar_packages.php svneol=native#text/plain
 inc/modules/admin/what-list_surfbar_urls.php svneol=native#text/plain
 inc/modules/admin/what-list_task.php svneol=native#text/plain
 inc/modules/admin/what-list_transfer.php svneol=native#text/plain
@@ -838,7 +842,11 @@ js/core-common.js svneol=native#text/javascript
 js/install-common.js svneol=native#text/javascript
 js/install-data.js svneol=native#text/javascript
 js/jquery-ui.custom.js svneol=native#text/javascript
+js/jquery-ui.js svneol=native#text/javascript
+js/jquery-ui.uncompressed.js -text
+js/jquery-uncompressed.js svneol=native#text/plain
 js/jquery.js svneol=native#text/plain
+js/jquery.uncompressed.js svneol=native#text/plain
 js/menu-common.js svneol=native#text/plain
 /lead-confirm.php svneol=native#text/plain
 /login.php svneol=native#text/plain
@@ -886,6 +894,7 @@ 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_campaigns.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
@@ -912,6 +921,8 @@ templates/de/emails/admin/admin_newsletter_reset.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_order_normal.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_payout_request.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_payout_request_banner.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_purge_user_server_name_log.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_purge_user_subid_log.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_rallye_expired.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_rallye_expired_no.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_rallye_no_notify.tpl svneol=native#text/plain
@@ -1013,6 +1024,8 @@ templates/de/emails/member/member_delete_user_subids.tpl svneol=native#text/plai
 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_forced_ads.tpl svneol=native#text/plain
+templates/de/emails/member/member_edit_forced_campaigns.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
@@ -1215,6 +1228,7 @@ templates/de/html/admin/admin_config_top10.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_transfer.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_transfer_pro.tpl -text
 templates/de/html/admin/admin_config_user.tpl svneol=native#text/plain
+templates/de/html/admin/admin_config_user_subid.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_validator.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_wernis.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_yoomedia.tpl svneol=native#text/plain
@@ -1814,9 +1828,11 @@ templates/de/html/install/install_fatal_row.tpl svneol=native#text/plain
 templates/de/html/install/install_fatal_table.tpl svneol=native#text/plain
 templates/de/html/install/install_finished.tpl svneol=native#text/plain
 templates/de/html/install/install_footer.tpl svneol=native#text/plain
+templates/de/html/install/install_header.tpl -text
 templates/de/html/install/install_main_ajax.tpl svneol=native#text/plain
 templates/de/html/install/install_main_plain.tpl svneol=native#text/plain
 templates/de/html/install/install_menu.tpl svneol=native#text/plain
+templates/de/html/install/install_overview_failed.tpl svneol=native#text/plain
 templates/de/html/install/install_page1.tpl svneol=native#text/plain
 templates/de/html/install/install_page2.tpl svneol=native#text/plain
 templates/de/html/install/install_page3.tpl svneol=native#text/plain
@@ -1825,6 +1841,7 @@ templates/de/html/install/install_page_base_data.tpl svneol=native#text/plain
 templates/de/html/install/install_page_database_config.tpl svneol=native#text/plain
 templates/de/html/install/install_page_init.tpl svneol=native#text/plain
 templates/de/html/install/install_page_other_config.tpl svneol=native#text/plain
+templates/de/html/install/install_page_overview.tpl svneol=native#text/plain
 templates/de/html/install/install_page_smtp_config.tpl svneol=native#text/plain
 templates/de/html/install/install_page_welcome.tpl svneol=native#text/plain
 templates/de/html/install/install_selector.tpl svneol=native#text/plain