1. 03 Dec, 2012 1 commit
  2. 01 Dec, 2012 12 commits
  3. 30 Nov, 2012 23 commits
  4. 29 Nov, 2012 3 commits
    • Olga Brani's avatar
    • Olga Brani's avatar
      Fixes · 8195c8a1
      Olga Brani authored
      - Rename group to project in ui
      - Different pagination for groups search result page
      - Truncatechars filter
      8195c8a1
    • Sofia Papagiannaki's avatar
      Merge remote-tracking branch 'origin/0.12' into devel-0.13 · 0bf959de
      Sofia Papagiannaki authored
      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
      	snf-astakos-app/astakos/im/management/commands/group-list.py
      	snf-astakos-app/astakos/im/management/commands/invitation-list.py
      	snf-astakos-app/astakos/im/management/commands/service-list.py
      	snf-astakos-app/astakos/im/management/commands/user-add.py
      	snf-astakos-app/astakos/im/management/commands/user-list.py
      	snf-astakos-app/astakos/im/middleware.py
      	snf-astakos-app/astakos/im/models.py
      	snf-astakos-app/astakos/im/settings.py
      	snf-astakos-app/astakos/im/target/local.py
      	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~
      0bf959de
  5. 28 Nov, 2012 1 commit