astakos: Use proper update_token url
Propagate update_token url via window object to the updateToken js function.
astakos: Dynamically set hand indicator in landing page
removed the hardcoded mapping between cloudbar and dashboard elements
astakos: Improve project members' actions UX
Show reject/approve button in 'project pending members' page.Remove confirm dialog when user clicks outside dialog area.Minor style changes.
astakos: Batch members actions template integration
udpated project members template to properly post selected membership ids tothe appropriate urls.
astakos: Remove ^M's from common.js
Merge branch 'develop' into feature-projects-ux
Conflicts: snf-astakos-app/astakos/im/templates/im/projects/intro.html snf-astakos-app/astakos/im/templatetags/astakos_tags.py snf-astakos-app/astakos/im/urls.py snf-astakos-app/astakos/im/views.py
astakos: Change auth provider remove HTTP method
Convert provider removal links to forms (using POST), in order to be ableto remove GET from the remove view allowed HTTP methods.
Refs #3793
cloudbar: Handle relative service icon urls
Merge branch 'develop' into feature-branding
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/landing.html snf-astakos-app/astakos/im/views.py...
Merge remote-tracking branch 'origin/develop' into feature-projects-ux
View revisions
Also available in: Atom