Commit 881aa6cf authored by Stratos Psomadakis's avatar Stratos Psomadakis

Merge branch 'master' into debian

parents 36df8ffd 3c49605b
......@@ -6,12 +6,12 @@ Unified Changelog file for Synnefo versions >= 0.13
Since v0.13 most of the Synnefo components have been merged into a single
repository and have aligned versions.
.. _Changelog-0.16.1rc1:
.. _Changelog-0.16.1:
v0.16.1rc1
==========
v0.16.1
=======
Released: Thu Dec 18 16:39:29 EET 2014
Released: Fri Feb 6 12:05:44 EET 2015
Astakos
-------
......@@ -23,7 +23,6 @@ Astakos
* Exclude terminated projects from responses of project list and user quota
api calls.
* Improve UI handling of inactive, terminated and empty projects.
* Replace ASTAKOS_SITENAME setting with BRANDING_SERVICE_NAME.
* Change default pagination in projects list view.
Cyclades UI
......@@ -45,7 +44,7 @@ Stats
Branding
--------
* Add CLOUDBAR_HOME_URL setting.
* Add CLOUDBAR_HOME_URL setting to allow Cloudbar home icon customization.
.. _Changelog-0.16:
......
......@@ -5,22 +5,20 @@ Unified NEWS file for Synnefo versions >= 0.13
Since v0.13 all Synnefo components have been merged into a single repository.
.. _NEWS-0.16.1rc1:
.. _NEWS-0.16.1:
v0.16.1rc1
==========
v0.16.1
=======
Released: Thu Dec 18 17:02:14 EET 2014
Released: Fri Feb 6 12:06:25 EET 2015
The Synnefo 0.16.1 release is mostly a bug fix version. The most notable
changes are:
* Improved handling of projects (both API- and UI-wise).
* Improved handling for password and SSH keys customization for images that do
not support it.
* Updates and fixes for snf-deploy.
* Various bug fixes and improvements across Synnefo. Please see the Synnefo
`Changelog` for a complete list.
:ref:`Changelog <Changelog-0.16.1>` for a complete list.
.. _NEWS-0.16:
......
......@@ -462,6 +462,9 @@ class SynnefoCI(object):
self.logger.debug("Setup apt")
cmd = """
echo 'APT::Install-Suggests "false";' >> /etc/apt/apt.conf
echo 'Package: python-gevent' >> /etc/apt/preferences.d/00-gevent
echo 'Pin: release o=Debian' >> /etc/apt/preferences.d/00-gevent
echo 'Pin-Priority: 990' >> /etc/apt/preferences.d/00-gevent
echo 'precedence ::ffff:0:0/96 100' >> /etc/gai.conf
apt-get update
apt-get install -q=2 curl --yes --force-yes
......
......@@ -2966,7 +2966,7 @@ Changelog, NEWS
===============
* v0.16.1rc1 :ref:`Changelog <Changelog-0.16.1rc1>`, :ref:`NEWS <NEWS-0.16.1rc1>`
* v0.16.1 :ref:`Changelog <Changelog-0.16.1>`, :ref:`NEWS <NEWS-0.16.1>`
* v0.16 :ref:`Changelog <Changelog-0.16>`, :ref:`NEWS <NEWS-0.16>`
* v0.15.2 :ref:`Changelog <Changelog-0.15.1>`, :ref:`NEWS <NEWS-0.15.2>`
* v0.15.1 :ref:`Changelog <Changelog-0.15.1>`, :ref:`NEWS <NEWS-0.15.1>`
......
......@@ -2046,7 +2046,7 @@ package by running on node1:
.. code-block:: console
# yum install snf-cyclades-app memcached python-memcached
# yum install snf-cyclades-app memcached python-memcached snf-vncauthproxy
If all packages install successfully, then Cyclades are installed and we
proceed with their configuration.
......
......@@ -2124,7 +2124,7 @@ package by running on node1:
.. code-block:: console
# apt-get install snf-cyclades-app memcached python-memcache snf-pithos-backend
# apt-get install snf-cyclades-app memcached python-memcache snf-pithos-backend snf-vncauthproxy
If all packages install successfully, then Cyclades are installed and we
proceed with their configuration.
......
......@@ -16,7 +16,9 @@
{% endif %}
<!--
<link href="{{ ADMIN_MEDIA_URL }}css/ie7.css" rel="stylesheet"> -->
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,700italic,400,700,300,600' rel='stylesheet' type='text/css'>
{% for url in BRANDING_FONTS_CSS_URLS %}
<link href="{{ url }}" rel="stylesheet" type="text/css" >
{% endfor %}
</head>
{% block custom-css %}
......
......@@ -246,9 +246,10 @@ class ThirdPartyUserCreationForm(forms.ModelForm):
pending.delete()
return user
autofocus_widget = forms.TextInput(attrs={'autofocus': 'autofocus'})
class LoginForm(AuthenticationForm):
username = EmailField(label=_("Email"))
username = EmailField(label=_("Email"), widget=autofocus_widget)
recaptcha_challenge_field = forms.CharField(widget=DummyWidget)
recaptcha_response_field = forms.CharField(
widget=RecaptchaWidget, label='')
......
# Copyright (C) 2010-2014 GRNET S.A.
# Copyright (C) 2010-2015 GRNET S.A.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -94,6 +94,8 @@ class Command(ListCommand):
"status": (get_status, "Project Status"),
"pending_app": (get_pending_app,
"An application pending for the project"),
"description": ("description", "Project Description"),
"end_date": ("end_date", "Project Termination Date"),
}
fields = ["id", "name", "owner", "status", "pending_app"]
......
......@@ -72,12 +72,12 @@
{% block page.body.api_advanced %}
<h2>API advanced usage</h2>
<p>
Apart from using the kamaki command line client, you can also import the
kamaki library inside your code and use it directly. More details on how
Apart from using the Kamaki command line client, you can also import the
Kamaki library inside your code and use it directly. More details on how
to do that on the corresponding
<a href="http://www.synnefo.org/docs/kamaki/latest/index.html">kamaki </a>page.</p>
<a href="http://www.synnefo.org/docs/kamaki/latest/index.html">Kamaki</a> page.</p>
<p>You can also implement the REST API calls by yourself, without
using the official kamaki library if you feel confident with your
using the official Kamaki library if you feel confident with your
programming skills. To do so, you first need to get a good grasp of the
API itself; for more information take a look at the corresponding page
inside the
......@@ -108,14 +108,14 @@
<div class="two-cols dotted clearfix">
<div class="rt">
<h2>Other clients</h2>
<p>If you are using a client different from kamaki that supports the OpenStack
<p>If you are using a client different from Kamaki that supports the OpenStack
APIs and needs a username/password combination to operate, please use
the following:</p>
<p>username: <span class="user-data">{{ user.uuid }}</span>
password: <span class="user-data">{{ user.auth_token }}</span></p>
<p>The username is your {{ BRANDING_SERVICE_NAME }} user ID (UUID) and the password
<p>The username is your {{ BRANDING_SERVICE_NAME }} user ID (UUID) and the password
is your Token. As you can see, its the same shown in the
previous section. </p>
</div>
......@@ -125,22 +125,22 @@ previous section. </p>
<p><a href="{{ client_url }}" alt="kamaki">Kamaki</a> is the official
{{ BRANDING_SERVICE_NAME }} command line client. You can use it to control your virtual
resources from the command line or use it inside your scripts.</p>
<p>Kamaki allows you to execute all the operations you do from the Web UI. You can use kamaki to<br><br>
<p>Kamaki allows you to execute all the operations you do from the Web UI. You can use Kamaki to<br><br>
- register images,<br>- spawn clusters of customized VMs,<br>- connect them to
Private Virtual Networks,<br>- have them executing computations dynamically<br> <br>and
many other neat things.</p>
<p> Kamaki is available for most Linux distributions,
Windows and Mac OS X. To use it you will need to set it up using your
Windows, and Mac OS X. To use it you will need to set it up using your
Token and the Authentication URL, found above. To
learn more about kamaki and how to install, configure and use, take a look
learn more about Kamaki and how to install, configure and use, take a look
at its <a href="http://www.synnefo.org/docs/kamaki/latest/index.html">corresponding page</a>.
</p>
<p class="download">You can download kamaki
<p class="download">You can download Kamaki
from the <a href="http://www.synnefo.org/docs/kamaki/latest/index.html">project homepage</a>.</p>
<p>If you are using kamaki, you can download a pre-configured .kamakirc
<p>If you are using Kamaki, you can download a pre-configured .kamakirc
file that contains your Authentication URL and Token. Store this file
under your home directory (~/.kamakirc) and kamaki will be able to
access {{ BRANDING_SERVICE_NAME }} automatically without the need of extra
under your home directory (~/.kamakirc) and Kamaki will be able to
access {{ BRANDING_SERVICE_NAME }} automatically without the need of extra
manual configuration.</p>
<a href="{% url api_access_config %}" class="submit">Download your .kamakirc</a>
......
......@@ -49,7 +49,6 @@ INSTALL_REQUIRES = [
'puka',
'python-daemon>=1.5.5, <1.6',
'snf-common',
'vncauthproxy>1.5',
'snf-pithos-backend',
'lockfile>=0.8, <0.9',
'ipaddr',
......
# This is a comment!
0.16.1rc1
0.16.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment