Merge remote-tracking branch 'origin/ticket/r15128-sponsor'

2017-12-20 11:03:07 +01:00 · 2017-12-20 11:03:07 +01:00 · 1116cb292f
commit 1116cb292f
parent 9e25127b26 326de6a61f
365 changed files with 67 additions and 420 deletions
--- a/modules/invite/.hg/00changelog.i
+++ b/modules/invite/.hg/00changelog.i
--- a/modules/invite/.hg/branch
+++ b/modules/invite/.hg/branch
@ -1 +0,0 @@
-default
--- a/modules/invite/.hg/cache/branchheads
+++ b/modules/invite/.hg/cache/branchheads
@ -1,2 +0,0 @@
-0cc9f45d26c01e5acf699ed63cfa4bea75a652c4 14
-0cc9f45d26c01e5acf699ed63cfa4bea75a652c4 default
--- a/modules/invite/.hg/cache/tags
+++ b/modules/invite/.hg/cache/tags
@ -1,2 +0,0 @@
-14 0cc9f45d26c01e5acf699ed63cfa4bea75a652c4
-
--- a/modules/invite/.hg/dirstate
+++ b/modules/invite/.hg/dirstate
--- a/modules/invite/.hg/hgrc
+++ b/modules/invite/.hg/hgrc
@ -1,2 +0,0 @@
-[paths]
-default = ssh://ewen@localhost//hg/invite
--- a/modules/invite/.hg/requires
+++ b/modules/invite/.hg/requires
@ -1,4 +0,0 @@
-revlogv1
-fncache
-store
-dotencode
--- a/modules/invite/.hg/store/00changelog.i
+++ b/modules/invite/.hg/store/00changelog.i
--- a/modules/invite/.hg/store/00manifest.i
+++ b/modules/invite/.hg/store/00manifest.i
--- a/modules/invite/.hg/store/data/_invite_module.php.i
+++ b/modules/invite/.hg/store/data/_invite_module.php.i
--- a/modules/invite/.hg/store/data/_r_e_a_d_m_e.txt.i
+++ b/modules/invite/.hg/store/data/_r_e_a_d_m_e.txt.i
--- a/modules/invite/.hg/store/data/ajax__friends.php.i
+++ b/modules/invite/.hg/store/data/ajax__friends.php.i
--- a/modules/invite/.hg/store/data/ajax__friends.tpl.i
+++ b/modules/invite/.hg/store/data/ajax__friends.tpl.i
--- a/modules/invite/.hg/store/data/ajax__inviter.php.i
+++ b/modules/invite/.hg/store/data/ajax__inviter.php.i
--- a/modules/invite/.hg/store/data/authentication.tpl.i
+++ b/modules/invite/.hg/store/data/authentication.tpl.i
--- a/modules/invite/.hg/store/data/config.xml.i
+++ b/modules/invite/.hg/store/data/config.xml.i
--- a/modules/invite/.hg/store/data/en.php.i
+++ b/modules/invite/.hg/store/data/en.php.i
--- a/modules/invite/.hg/store/data/fr.php.i
+++ b/modules/invite/.hg/store/data/fr.php.i
--- a/modules/invite/.hg/store/data/img/_facebook.jpg.i
+++ b/modules/invite/.hg/store/data/img/_facebook.jpg.i
--- a/modules/invite/.hg/store/data/img/_g_mail
+++ b/modules/invite/.hg/store/data/img/_g_mail
--- a/modules/invite/.hg/store/data/img/_g_mail.jpg.i
+++ b/modules/invite/.hg/store/data/img/_g_mail.jpg.i
--- a/modules/invite/.hg/store/data/img/_live_hotmail
+++ b/modules/invite/.hg/store/data/img/_live_hotmail
--- a/modules/invite/.hg/store/data/img/_live_hotmail.jpg.i
+++ b/modules/invite/.hg/store/data/img/_live_hotmail.jpg.i
--- a/modules/invite/.hg/store/data/img/_yahoo
+++ b/modules/invite/.hg/store/data/img/_yahoo
--- a/modules/invite/.hg/store/data/img/_yahoo.jpg.i
+++ b/modules/invite/.hg/store/data/img/_yahoo.jpg.i
--- a/modules/invite/.hg/store/data/index.php.i
+++ b/modules/invite/.hg/store/data/index.php.i
--- a/modules/invite/.hg/store/data/invite-program.php.i
+++ b/modules/invite/.hg/store/data/invite-program.php.i
--- a/modules/invite/.hg/store/data/invite-program.tpl.i
+++ b/modules/invite/.hg/store/data/invite-program.tpl.i
--- a/modules/invite/.hg/store/data/invite-rules.php.i
+++ b/modules/invite/.hg/store/data/invite-rules.php.i
--- a/modules/invite/.hg/store/data/invite-rules.tpl.i
+++ b/modules/invite/.hg/store/data/invite-rules.tpl.i
--- a/modules/invite/.hg/store/data/invite.gif.i
+++ b/modules/invite/.hg/store/data/invite.gif.i
--- a/modules/invite/.hg/store/data/invite.php.i
+++ b/modules/invite/.hg/store/data/invite.php.i
--- a/modules/invite/.hg/store/data/invite.xml.i
+++ b/modules/invite/.hg/store/data/invite.xml.i
--- a/modules/invite/.hg/store/data/logo.gif.i
+++ b/modules/invite/.hg/store/data/logo.gif.i
--- a/modules/invite/.hg/store/data/mails/en/index.php.i
+++ b/modules/invite/.hg/store/data/mails/en/index.php.i
--- a/modules/invite/.hg/store/data/mails/en/invite-congratulations.html.i
+++ b/modules/invite/.hg/store/data/mails/en/invite-congratulations.html.i
--- a/modules/invite/.hg/store/data/mails/en/invite-congratulations.txt.i
+++ b/modules/invite/.hg/store/data/mails/en/invite-congratulations.txt.i
--- a/modules/invite/.hg/store/data/mails/en/invite-invitation.html.i
+++ b/modules/invite/.hg/store/data/mails/en/invite-invitation.html.i
--- a/modules/invite/.hg/store/data/mails/en/invite-invitation.txt.i
+++ b/modules/invite/.hg/store/data/mails/en/invite-invitation.txt.i
--- a/modules/invite/.hg/store/data/mails/en/invite-voucher.html.i
+++ b/modules/invite/.hg/store/data/mails/en/invite-voucher.html.i
--- a/modules/invite/.hg/store/data/mails/en/invite-voucher.txt.i
+++ b/modules/invite/.hg/store/data/mails/en/invite-voucher.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/index.php.i
+++ b/modules/invite/.hg/store/data/mails/fr/index.php.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-congratulations.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-congratulations.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-congratulations.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-congratulations.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-credit.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-credit.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-credit.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-credit.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-credit.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-credit.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-credit.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-credit.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-amount.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-amount.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-amount.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-amount.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-percent.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-percent.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-percent.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-discount-percent.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-loyalty.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-loyalty.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-loyalty.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-loyalty.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-shipping.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-shipping.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation-shipping.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation-shipping.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-invitation.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-invitation.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-loyalty.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-loyalty.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-loyalty.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-loyalty.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher-amount.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher-amount.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher-amount.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher-amount.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher-percent.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher-percent.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher-percent.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher-percent.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher-shipping.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher-shipping.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher-shipping.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher-shipping.txt.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher.html.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher.html.i
--- a/modules/invite/.hg/store/data/mails/fr/invite-voucher.txt.i
+++ b/modules/invite/.hg/store/data/mails/fr/invite-voucher.txt.i
--- a/modules/invite/.hg/store/data/mails/index.php.i
+++ b/modules/invite/.hg/store/data/mails/index.php.i
--- a/modules/invite/.hg/store/data/my-account.tpl.i
+++ b/modules/invite/.hg/store/data/my-account.tpl.i
--- a/modules/invite/.hg/store/data/openinviter.tpl.i
+++ b/modules/invite/.hg/store/data/openinviter.tpl.i
--- a/modules/invite/.hg/store/data/openinviter/____postinstall.php.i
+++ b/modules/invite/.hg/store/data/openinviter/____postinstall.php.i
--- a/modules/invite/.hg/store/data/openinviter/_l_i_c_e_n_s_e.txt.i
+++ b/modules/invite/.hg/store/data/openinviter/_l_i_c_e_n_s_e.txt.i
--- a/modules/invite/.hg/store/data/openinviter/_p_o_l_i_c_y.txt.i
+++ b/modules/invite/.hg/store/data/openinviter/_p_o_l_i_c_y.txt.i
--- a/modules/invite/.hg/store/data/openinviter/autoupdate.php.i
+++ b/modules/invite/.hg/store/data/openinviter/autoupdate.php.i
--- a/modules/invite/.hg/store/data/openinviter/conf/__hosted.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf/__hosted.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf/facebook.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf/facebook.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf/gmail.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf/gmail.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf/hotmail.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf/hotmail.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf/yahoo.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf/yahoo.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/abv.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/abv.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/aol.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/aol.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/apropo.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/apropo.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/atlas.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/atlas.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/aussiemail.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/aussiemail.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/azet.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/azet.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/badoo.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/badoo.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/bebo.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/bebo.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/bigstring.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/bigstring.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/bookcrossing.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/bookcrossing.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/bordermail.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/bordermail.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/brazencareerist.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/brazencareerist.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/canoe.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/canoe.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/care2.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/care2.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/clevergo.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/clevergo.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/cyworld.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/cyworld.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/doramail.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/doramail.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/eons.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/eons.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/evite.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/evite.conf.i
--- a/modules/invite/.hg/store/data/openinviter/conf__disabled/facebook.conf.i
+++ b/modules/invite/.hg/store/data/openinviter/conf__disabled/facebook.conf.i
--- a/Show More
+++ b/Show More
				`@ -1,2 +0,0 @@`
				`14 0cc9f45d26c01e5acf699ed63cfa4bea75a652c4`