X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=.gitattributes;h=7e7e3213b671d1fd4cad5d145cc36ade5bb3795a;hb=6c763653e88b9d10627e651ca59c7201d4b7d62b;hp=3d8078eedf028035bacebedb720564de8fd1260a;hpb=056162fe45aa0d850bb22870e1caf9595a847a9b;p=mailer.git diff --git a/.gitattributes b/.gitattributes index 3d8078eedf..7e7e3213b6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -106,13 +106,16 @@ inc/extensions/ext-bank.php -text inc/extensions/ext-beg.php -text inc/extensions/ext-birthday.php -text inc/extensions/ext-bonus.php -text +inc/extensions/ext-booking.php -text inc/extensions/ext-cache.php -text inc/extensions/ext-country.php -text 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-holiday.php -text inc/extensions/ext-html_mail.php -text +inc/extensions/ext-iso3166.php -text inc/extensions/ext-mailid.php -text inc/extensions/ext-maintenance.php -text inc/extensions/ext-mediadata.php -text @@ -152,10 +155,12 @@ inc/gen_mediadata.php -text inc/gen_refback.php -text inc/gen_sql_patches.php -text inc/header.php -text +inc/img/.htaccess -text inc/install-inc.php -text inc/js/.htaccess -text inc/language.php -text inc/language/.htaccess -text +inc/language/_de.php -text inc/language/active_de.php -text inc/language/admins_de.php -text inc/language/autopurge_de.php -text @@ -163,6 +168,7 @@ inc/language/bank_de.php -text inc/language/beg_de.php -text inc/language/birthday_de.php -text inc/language/bonus_de.php -text +inc/language/booking_de.php -text inc/language/cache_de.php -text inc/language/country_de.php -text inc/language/de.php -text @@ -206,6 +212,7 @@ inc/libs/admins_functions.php -text inc/libs/autopurge_functions.php -text inc/libs/beg_functions.php -text inc/libs/bonus_functions.php -text +inc/libs/booking_functions.php -text inc/libs/cache_functions.php -text inc/libs/country_functions.php -text inc/libs/debug_functions.php -text @@ -575,6 +582,9 @@ inc/phpmailer/test/phpmailer_test.php -text inc/phpmailer/test/phpunit.php -text inc/phpmailer/test/test.png -text inc/pool-update.php -text +inc/pool/.htaccess -text +inc/pool/pool-bonus.php -text +inc/pool/pool-user.php -text inc/profile-updte.php -text inc/rdf.class.php -text inc/reset/.htaccess -text @@ -600,6 +610,7 @@ inc/weekly/weekly_surfbar.php -text install/menu-de.sql -text install/menu-en.sql -text install/tables.sql -text +/js.php -text /lead-confirm.php -text /login.php -text /mailid.php -text @@ -613,8 +624,10 @@ install/tables.sql -text /surfbar.php -text templates/.htaccess -text templates/de/.htaccess -text +templates/de/emails/.htaccess -text templates/de/emails/add-points.tpl -text templates/de/emails/admin-del_links.tpl -text +templates/de/emails/admin/.htaccess -text templates/de/emails/admin/admin_autopurge_del_mails.tpl -text templates/de/emails/admin/admin_autopurge_delete.tpl -text templates/de/emails/admin/admin_autopurge_inactive.tpl -text @@ -624,10 +637,11 @@ templates/de/emails/admin/admin_autopurge_turbo.tpl -text templates/de/emails/admin/admin_autopurge_unconfirmed.tpl -text templates/de/emails/admin/admin_del_surfbar_urls.tpl -text templates/de/emails/admin/admin_edit_surfbar_urls.tpl -text +templates/de/emails/admin/admin_ext_deactivated.tpl -text templates/de/emails/admin/admin_holiday_deactivated.tpl -text templates/de/emails/admin/admin_holiday_request.tpl -text templates/de/emails/admin/admin_holiday_unlock.tpl -text -templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl -text +templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl -text templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl -text templates/de/emails/admin/admin_mydata_notify.tpl -text templates/de/emails/admin/admin_newsletter_request.tpl -text @@ -651,15 +665,28 @@ templates/de/emails/admin/admin_support-order.tpl -text templates/de/emails/admin/admin_support-ordr.tpl -text templates/de/emails/admin/admin_support-reflink.tpl -text templates/de/emails/admin/admin_support-unconfirmed.tpl -text +templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_active_pending.tpl -text +templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl -text templates/de/emails/admin/admin_surfbar_url_confirmed.tpl -text templates/de/emails/admin/admin_surfbar_url_depleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl -text templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text +templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl -text +templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl -text templates/de/emails/admin/admin_surfbar_url_pending.tpl -text +templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl -text templates/de/emails/admin/admin_surfbar_url_reg.tpl -text templates/de/emails/admin/admin_surfbar_url_rejected.tpl -text +templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl -text +templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl -text templates/de/emails/admin/admin_surfbar_url_unlock.tpl -text templates/de/emails/admin/admin_transfer_ap.tpl -text templates/de/emails/admin/admin_transfer_points.tpl -text +templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl -text 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 @@ -683,10 +710,12 @@ templates/de/emails/del-user.tpl -text templates/de/emails/del_sponsor.tpl -text templates/de/emails/done-admin.tpl -text templates/de/emails/done-member.tpl -text +templates/de/emails/guest/.htaccess -text templates/de/emails/guest/guest_request_confirm.tpl -text templates/de/emails/header.tpl -text templates/de/emails/lock-user.tpl -text templates/de/emails/lock_sponsor.tpl -text +templates/de/emails/member/.htaccess -text templates/de/emails/member/member_autopurge_delete.tpl -text templates/de/emails/member/member_autopurge_inactive.tpl -text templates/de/emails/member/member_autopurge_points.tpl -text @@ -703,7 +732,7 @@ templates/de/emails/member/member_holiday_activated.tpl -text templates/de/emails/member/member_holiday_removed.tpl -text templates/de/emails/member/member_holiday_request.tpl -text templates/de/emails/member/member_holiday_unlock.tpl -text -templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl -text +templates/de/emails/member/member_lock_active_surfbar_urls.tpl -text templates/de/emails/member/member_lock_locked_surfbar_urls.tpl -text templates/de/emails/member/member_mydata_notify.tpl -text templates/de/emails/member/member_newsletter_done.tpl -text @@ -725,15 +754,28 @@ templates/de/emails/member/member_support-ordr.tpl -text templates/de/emails/member/member_support-reflink.tpl -text templates/de/emails/member/member_support-unconfirmed.tpl -text templates/de/emails/member/member_surfbar_low_points.tpl -text +templates/de/emails/member/member_surfbar_url_active_deleted.tpl -text +templates/de/emails/member/member_surfbar_url_active_pending.tpl -text +templates/de/emails/member/member_surfbar_url_active_stopped.tpl -text templates/de/emails/member/member_surfbar_url_confirmed.tpl -text templates/de/emails/member/member_surfbar_url_depleted.tpl -text +templates/de/emails/member/member_surfbar_url_locked_deleted.tpl -text +templates/de/emails/member/member_surfbar_url_locked_pending.tpl -text templates/de/emails/member/member_surfbar_url_migrate.tpl -text +templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl -text +templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl -text +templates/de/emails/member/member_surfbar_url_migrated_pending.tpl -text templates/de/emails/member/member_surfbar_url_pending.tpl -text +templates/de/emails/member/member_surfbar_url_pending_deleted.tpl -text templates/de/emails/member/member_surfbar_url_reg.tpl -text templates/de/emails/member/member_surfbar_url_rejected.tpl -text +templates/de/emails/member/member_surfbar_url_stopped_continued.tpl -text +templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl -text +templates/de/emails/member/member_surfbar_url_stopped_pending.tpl -text templates/de/emails/member/member_surfbar_url_unlock.tpl -text templates/de/emails/member/member_transfer_recipient.tpl -text templates/de/emails/member/member_transfer_sender.tpl -text +templates/de/emails/member/member_undelete_active_surfbar_urls.tpl -text templates/de/emails/member/member_wernis_accepted.tpl -text templates/de/emails/member/member_wernis_rejected.tpl -text templates/de/emails/member/member_wernis_request.tpl -text @@ -749,6 +791,7 @@ templates/de/emails/order-reject.tpl -text templates/de/emails/profile-updte.tpl -text templates/de/emails/register-admin.tpl -text templates/de/emails/register-member.tpl -text +templates/de/emails/sponsor/.htaccess -text templates/de/emails/sponsor/sponsor_activate.tpl -text templates/de/emails/sponsor/sponsor_add_points.tpl -text templates/de/emails/sponsor/sponsor_change_data.tpl -text @@ -1003,6 +1046,7 @@ templates/de/html/admin/admin_list_surfbar_actions.tpl -text templates/de/html/admin/admin_list_surfbar_actions_row.tpl -text templates/de/html/admin/admin_list_surfbar_urls.tpl -text templates/de/html/admin/admin_list_surfbar_urls_row.tpl -text +templates/de/html/admin/admin_list_task_ext_rows.tpl -text templates/de/html/admin/admin_list_task_rows.tpl -text templates/de/html/admin/admin_list_transfer.tpl -text templates/de/html/admin/admin_list_transfer_row.tpl -text @@ -1070,6 +1114,7 @@ templates/de/html/admin/admin_overview_footer_task.tpl -text templates/de/html/admin/admin_overview_header.tpl -text templates/de/html/admin/admin_overview_header_task.tpl -text templates/de/html/admin/admin_overview_list.tpl -text +templates/de/html/admin/admin_overview_list_ext_rows.tpl -text templates/de/html/admin/admin_overview_list_rows.tpl -text templates/de/html/admin/admin_overview_row.tpl -text templates/de/html/admin/admin_overview_task.tpl -text @@ -1164,11 +1209,13 @@ templates/de/html/ext/ext_bank.tpl -text templates/de/html/ext/ext_beg.tpl -text templates/de/html/ext/ext_birthday.tpl -text templates/de/html/ext/ext_bonus.tpl -text +templates/de/html/ext/ext_booking.tpl -text templates/de/html/ext/ext_cache.tpl -text templates/de/html/ext/ext_country.tpl -text 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_holiday.tpl -text templates/de/html/ext/ext_html_mail.tpl -text templates/de/html/ext/ext_mailid.tpl -text @@ -1304,6 +1351,7 @@ templates/de/html/member/member_bonus_row.tpl -text templates/de/html/member/member_cat_row.tpl -text templates/de/html/member/member_cats_footer.tpl -text templates/de/html/member/member_cats_header.tpl -text +templates/de/html/member/member_content_right.tpl -text templates/de/html/member/member_doubler.tpl -text templates/de/html/member/member_doubler_list.tpl -text templates/de/html/member/member_doubler_list_rows.tpl -text @@ -1383,6 +1431,8 @@ templates/de/html/member/member_support_form.tpl -text templates/de/html/member/member_surfbar_book_dynamic.tpl -text templates/de/html/member/member_surfbar_book_static.tp -text templates/de/html/member/member_surfbar_book_static.tpl -text +templates/de/html/member/member_surfbar_delete_action_form.tpl -text +templates/de/html/member/member_surfbar_edit_action_form.tpl -text templates/de/html/member/member_surfbar_link.tpl -text templates/de/html/member/member_surfbar_list.tpl -text templates/de/html/member/member_surfbar_list_row.tpl -text @@ -1448,6 +1498,8 @@ templates/de/html/surfbar/surfbar_frame_top.tpl -text templates/de/html/surfbar/surfbar_frameset.tpl -text templates/de/html/surfbar/surfbar_start_banner.tpl -text templates/de/html/surfbar/surfbar_stopped.tpl -text +templates/de/html/task/.htaccess -text +templates/de/html/task/task_ext_deactivated.tpl -text templates/de/html/theme_one.tpl -text templates/de/html/theme_select_box.tpl -text templates/de/html/theme_select_form.tpl -text