amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete

Browse source
This commit is contained in:
PCoder 2017-12-12 21:40:53 +01:00
commit ef202833b2
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Changelog
View file

@ -1,3 +1,5 @@
Next:
* #3911: [dcl] Integrate resend activation link into dcl landing payment page
1.2.13: 2017-12-09 1.2.13: 2017-12-09
* [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts
* [cms] Remove <p> tag for ungleich cms customer item template * [cms] Remove <p> tag for ungleich cms customer item template

2
datacenterlight/templates/datacenterlight/landing_payment.html
View file

@ -39,7 +39,7 @@
<p> <p>
{% trans "Don't have an account yet?" %}<br> {% trans "Don't have an account yet?" %}<br>
{% trans "You can sign up by filling in the information below." %}<br> {% trans "You can sign up by filling in the information below." %}<br>
<a href="{% url 'hosting:reset_password' %}">{% trans "Forgot password?" %}</a> <a href="{% url 'hosting:reset_password' %}" target="_blank">{% trans "Forgot password?" %}</a> or <a href="{% url 'hosting:resend_activation_link' %}" target="_blank">{% trans "Resend activation link" %}?</a>
</p> </p>
{% endif %} {% endif %}
</div> </div>