1. 05 Nov, 2012 4 commits
    • Sofia Papagiannaki's avatar
      Fix default resource groups · 12ca5c50
      Sofia Papagiannaki authored
      12ca5c50
    • Sofia Papagiannaki's avatar
    • Sofia Papagiannaki's avatar
      Merge branch 'future' into 0.6.4 · c12a34dd
      Sofia Papagiannaki authored
      Conflicts:
      	snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py
      	snf-astakos-app/astakos/im/api/spec.py
      	snf-astakos-app/astakos/im/endpoints/quotaholder.py
      	snf-astakos-app/astakos/im/forms.py
      	snf-astakos-app/astakos/im/functions.py
      	snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py
      	snf-astakos-app/astakos/im/management/commands/invitation-details.py
      	snf-astakos-app/astakos/im/management/commands/invitation-show.py
      	snf-astakos-app/astakos/im/management/commands/user-add.py
      	snf-astakos-app/astakos/im/management/commands/user-details.py
      	snf-astakos-app/astakos/im/migrations/0028_auto__add_field_resource_group.py
      	snf-astakos-app/astakos/im/models.py
      	snf-astakos-app/astakos/im/settings.py
      	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/synnefo_settings.py
      	snf-astakos-app/astakos/im/target/shibboleth.py
      	snf-astakos-app/astakos/im/views.py
      	snf-astakos-app/conf/20-snf-astakos-app-settings.conf
      c12a34dd
    • Sofia Papagiannaki's avatar
      Merge with future branch · d446ac16
      Sofia Papagiannaki authored
      d446ac16
  2. 02 Nov, 2012 5 commits
  3. 28 Oct, 2012 2 commits
  4. 25 Oct, 2012 6 commits
  5. 23 Oct, 2012 2 commits
  6. 22 Oct, 2012 2 commits
    • Sofia Papagiannaki's avatar
      Merge remote-tracking branch 'origin' into future · 29a02040
      Sofia Papagiannaki authored
      Conflicts:
      	snf-astakos-app/README
      	snf-astakos-app/astakos/im/forms.py
      	snf-astakos-app/astakos/im/settings.py
      	snf-astakos-app/astakos/im/static/im/js/forms.js
      	snf-astakos-app/astakos/im/target/redirect.py
      	snf-astakos-app/astakos/im/target/shibboleth.py
      	snf-astakos-app/astakos/im/urls.py
      	snf-astakos-app/astakos/im/util.py
      	snf-astakos-app/astakos/im/views.py
      	snf-astakos-app/conf/20-snf-astakos-app-settings.conf
      29a02040
    • Sofia Papagiannaki's avatar
      Merge remote-tracking branch 'origin' into future · 225ff2ca
      Sofia Papagiannaki authored
      Conflicts:
      	snf-astakos-app/astakos/im/management/commands/group-list.py
      	snf-astakos-app/astakos/im/management/commands/group-permissions-add.py
      	snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py
      	snf-astakos-app/astakos/im/management/commands/group_list.py
      	snf-astakos-app/astakos/im/management/commands/resource-list.py
      	snf-astakos-app/astakos/im/management/commands/sendactivation.py
      	snf-astakos-app/astakos/im/management/commands/service-renew-token.py
      	snf-astakos-app/astakos/im/management/commands/service-token-renew.py
      	snf-astakos-app/astakos/im/management/commands/service_renew_token.py
      	snf-astakos-app/astakos/im/management/commands/user-activation-send.py
      	snf-astakos-app/astakos/im/management/commands/user-modify.py
      	snf-astakos-app/astakos/im/management/commands/user-send-activation.py
      225ff2ca
  7. 16 Oct, 2012 2 commits
  8. 12 Oct, 2012 3 commits
  9. 09 Oct, 2012 1 commit
  10. 04 Oct, 2012 4 commits
  11. 03 Oct, 2012 2 commits
  12. 02 Oct, 2012 4 commits
  13. 01 Oct, 2012 2 commits
  14. 28 Sep, 2012 1 commit