History | View | Annotate | Download (7.1 kB)
Merge branch 'twitterauth' into devel-0.13
Change menu ``Report`` to ``Usage``
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
Twitter authentication backend
Fix syntax in uls.py
Remove billing from urls
Conflicts: snf-astakos-app/astakos/im/urls.py snf-astakos-app/astakos/im/views.py
How it works page
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...
Allow multiple login methods per account
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
Updated shibboleth workflow (enable user change email before activation)
Refs: #3041
Special handling for login failure messages
Refine shibboleth signup mechanism
Backend implementation of group creation summary
Group create summary page static
User create_groups api call in group creation
Merged demo
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts: snf-astakos-app/astakos/im/static/im/css/modules.css snf-astakos-app/astakos/im/static/im/js/common.js snf-astakos-app/astakos/im/templates/im/astakosuserquota_list.html snf-astakos-app/astakos/im/views.py
astakos_group_form_demo pageastakos_group_ressources_statistics page
Optionally enforce token renewal via settings. Set initial value to True in the forms.
Refs: #2612
Merge branch '0.6.4' into dev
Conflicts: snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/views.py
Add group_detail members table pagination
New timeline tab
Enable group owner to add members
Refs: #2793
Add button show all in group search page
Group owner can update group description & homepage
Fix code formatting to conform to the PEP 8 style guide
Add billing tab
Indermediate page for create group
remove unused imports & code refinement
Progress VII
Progress V
Progress IV
named reverse urls
Progress I
Optionally renew token on password reset
delete obsolete import
Provide an API call for the service clients to send user feedback
Provide api calls for permitting helpdesk users to access user information by user email and by username
Refs: #2414
Configurable enable email change mechanism
Refs: #2415
Provide email change mechanism
Refs: #2363
add support for groups
change authentication methods: progress I
Force user to accept service terms
Refs: #2019
merge with master
integration with aquarium: Progress III & merge master
Refs: #1824
change cloudbar to contain dynamic links
Fixed im static files configuration
Repo refactor and webproject hooks fixes