FVDE/ennstatus Changeset - 812e07309710 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 812e07309710

Parent rev.

Child rev.

[Not reviewed]

Merge v5.3.1 default

0 3 0

Dennis Fink - 9 years ago 2016-02-27 12:43:21
dennis.fink@c3l.lu

Merged dev an updated version number

3 files changed with 5 insertions and 4 deletions:

ennstatus/templates/root/contact.html

ennstatus/templates/root/ennstatus.html

setup.py

0 comments (0 inline, 0 general)

ennstatus/templates/root/contact.html

➞

Show inline comments

@@ @@ -49,21 +49,21 @@ @@
         <br>
       <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a><br>
       <abbr title="Website"><span class="glyphicon glyphicon-cloud"></span></abbr> : <a href="//enn.lu/">enn.lu/</a> <strong>or</strong> <a href="//{{ config['ENNSTATUS_ONION_ADDRESS'] }}/" target="_blank">{{ config['ENNSTATUS_ONION_ADDRESS'] }}</a><br>
-      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : +352 27402030<br>
+      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : {{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>
     </address>
     <h2>Abuse</h2>
     <p>For further details about abuse handling, have a look over <a href="{{ url_for('root.abuse') }}">here</a>.</p>
     <address>
       <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:abuse@enn.lu">abuse@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a><br>
-      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>+352 27402030<br>
+      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>
     </address>
     <h2>Press</h2>
     <p>Press related inqueries should go to:</p>
     <address>
       <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:press@enn.lu">press@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a><br>
-      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>+352 27402030<br>
+      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>
     </address>
   </div>

ennstatus/templates/root/ennstatus.html

➞

Show inline comments

@@ @@ -43,6 +43,7 @@ @@
         <li><a href="http://docs.python-requests.org/en/latest/">requests</a></li>
         <li><a href="https://github.com/isislovecruft/python-gnupg">python-gnupg</a></li>
         <li><a href="http://click.pocoo.org/">click</a></li>
         <li><a href="http://babel.pocoo.org/">Babel</a></li>
         <li><a href="http://videojs.com/">video.js</a></li>
       </ul>
       <p>Flag icons provided by: <a href="http://www.famfamfam.com/lab/icons/flags/">famfamfam</a></p>

setup.py

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ def _get_requirements(): @@
 setup(name='Ennstatus',
-      version='5.3.0',
+      version='5.3.1',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',

0 comments (0 inline, 0 general)