Merge branch 'master' into cleanUpCSS

master
Nienke 9 years ago
commit bbd07e0710

@ -0,0 +1,7 @@
Copyright © 2016 Corné Oppelaar
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@ -8,5 +8,4 @@ Zer.ooo aims to simplify the management of your OpenVPN servers and certificates
## How do I use it? ## How do I use it?
If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server (a how-to should follow shortly). If you have an invite code, feel free to register at [zer.ooo](https://zer.ooo). You can also set up zer.ooo on your own server (Vagrant and Virtualbox required). See the installation guide here: https://docs.zer.ooo/running_your_own/

@ -6,7 +6,7 @@ core:
name: "Zer.ooo" name: "Zer.ooo"
author: "EaterOfCode" author: "EaterOfCode"
sessionName: '0sess' sessionName: '0sess'
github-repo: 'EaterOfCode/zer.ooo' github-repo: 'zerooo-vpn/zer.ooo'
services: services:
slim: Eater\Glim\Service\Slim slim: Eater\Glim\Service\Slim
user: Eater\Glim\Service\User user: Eater\Glim\Service\User

@ -42,10 +42,10 @@
<a href="https://github.com/{{ githubRepo }}"><i class="fa fa-github fa-4x" aria-hidden="true"></i></a> <a href="https://github.com/{{ githubRepo }}"><i class="fa fa-github fa-4x" aria-hidden="true"></i></a>
{% if contributors|length > 0 %} {% if contributors|length > 0 %}
<h2>with the help of <h2>with the help of
{% for contributor in contributors %} {% for contributor in contributors -%}
{% if loop.index0 < (loop.length - 1) and loop.index0 > 0 %}, {% elseif loop.index0 == (loop.length - 1) %} and {% endif %} {%- if loop.index0 < (loop.length - 1) and loop.index0 > 0 %}, {% elseif loop.index0 == (loop.length - 1) %} and {% endif -%}
<a href="{{ contributor.html_url }}">{{ contributor.login }}</a> <a href="{{ contributor.html_url }}">{{ contributor.login }}</a>
{% endfor %} {%- endfor %}
</h2> </h2>
{% endif %} {% endif %}
</div> </div>

Loading…
Cancel
Save