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

Merge remote-tracking branch 'mainRepo/master' into task/3601/reduce_min_ram_to_1G

Browse source
This commit is contained in:
PCoder 2017-12-23 06:59:31 +01:00
parent b91260bf26 f013ac3db4
commit a753c8d582
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog
View file

@ -4,6 +4,7 @@ Next:
* #3974: [hosting] Improve invoice number: Show 404 for invoice resources that do not belong to the user
* [ungleich] Add video cover to the header on ungleich.ch landing page and add corresponding cms plugin
* #3774: [hosting] |Update Stripe subscription on vm delete
* [ungleich] update text on landing page
1.2.13: 2017-12-09
* [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts
* [cms] Remove <p> tag for ungleich cms customer item template

16
ungleich_page/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-12-23 04:12+0530\n"
"POT-Creation-Date: 2017-12-23 05:18+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -71,14 +71,14 @@ msgstr "Die Chronik von ungleich"
msgid "The first incarnation of ungleich"
msgstr "Die erste Inkarnation von ungleich"
msgid "in Germany"
msgstr "in Deutschland"
msgid "in Germany."
msgstr "in Deutschland."
msgid "ungleich founded"
msgstr "ungleich gegründet"
msgid "in Switzerland"
msgstr "in der Schweiz"
msgid "in Switzerland."
msgstr "in der Schweiz."
msgid "ungleich present at various conferences"
msgstr "ungleich präsent an mehreren Konferenzen"
@ -107,7 +107,7 @@ msgstr "ungleich bietet einen PC-Grundkurs für Flüchtlinge an."
msgid ""
"ungleich starts computer learning club for locals, \"Digitale Building "
"ungleich.\""
"ungleich\"."
msgstr ""
"ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige."
@ -116,7 +116,7 @@ msgid ""
"startup in canton Zürich."
msgstr ""
"ungleich verkauft das Projekt <a href=\"https://www.alplora.ch/de/"
"\">AlpLora</a> an ein IoT-Startup aus dem Kanton Zürich"
"\">AlpLora</a> an ein IoT-Startup aus dem Kanton Zürich."
msgid ""
"ungleich showcases the most affordable Swiss VM hosting, Data Center Light."
@ -165,7 +165,7 @@ msgid ""
"smooth and safe."
msgstr ""
"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen "
"reibungslosen Ablauf"
"reibungslosen Ablauf."
msgid "Configuration as a Service"
msgstr "Konfiguration als Service"

4
ungleich_page/static/ungleich_page/css/agency.css
View file

@ -372,7 +372,7 @@ section h3.section-subheading {
@media(min-width:768px) {
section {
padding: 125px 0;
padding: 80px 0;
}
section h2.section-heading {
font-size: 40px;
@ -985,4 +985,4 @@ section h3.section-comment {
.carousel-author {
height: 72px;
}
}
}

10
ungleich_page/templates/ungleich_page/includes/_about.html
View file

@ -17,7 +17,7 @@
</div>
<div class="timeline-body">
<p>{% trans "The first incarnation of ungleich" %}</p>
<p>{% trans "in Germany" %}</p>
<p>{% trans "in Germany." %}</p>
</div>
</div>
</li>
@ -31,7 +31,7 @@
</div>
<div class="timeline-body">
<p>{% trans "ungleich founded" %} </p>
<p>{% trans "in Switzerland" %}</p>
<p>{% trans "in Switzerland." %}</p>
</div>
</div>
</li>
@ -44,7 +44,7 @@
<h4>2014</h4>
</div>
<div class="timeline-body">
<p>{% trans "ungleich present at various conferences" %}: <br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a><br>
<p>{% trans "ungleich present at various conferences" %}: <br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a>.<br>
</p>
</div>
</div>
@ -62,7 +62,7 @@
<p>{% trans "and introduces affordable 24X7 support." %}</p>
<p>
{% trans "ungleich launches" %}
<a href="https://digitalglarus.ch">{% trans "Digital Glarus project" %}</a>
<a href="https://digitalglarus.ch">{% trans "Digital Glarus project" %}</a>.
</p>
</div>
</div>
@ -102,7 +102,7 @@
<h4>2017</h4>
</div>
<div class="timeline-body">
<p>{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}</p>
<p>{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich".' %}</p>
<p>{% blocktrans %}ungleich sells <a href="https://www.alplora.ch/de/">Alplora</a> to an IoT startup in canton Zürich.{% endblocktrans %}</p>
<p>{% trans "ungleich showcases the most affordable Swiss VM hosting, Data Center Light." %}</p>
</div>