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
astakos: Resources metadata improvements
- Allow admin to overwrite default resources presentation data using ASTAKOS_RESROUCES_META setting. dict_merge is used to accomodate admin from declaring all available metadata parameters.- Enforce allow_in_projects resource policy in project application...
Synnefo branding images & retina.js
Merge remote-tracking branch 'origin/develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/templates/im/footer.html snf-cyclades-app/setup.py
View revisions
Also available in: Atom