History | View | Annotate | Download (11.9 kB)
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
Refine shibboleth signup mechanism
Refs: #3041
Back up file
Fix group creation summary view
Merged demo
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...
merge with 0.6.4
merge with origin 0.6.4
Fix code formatting to conform to the PEP 8 style guide
Inject user email in notification mail subjects
Configurable subjects for all emails send by astakos
use django ADMIN & SERVER_EMAIL settings instead of DEFAULT_ADMIN_EMAIL & DEFAULT_FROM_EMAIL
move aquarium listener in endpoints
remove unused imports & code refinement
Progress VIII
send admin notification upon group creation
change helpdesk notification email subject
named reverse urls
Preserve local password for shibboleth users
Bug #2535
call ``send_greeting`` from ``switch_account_to_shibboleth`` instead of ``activate`` view
rewrite ``activate`` view
Send helpdesk notification on account activation
Refs: #2674
Merge branch 'refs/heads/0.6'
Conflicts: docs/source/backends.rst docs/source/conf.py docs/source/devguide.rst
Configurable enable/disable additional logging
Refs: #2448
Log main astakos functions
Register the date a user activation email sent and reset it when the user becomes active (for future use)
change next parameter to index page in activate url
Provide email change mechanism
Refs: #2363
handle AstakosUser model validation error
ask acknowledgment for switching local account to shibboleth one
support shibboleth with invitations & enable modifyuser command to remove a user group
Refs: #2167
add support for groups
change authentication methods: progress I
Merge branch 'master' into aquarium
Conflicts: snf-astakos-app/Changelog 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/functions.py...
more changes in email templates
change signup flow, remove activateuser command and introduce sendactivation command
change email templates
add creditevent listener to set user ``has_credits`` flag and pass the information to ``authenticate`` response
Refs: #1824
fix bugs
Repo refactor and webproject hooks fixes