code.grnet.gr Git - astakos/commit

author	Sofia Papagiannaki <papagian@gmail.com>
	Fri, 2 Nov 2012 12:22:43 +0000 (14:22 +0200)
committer	Sofia Papagiannaki <papagian@gmail.com>
	Fri, 2 Nov 2012 12:22:43 +0000 (14:22 +0200)
commit	bdd76c507d7c8b45a37443d7b187cc50ef928cf2
tree	4887aef72c1c83d1f22e2a475847b55ed5aad285	tree \| snapshot
parent	9f663ff72d99fbcddf7d5f0753eb311ab859847b	commit \| diff
parent	1b866d9ee56eddd0f8dea9a802e38c2aaad3a6f3	commit \| diff

Merge branch '0.6.4' into future

Conflicts:
snf-astakos-app/astakos/im/synnefo_settings.py

54 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
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/backends/__init__.py	\|	\|	blob
snf-astakos-app/astakos/im/api/backends/base.py	\|	\|	blob
snf-astakos-app/astakos/im/api/backends/lib/__init__.py	\|	\|	blob
snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py	\|	\|	blob
snf-astakos-app/astakos/im/api/callpoint.py	\|	\|	blob
snf-astakos-app/astakos/im/api/client.py	\|	\|	blob
snf-astakos-app/astakos/im/api/spec.py	\|	\|	blob
snf-astakos-app/astakos/im/context_processors.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/endpoints/aquarium/consumer.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/endpoints/quotaholder.py	diff1 \|	diff2 \|	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-permissions-add.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/management/commands/invitation-details.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/quotaholder-sync.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/resource-add.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/service-token-renew.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/user-activation-send.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-details.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-modify.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0017_populate_resource_data.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0020_auto__chg_field_astakosgroup_homepage.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0021_auto__add_field_astakosgroupquota_uplimit__add_field_astakosuserquota_.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0022_copy_limit_to_uplimit.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0023_populate_resource_data.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0024_auto__chg_field_astakosgroupquota_lim.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0025_case_insensitive_emails.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/migrations/0026_auto__add_field_resource_desc__add_field_resource_unit.py	\|	\|	blob
snf-astakos-app/astakos/im/migrations/0027_auto__add_field_astakosuser_dirsturbed_quota.py	\|	\|	blob
snf-astakos-app/astakos/im/migrations/0028_auto__add_field_resource_group.py	\|	\|	blob
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/static/im/css/modules.css	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/static/im/js/common.js	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/synnefo_settings.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/target/shibboleth.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/templates/im/astakosuserquota_list.html	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/templates/im/resource_list.html	\|	\|	blob
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
snf-astakos-app/distribute-0.6.10-py2.6.egg	\|	\|	blob
snf-astakos-app/distribute-0.6.10.tar.gz	\|	\|	blob
snf-astakos-app/setup.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
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/backends/__init__.py	\|	\|	blob
snf-astakos-app/astakos/im/api/backends/base.py	\|	\|	blob
snf-astakos-app/astakos/im/api/backends/lib/__init__.py	\|	\|	blob
snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py	\|	\|	blob
snf-astakos-app/astakos/im/api/callpoint.py	\|	\|	blob
snf-astakos-app/astakos/im/api/client.py	\|	\|	blob
snf-astakos-app/astakos/im/api/spec.py	\|	\|	blob
snf-astakos-app/astakos/im/context_processors.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/endpoints/aquarium/consumer.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/endpoints/quotaholder.py	diff1 \|	diff2 \|	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-permissions-add.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/management/commands/invitation-details.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/quotaholder-sync.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/resource-add.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/service-token-renew.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/management/commands/user-activation-send.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-details.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-modify.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0017_populate_resource_data.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0020_auto__chg_field_astakosgroup_homepage.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0021_auto__add_field_astakosgroupquota_uplimit__add_field_astakosuserquota_.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0022_copy_limit_to_uplimit.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0023_populate_resource_data.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0024_auto__chg_field_astakosgroupquota_lim.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/migrations/0025_case_insensitive_emails.py	diff1 \|	\|	blob \| history
snf-astakos-app/astakos/im/migrations/0026_auto__add_field_resource_desc__add_field_resource_unit.py	\|	\|	blob
snf-astakos-app/astakos/im/migrations/0027_auto__add_field_astakosuser_dirsturbed_quota.py	\|	\|	blob
snf-astakos-app/astakos/im/migrations/0028_auto__add_field_resource_group.py	\|	\|	blob
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/static/im/css/modules.css	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/static/im/js/common.js	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/synnefo_settings.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/target/shibboleth.py	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/templates/im/astakosuserquota_list.html	diff1 \|	diff2 \|	blob \| history
snf-astakos-app/astakos/im/templates/im/resource_list.html	\|	\|	blob
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
snf-astakos-app/distribute-0.6.10-py2.6.egg	\|	\|	blob
snf-astakos-app/distribute-0.6.10.tar.gz	\|	\|	blob
snf-astakos-app/setup.py	diff1 \|	diff2 \|	blob \| history