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 cff20e66278bc6c5a54810166d9515d14a7bc700..09f59dacc6c87502584d11069b2d7e8437882a0d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -363,6 +363,7 @@ inc/modules/admin/what-theme_edit.php -text
 inc/modules/admin/what-theme_import.php -text
 inc/modules/admin/what-unlock_emails.php -text
 inc/modules/admin/what-unlock_sponsor.php -text
+inc/modules/admin/what-unlock_surfbar_urls.php -text
 inc/modules/admin/what-updates.php -text
 inc/modules/admin/what-usage.php -text
 inc/modules/admin/what-user_contct.php -text
@@ -441,6 +442,7 @@ inc/modules/member/what-reflinks.php -text
 inc/modules/member/what-sponsor.php -text
 inc/modules/member/what-stats.php -text
 inc/modules/member/what-support.php -text
+inc/modules/member/what-surfbar_book.php -text
 inc/modules/member/what-surfbar_start.php -text
 inc/modules/member/what-themes.php -text
 inc/modules/member/what-transfer.php -text
@@ -460,7 +462,7 @@ inc/monthly/monthly_ -text
 inc/monthly/monthly_beg.php -text
 inc/monthly/monthly_bonus.php -text
 inc/monthly/monthly_newsletter.php -text
-inc/monthly_newsletter.php -text
+inc/monthly/monthly_surfbar.php -text
 inc/mysql-connect.php -text
 inc/mysql-manager.php -text
 inc/patch-system.php -text
@@ -536,12 +538,16 @@ inc/reset/reset_bonus.php -text
 inc/reset/reset_daily.php -text
 inc/reset/reset_engine.php -text
 inc/reset/reset_holiday.php -text
+inc/reset/reset_surfbar.php -text
 inc/security.php -text
 inc/session.php -text
 inc/sql_error.php -text
 inc/stats_bonus.php -text
 inc/stylesheet.php -text
 inc/theme-manager.php -text
+inc/weekly/.htaccess -text
+inc/weekly/weekly_ -text
+inc/weekly/weekly_surfbar.php -text
 /index.php -text
 /install.php -text
 install/menu-de.sql -text
@@ -594,6 +600,8 @@ 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
 templates/de/emails/admin/admin_transfer_points.tpl -text
@@ -658,6 +666,8 @@ 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
 templates/de/emails/member/member_transfer_sender.tpl -text
@@ -1021,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
@@ -1240,6 +1252,8 @@ templates/de/html/member/member_stats_table.tpl -text
 templates/de/html/member/member_support_contacted.tpl -text
 templates/de/html/member/member_support_contcted.tpl -text
 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.tpl -text
 templates/de/html/member/member_surfbar_link.tpl -text
 templates/de/html/member/member_surfbar_start_static.tpl -text
 templates/de/html/member/member_themes.tpl -text
@@ -1290,8 +1304,12 @@ templates/de/html/sponsor/sponsor_welcome.tpl -text
 templates/de/html/sponsor/sponsor_what.tpl -text
 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
 templates/de/html/surfbar/surfbar_stopped.tpl -text
 templates/de/html/theme_one.tpl -text
 templates/de/html/theme_select_box.tpl -text
@@ -1310,6 +1328,7 @@ theme/business/css/general.css -text
 theme/business/css/install.css -text
 theme/business/css/register.css -text
 theme/business/css/sponsor.css -text
+theme/business/css/surfbar.css -text
 theme/business/css/top10.css -text
 theme/business/css/transfer.css -text
 theme/business/images/code_bg.jpg -text
@@ -1323,6 +1342,7 @@ theme/default/css/general.css -text
 theme/default/css/install.css -text
 theme/default/css/register.css -text
 theme/default/css/sponsor.css -text
+theme/default/css/surfbar.css -text
 theme/default/css/top10.css -text
 theme/default/css/transfer.css -text
 theme/default/images/code_bg.jpg -text
@@ -1338,6 +1358,7 @@ theme/desert/css/install.css -text
 theme/desert/css/paidlinks.css -text
 theme/desert/css/register.css -text
 theme/desert/css/sponsor.css -text
+theme/desert/css/surfbar.css -text
 theme/desert/css/top10.css -text
 theme/desert/css/transfer.css -text
 theme/desert/images/code_bg.jpg -text