code.grnet.gr Git - astakos/commit

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
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~

author	Sofia Papagiannaki <papagian@gmail.com>
	Thu, 29 Nov 2012 15:08:26 +0000 (17:08 +0200)
committer	Sofia Papagiannaki <papagian@gmail.com>
	Thu, 29 Nov 2012 15:08:26 +0000 (17:08 +0200)
commit	c0b266050de631c1e1ed4a165eb38a5216308364
tree	6030c4a424bfbbe1f8b876198d1e946efbd74330	tree \| snapshot
parent	4fef28ef1bb9cf37b0c8c6163448472451e79e7a	commit \| diff
parent	a1d12d1de28f01e19919595be2fe756bc506d2a8	commit \| diff

snf-astakos-app/README	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/activation_backends.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/api/__init__.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/api/admin.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/api/backends/notifications.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/api/callpoint.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/api/spec.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/auth_backends.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/context_processors.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/cookie.py	\|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/endpoints/aquarium/producer.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/endpoints/qh.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/forms.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/functions.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/group-list.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/group-permissions-add.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/invitation-list.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/quotaholder-sync.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/management/commands/resource-list.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/management/commands/resource-remove.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/management/commands/service-add.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/service-list.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/user-add.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/user-invite.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/user-list.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/user-update.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/messages.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/middleware.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0031_populate_group_data.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/models.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/settings.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/target/local.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/target/redirect.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/target/shibboleth.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/templates/im/third_party_registration.html	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/templatetags/astakos_tags.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/templatetags/filters.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/urls.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/util.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/views.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/conf/20-snf-astakos-app-settings.conf	diff1 \|	diff2 \|	blob \| history