git.mxchange.org Git - mailer.git/commit

author	Roland Häder <roland@mxchange.org>
	Sun, 28 Mar 2010 18:05:12 +0000 (18:05 +0000)
committer	Roland Häder <roland@mxchange.org>
	Sun, 28 Mar 2010 18:05:12 +0000 (18:05 +0000)
commit	1473fe9de9fe73856ab7fde98f5b74ee655e2104
tree	7e00fad9cdb21e4e46d53dc082e8609819450cd7	tree \| snapshot
parent	38916bd597d6cfef7a8ef8c1cd393089abe83edf	commit \| diff

Conflict solved, more templates added, TODOs.txt updated:
- Conflict between user and surfbar URL status solved
- New templates for unlock/reject of booked URLs added
- TODOs.txt updated

28 files changed:

DOCS/TODOs.txt		diff \| blob \| history
inc/language/surfbar_de.php		diff \| blob \| history
inc/libs/surfbar_functions.php		diff \| blob \| history
inc/modules/admin/what-list_surfbar_urls.php		diff \| blob \| history
inc/modules/admin/what-unlock_surfbar_urls.php		diff \| blob \| history
inc/modules/member/what-surfbar_list.php		diff \| blob \| history
templates/de/emails/admin/admin_del_surfbar_urls.tpl		diff \| blob \| history
templates/de/emails/admin/admin_surfbar_url_confirmed.tpl		diff \| blob \| history
templates/de/emails/admin/admin_surfbar_url_migrate.tpl		diff \| blob \| history
templates/de/emails/admin/admin_surfbar_url_pending.tpl		diff \| blob \| history
templates/de/emails/admin/admin_surfbar_url_pending_active.tpl	[new file with mode: 0644]	blob
templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl	[new file with mode: 0644]	blob
templates/de/emails/admin/admin_surfbar_url_reg.tpl		diff \| blob \| history
templates/de/emails/admin/admin_surfbar_url_rejected.tpl		diff \| blob \| history
templates/de/emails/admin/admin_surfbar_url_unlock.tpl		diff \| blob \| history
templates/de/emails/member/member_surfbar_url_confirmed.tpl		diff \| blob \| history
templates/de/emails/member/member_surfbar_url_depleted.tpl		diff \| blob \| history
templates/de/emails/member/member_surfbar_url_migrate.tpl		diff \| blob \| history
templates/de/emails/member/member_surfbar_url_pending.tpl		diff \| blob \| history
templates/de/emails/member/member_surfbar_url_pending_active.tpl	[new file with mode: 0644]	blob
templates/de/emails/member/member_surfbar_url_pending_rejected.tpl	[new file with mode: 0644]	blob
templates/de/emails/member/member_surfbar_url_reg.tpl		diff \| blob \| history
templates/de/emails/member/member_surfbar_url_rejected.tpl		diff \| blob \| history
templates/de/emails/member/member_surfbar_url_unlock.tpl		diff \| blob \| history
templates/de/html/admin/admin_list_surfbar_urls_row.tpl		diff \| blob \| history
templates/de/html/admin/admin_lock_surfbar_urls_row.tpl		diff \| blob \| history
templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl		diff \| blob \| history
templates/de/html/member/member_surfbar_list_row.tpl		diff \| blob \| history

Mailer-Project repository

RSS Atom