merge with master
authorSofia Papagiannaki <papagian@gmail.com>
Fri, 9 Mar 2012 13:05:02 +0000 (15:05 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Fri, 9 Mar 2012 13:05:02 +0000 (15:05 +0200)
commitebd369d0039b2a33f687291e028f15fd345a3d78
tree0ced087dd37f0f19470ac628f20c01e810508e66
parent3a9f4931f1cc1b5adefeab4ada3d72d64850dd05
merge with master
38 files changed:
docs/source/devguide.rst
snf-astakos-app/Changelog
snf-astakos-app/MANIFEST.in
snf-astakos-app/README
snf-astakos-app/astakos/im/api.py
snf-astakos-app/astakos/im/backends.py
snf-astakos-app/astakos/im/context_processors.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/management/commands/activateuser.py
snf-astakos-app/astakos/im/management/commands/inviteuser.py
snf-astakos-app/astakos/im/management/commands/modifyuser.py
snf-astakos-app/astakos/im/management/commands/showinvitation.py
snf-astakos-app/astakos/im/management/commands/showuser.py
snf-astakos-app/astakos/im/migrations/0003_auto__add_unique_invitation_username.py [new file with mode: 0644]
snf-astakos-app/astakos/im/migrations/0004_auto__add_field_astakosuser_email_verified.py [new file with mode: 0644]
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/static/im/cloudbar/README.rst
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.less
snf-astakos-app/astakos/im/static/im/css/boxsizing.htc [new file with mode: 0644]
snf-astakos-app/astakos/im/static/im/css/styles.css
snf-astakos-app/astakos/im/static/im/css/styles.less
snf-astakos-app/astakos/im/static/im/images/dashed_border.png [new file with mode: 0644]
snf-astakos-app/astakos/im/static/im/less/xtra.less
snf-astakos-app/astakos/im/synnefo_settings.py
snf-astakos-app/astakos/im/target/redirect.py
snf-astakos-app/astakos/im/templates/im/account_base.html
snf-astakos-app/astakos/im/templates/im/base.html
snf-astakos-app/astakos/im/templates/im/login.html
snf-astakos-app/astakos/im/templatetags/filters.py [new file with mode: 0644]
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/util.py
snf-astakos-app/astakos/im/views.py
snf-astakos-app/conf/20-snf-astakos-app-cloudbar.conf [new file with mode: 0644]
snf-astakos-app/conf/20-snf-astakos-app-settings.conf
snf-astakos-app/setup.py