code.grnet.gr Git - astakos/commit

author	Sofia Papagiannaki <papagian@gmail.com>
	Mon, 5 Nov 2012 10:52:12 +0000 (12:52 +0200)
committer	Sofia Papagiannaki <papagian@gmail.com>
	Mon, 5 Nov 2012 10:52:12 +0000 (12:52 +0200)
commit	f46c95c4add77e2b6bcbbad873feea30e10728fd
tree	cb27074d4c65c7c24aa08513bf713dd75dd53135	tree \| snapshot
parent	55a845c0ae6796786d9a73b9c9c1dc5e1940d1bb	commit \| diff

Merge with future branch

45 files changed:

.gitignore		diff \| blob \| history
snf-astakos-app/README		diff \| blob \| history
snf-astakos-app/astakos/im/activation_backends.py		diff \| blob \| history
snf-astakos-app/astakos/im/api/__init__.py		diff \| blob \| history
snf-astakos-app/astakos/im/api/backends/base.py	[new file with mode: 0644]	blob
snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py	[new file with mode: 0644]	blob
snf-astakos-app/astakos/im/api/spec.py	[new file with mode: 0644]	blob
snf-astakos-app/astakos/im/context_processors.py		diff \| blob \| history
snf-astakos-app/astakos/im/endpoints/aquarium/consumer.py		diff \| blob \| history
snf-astakos-app/astakos/im/endpoints/quotaholder.py		diff \| blob \| history
snf-astakos-app/astakos/im/forms.py		diff \| blob \| history
snf-astakos-app/astakos/im/functions.py		diff \| blob \| history
snf-astakos-app/astakos/im/management/commands/group-permissions-add.py	[new file with mode: 0644]	blob
snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py	[moved from snf-astakos-app/astakos/im/management/commands/invitation-show.py with 57% similarity]	diff \| blob \| history
snf-astakos-app/astakos/im/management/commands/quotaholder_sync.py		diff \| blob \| history
snf-astakos-app/astakos/im/management/commands/resource-add.py		diff \| blob \| history
snf-astakos-app/astakos/im/management/commands/service-add.py		diff \| blob \| history
snf-astakos-app/astakos/im/management/commands/user-add.py		diff \| blob \| history
snf-astakos-app/astakos/im/management/commands/user-invite.py		diff \| blob \| history
snf-astakos-app/astakos/im/management/commands/user-show.py	[deleted file]	blob \| history
snf-astakos-app/astakos/im/management/commands/user-update.py		diff \| blob \| history
snf-astakos-app/astakos/im/migrations/0017_populate_resource_data.py		diff \| blob \| history
snf-astakos-app/astakos/im/migrations/0020_auto__chg_field_astakosgroup_homepage.py		diff \| blob \| history
snf-astakos-app/astakos/im/migrations/0021_auto__add_field_astakosgroupquota_uplimit__add_field_astakosuserquota_.py		diff \| blob \| history
snf-astakos-app/astakos/im/migrations/0022_copy_limit_to_uplimit.py		diff \| blob \| history
snf-astakos-app/astakos/im/migrations/0023_populate_resource_data.py		diff \| blob \| history
snf-astakos-app/astakos/im/migrations/0024_auto__chg_field_astakosgroupquota_lim.py		diff \| blob \| history
snf-astakos-app/astakos/im/migrations/0027_auto__add_field_astakosuser_disturbed_quota.py	[new file with mode: 0644]	blob
snf-astakos-app/astakos/im/migrations/0028_auto__add_field_resource_group.py	[new file with mode: 0644]	blob
snf-astakos-app/astakos/im/migrations/0029_auto__add_field_astakosgroup_max_participants.py	[new file with mode: 0644]	blob
snf-astakos-app/astakos/im/models.py		diff \| blob \| history
snf-astakos-app/astakos/im/settings.py		diff \| blob \| history
snf-astakos-app/astakos/im/static/im/css/modules.css		diff \| blob \| history
snf-astakos-app/astakos/im/static/im/js/common.js		diff \| blob \| history
snf-astakos-app/astakos/im/synnefo_settings.py		diff \| blob \| history
snf-astakos-app/astakos/im/target/shibboleth.py		diff \| blob \| history
snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html		diff \| blob \| history
snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt		diff \| blob \| history
snf-astakos-app/astakos/im/templatetags/astakos_tags.py		diff \| blob \| history
snf-astakos-app/astakos/im/templatetags/filters.py		diff \| blob \| history
snf-astakos-app/astakos/im/urls.py		diff \| blob \| history
snf-astakos-app/astakos/im/util.py		diff \| blob \| history
snf-astakos-app/astakos/im/views.py		diff \| blob \| history
snf-astakos-app/conf/20-snf-astakos-app-settings.conf		diff \| blob \| history
snf-astakos-app/setup.py		diff \| blob \| history

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

RSS Atom