add token to quotaholder client
also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings
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...
Remove obsolete file
Change some default values in settings
Updated shibboleth workflow (enable user change email before activation)
Refs: #3041
Customize third party signup form fields
Merged demo
Change setting name
Refs: #2612
Optionally enforce token renewal via settings. Set initial value to True in the forms.
Merge remote-tracking branch 'origin' into dev
Conflicts: snf-astakos-app/Changelog snf-astakos-app/README snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js...
Add pagination
Change rename and change quota limit field to bigint
merge with origin 0.6.4
Inject user email in notification mail subjects
Configurable subjects for all emails send by astakos
Add billing tab
use django ADMIN & SERVER_EMAIL settings instead of DEFAULT_ADMIN_EMAIL & DEFAULT_FROM_EMAIL
Page notification messages improvements
- New template tag {% display_messages %} which handles messages display, both for django.contrib.messages and ASTAKOS_*_MESSAGES.- Apply messages block class from python code (instead of js).- Changed format of ASTAKOS_*_MESSAGES to list of tuples, to allow...
Merge branch 'master' into newstyles
Conflicts: snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js snf-astakos-app/astakos/im/templates/im/base.html snf-astakos-app/astakos/im/templates/im/login_base.html
Improved user notifications
additional settings to set messages that get displayed on differentim pages (signin, signup, profile pages).
Update default config file and Changelog
Merge branch 'refs/heads/0.6'
Conflicts: docs/source/backends.rst docs/source/conf.py docs/source/devguide.rst
Style fixes
Provide an API call for the service clients to send user feedback
Fix default settings values in sample conf file
Update sample conf file
Update sample settings file
Terms sample file
Display additional actions in account pages forms
Configurable by the ASTAKOS_PROFILE_EXTRA_LINKS
New login messages feature
display messages on top of login page. Configurable from theASTAKOS_LOGIN_MESSAGES setting.
Allow recaptcha to use ssl for api js files
Updated sample conf file
fix internal astakos menu & minor other changes:
Updated sample config file
Updated sample .conf file
Updated default conf file
Fix proposed settings file.
Configurable captcha options
Include additional settings in sample .conf file
Updated default snf-common conf file
Default settings configuration file