Update models
Progress I
Fix migrations
Style fixesNew menu
Proper commit files for b48b6a2
Create missing migrations
Remove conflicting migrations
Fix middleware AtributeError in case of non astakos requestFix service-add command: check callpoint result
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...
Flush other user sessions during password/token change
Refs: #3007
Customize third party signup form fields
Refs: #3041
Refine shibboleth signup mechanism
Change default resource limits
User create_groups api call in group creation
Fix default resource groups
Set additional default resource information (description, unit)
Merge branch 'future' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py snf-astakos-app/astakos/im/api/spec.py snf-astakos-app/astakos/im/endpoints/quotaholder.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
Merge with future branch
Merge branch '0.6.4' into future
Conflicts: snf-astakos-app/astakos/im/synnefo_settings.py
Change saved emails to lowercase
Refs: #2883
Turn emails to case-insensitive.
Set obsolete user and group limit field nullable
Merge branch '0.6.4' into dev
Conflicts: snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/views.py
Fix migration integrity error
Fix migration 0023. Supply limit default value.
Change rename and change quota limit field to bigint
Alter limit column type to bigint
Register resources in quota holder
Fix code formatting to conform to the PEP 8 style guide
Migration fix
Add group homepage field
Refs: #2793
remove space
fix 0017 migration
delete migration
add email & is_active index in auth_user
remove unused imports & code refinement
No groups found issue resolved
if moderation is not enabled approve immediately user membership
fix astakosgroup creation form
remove unique constrain from AdditionalEmail
add (third_party_identifier, provider) index on AstakosUser
Merge branch 'refs/heads/0.6'
Conflicts: docs/source/backends.rst docs/source/conf.py docs/source/devguide.rst
register email returned by shibboleth (either as a primary or additional email)
Refs: #2416
during datamigration set only to inactive users activation_sent date to epoch
Refs: #2471
Register the date a user activation email sent and reset it when the user becomes active (for future use)
Provide an API call for the service clients to send user feedback
Provide email change mechanism
Refs: #2363
Add south migration to apply latest fields changes
remove is_accepted & date_accepted Invitation fields (substituted by consumed & date_consumed reps.)
Force user to accept service terms
Refs: #2019
add creditevent listener to set user ``has_credits`` flag and pass the information to ``authenticate`` response
Refs: #1824
merge with master
Repo refactor and webproject hooks fixes