Unlock of booked URLs in surfbar added, fix for URL-encoded links in loader module

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index f0758879806a528ad3723ade7029d2c3cbfe7b41..09f59dacc6c87502584d11069b2d7e8437882a0d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -600,6 +600,7 @@ 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_confirmed.tpl -text
 templates/de/emails/admin/admin_surfbar_url_reg.tpl -text
 templates/de/emails/admin/admin_surfbar_url_unlock.tpl -text
 templates/de/emails/admin/admin_transfer_ap.tpl -text
@@ -665,6 +666,7 @@ templates/de/emails/member/member_support-order.tpl -text
 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_url_confirmed.tpl -text
 templates/de/emails/member/member_surfbar_url_reg.tpl -text
 templates/de/emails/member/member_surfbar_url_unlock.tpl -text
 templates/de/emails/member/member_transfer_recipient.tpl -text
@@ -1029,6 +1031,8 @@ templates/de/html/admin/admin_unlock_emails_redir_row.tpl -text
 templates/de/html/admin/admin_unlock_emails_row.tpl -text
 templates/de/html/admin/admin_unlock_sponsor.tpl -text
 templates/de/html/admin/admin_unlock_sponsor_row.tpl -text
+templates/de/html/admin/admin_unlock_surfbar_urls.tpl -text
+templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl -text
 templates/de/html/admin/admin_update_download.tpl -text
 templates/de/html/admin/admin_user_details.tpl -text
 templates/de/html/admin/admin_validate_reset_hash_form.tpl -text
@@ -1302,6 +1306,7 @@ templates/de/html/surfbar/.htaccess -text
 templates/de/html/surfbar/surfbar_frame_banner.tpl -text
 templates/de/html/surfbar/surfbar_frame_start.tpl -text
 templates/de/html/surfbar/surfbar_frame_stats.tpl -text
+templates/de/html/surfbar/surfbar_frame_textlinks.tpl -text
 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