Incomplete 'booking' extension added, fixes for registration and refback list

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index a52ab12f9454ed843b438a52bc91af8c7f4ff216..1a68632c5c5dc5a1150ffd10d2eea41ada1b6c9c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -106,6 +106,7 @@ 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
@@ -157,6 +158,7 @@ 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
@@ -164,6 +166,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
@@ -207,6 +210,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
@@ -629,7 +633,7 @@ templates/de/emails/admin/admin_edit_surfbar_urls.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
@@ -653,15 +657,25 @@ 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_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
@@ -705,7 +719,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
@@ -727,15 +741,25 @@ 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_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
@@ -1005,6 +1029,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
@@ -1072,6 +1097,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
@@ -1166,6 +1192,7 @@ 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
@@ -1306,6 +1333,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
@@ -1385,6 +1413,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
@@ -1508,4 +1538,30 @@ theme/desert/images/help/left.jpg -text
 theme/desert/images/help/right.jpg -text
 theme/desert/images/help/up.jpg -text
 theme/desert/theme.php -text
+unsupported/affiliblatt/inc/extensions/ext-affiliblatt.php -text
+unsupported/affiliblatt/inc/language/affiliblatt_de.php -text
+unsupported/affiliblatt/inc/libs/affiliblatt_functions.php -text
+unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php -text
+unsupported/affiliblatt/inc/modules/admin/what-list_affiliblatt_tm.php -text
+unsupported/affiliblatt/inc/reset/reset_affiliblatt.php -text
+unsupported/affiliblatt/templates/de/html/admin/admin_affiliblatt_error.tpl -text
+unsupported/affiliblatt/templates/de/html/admin/admin_config_affiliblatt.tpl -text
+unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm.tpl -text
+unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm_already.tpl -text
+unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm_row.tpl -text
+unsupported/affiliblatt/templates/de/html/admin/admin_send_affiliblatt.tpl -text
+unsupported/affiliblatt/templates/de/html/ext/ext_affiliblatt.tpl -text
+unsupported/gollox/inc/extensions/ext-gollox.php -text
+unsupported/gollox/inc/language/gollox_de.php -text
+unsupported/gollox/inc/libs/gollox_functions.php -text
+unsupported/gollox/inc/modules/admin/what-config_gollox.php -text
+unsupported/gollox/inc/modules/admin/what-list_gollox_tm.php -text
+unsupported/gollox/inc/reset/reset_gollox.php -text
+unsupported/gollox/templates/de/html/admin/admin_config_gollox.tpl -text
+unsupported/gollox/templates/de/html/admin/admin_gollox_error.tpl -text
+unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm.tpl -text
+unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm_already.tpl -text
+unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm_row.tpl -text
+unsupported/gollox/templates/de/html/admin/admin_send_gollox.tpl -text
+unsupported/gollox/templates/de/html/ext/ext_gollox.tpl -text
 /view.php -text