Correct ancestor method name

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/templates/im/resource_usage.html

Merge commit

Style fixes

- Grey image
- Link "back to login"

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/templates/im/resource_usage.html

Unidenitifed commits

Text fixes
Style fixes

Resource usage new % style

Uniform text in group details/group list

Style fixes

Text changes

Change some default values in settings

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Fix migrations

fix tab

Fix migrations

Limit usage ratio
Fix link in how-it-works page

- Flag is_active_member to  group_details

- Update user/project activation status
- Fix float bug

Moderation fix

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Interactivity in how-it-works page

Automatic local auth provider assignment

when a valid user with empty authentication providers list tries to
log in

Create local auth provider for superadmin user

if one created after syncdb command

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/api/__init__.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html

Style fixes
New menu

Dynamic third party signup url

Merge branch 'twitterauth' into devel-0.13

Change menu ``Report`` to ``Usage``

Fix group list view working with sqlite

Remove forgotten merge mark

Update snf-manage commands in email templates.

Update snf-manage commands in email templates. Fix authentication token renewal.

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
snf-astakos-app/astakos/im/templates/im/profile.html

Bug fixes
Style improvents
Authorisation methods page

Fix AttributeError invalid method name

Do not show default groups in project lists

auth_providers context processro fix

pass auth provider instances in templates

Include inactive auth providers in registry

Twitter authentication backend

Handle empty third party email

Remove unused template

More meaningful login failure explanations

Fix syntax in uls.py

Remove billing from urls

Remove celery tasks execution

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Change ASTAKOS_QUOTAHOLDER_Token to ASTAKOS_QUOTAHOLDER_TOKEN

Fix import error in astakos.im.functions

Fix legend margin bug

Fix setting name case

Configurable auth providers templates/titles

Proper MODERATION_ENABLED check when invitations are enabled

Set local login method for new users

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Extend/Update management commands

Fix infinite loop in case another user with the same email already exists

Change AstakosUserManager to inherit from django.contrib.auth.models.UserManager

Fix group detail template: specify post targets

Enable group owner to modify moderation

Enable group owner to disapprove already approved members

Fix sorting parameter validation in group detail

Remove obsolete strip_http from the templates

Fixes in group creation

Validate sorting request parameter in group views

Remove obsolete rcut filter in templates

Change email authentication backend to check username/password pair in any case if email/password authentication fails (not only if username does not match email regex)

Do not save url prefix in group names

Remove explicit link to change password view

Reset password when removing local auth provider

Keep third party token between signup form errors

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py

How it works page

Proper commit files for b48b6a2

Update management commands

to conform with multiple auth providers feature

Multiple auth providers migration

is_local is no longer used

Additional multiple auth methods fixes and tests

Create missing migrations

Remove conflicting migrations

Merge remote-tracking branch 'origin/devel-0.13' into multipleauthmethods

Merge branch 'devel-0.13' into multipleauthmethods

Conflicts:
snf-astakos-app/astakos/im/context_processors.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/target/local.py
snf-astakos-app/astakos/im/target/shibboleth.py
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py

add token to quotaholder client

also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings

Allow multiple login methods per account

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Change commissioning imports

Restore im/admin_notification.txt

Comment our LDAPBackend

Add missing import

Add missing transaction commit

Case insensitive email checks

#2883

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Merge branch '0.6.4' into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/views.py

Restore synnefo_settings.py

Fix middleware AtributeError in case of non astakos request
Fix service-add command: check callpoint result

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Fixes
- Rename group to project in ui
- Different pagination for groups search result page
- Truncatechars filter

Merge remote-tracking branch 'origin/0.12' into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/activation_backends.py
snf-astakos-app/astakos/im/api/admin.py
snf-astakos-app/astakos/im/auth_backends.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py
snf-astakos-app/astakos/im/management/commands/group-list.py
snf-astakos-app/astakos/im/management/commands/invitation-list.py
snf-astakos-app/astakos/im/management/commands/service-list.py
snf-astakos-app/astakos/im/management/commands/user-add.py
snf-astakos-app/astakos/im/management/commands/user-list.py
snf-astakos-app/astakos/im/middleware.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/target/local.py
snf-astakos-app/astakos/im/target/redirect.py
snf-astakos-app/astakos/im/target/shibboleth.py
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-settings.conf~

Provide management command for cleaning up both inactive sessions and session catalog entries

Fix type in group list command