Olga Brani [Wed, 14 Nov 2012 08:42:57 +0000 (10:42 +0200)]
Temp commit to switch to new branch ( based on
dcd1c38335966c77df02c49f39ef7224b91ed8b3 )
Olga Brani [Tue, 13 Nov 2012 15:46:29 +0000 (17:46 +0200)]
Style fixes
Olga Brani [Tue, 13 Nov 2012 15:45:26 +0000 (17:45 +0200)]
Back up file
Olga Brani [Tue, 13 Nov 2012 15:37:41 +0000 (17:37 +0200)]
Group create form bug fixes:
- Remove radio buttons limited/unlimited
- Human readable bytes size input
Olga Brani [Fri, 9 Nov 2012 11:41:22 +0000 (13:41 +0200)]
Fix division by zero
Olga Brani [Fri, 9 Nov 2012 11:00:05 +0000 (13:00 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Fri, 9 Nov 2012 10:59:40 +0000 (12:59 +0200)]
style fixes
Sofia Papagiannaki [Fri, 9 Nov 2012 10:58:00 +0000 (12:58 +0200)]
Separate safely service and resource name (in case resource name contains the RESOURCE_SEPARATOR)
Olga Brani [Fri, 9 Nov 2012 10:56:22 +0000 (12:56 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Fri, 9 Nov 2012 10:55:53 +0000 (12:55 +0200)]
Style fixes
root [Fri, 9 Nov 2012 10:44:25 +0000 (12:44 +0200)]
remove lorem ipsum, fix wrong join link
Olga Brani [Fri, 9 Nov 2012 10:41:31 +0000 (12:41 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Fri, 9 Nov 2012 10:41:19 +0000 (12:41 +0200)]
Style fixes
root [Fri, 9 Nov 2012 10:37:02 +0000 (12:37 +0200)]
Change default resource names
Sofia Papagiannaki [Fri, 9 Nov 2012 10:10:46 +0000 (12:10 +0200)]
More changes in default resource limits
Olga Brani [Fri, 9 Nov 2012 10:07:07 +0000 (12:07 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Fri, 9 Nov 2012 10:06:56 +0000 (12:06 +0200)]
Bug fix for group create radios
Sofia Papagiannaki [Fri, 9 Nov 2012 09:55:35 +0000 (11:55 +0200)]
Change default resource limits
Sofia Papagiannaki [Fri, 9 Nov 2012 08:31:28 +0000 (10:31 +0200)]
Fix user activation
Sofia Papagiannaki [Fri, 9 Nov 2012 07:56:02 +0000 (09:56 +0200)]
Fix signup
Sofia Papagiannaki [Thu, 8 Nov 2012 23:19:56 +0000 (01:19 +0200)]
Fix management commands
Sofia Papagiannaki [Thu, 8 Nov 2012 17:18:46 +0000 (19:18 +0200)]
Display inf in case of unlimited group resource in the admin notification email text.
Sofia Papagiannaki [Thu, 8 Nov 2012 16:49:45 +0000 (18:49 +0200)]
Fix quota in case of unlimited
Sofia Papagiannaki [Thu, 8 Nov 2012 15:53:20 +0000 (17:53 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Sofia Papagiannaki [Thu, 8 Nov 2012 15:53:00 +0000 (17:53 +0200)]
Fix group creation summary view
Olga Brani [Thu, 8 Nov 2012 14:32:00 +0000 (16:32 +0200)]
Style changes in group list page
Olga Brani [Thu, 8 Nov 2012 13:23:19 +0000 (15:23 +0200)]
Fixes for report page
Bypass group list page
Olga Brani [Thu, 8 Nov 2012 12:09:08 +0000 (14:09 +0200)]
Group summary page
Olga Brani [Thu, 8 Nov 2012 10:44:48 +0000 (12:44 +0200)]
Bug fixes
Sofia Papagiannaki [Wed, 7 Nov 2012 14:17:33 +0000 (16:17 +0200)]
Backend implementation of group creation summary
Olga Brani [Wed, 7 Nov 2012 09:58:43 +0000 (11:58 +0200)]
Fix for selected resources group
Olga Brani [Wed, 7 Nov 2012 09:06:25 +0000 (11:06 +0200)]
Group create summary page static
Sofia Papagiannaki [Wed, 7 Nov 2012 00:53:40 +0000 (02:53 +0200)]
User create_groups api call in group creation
Olga Brani [Tue, 6 Nov 2012 16:19:23 +0000 (18:19 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Tue, 6 Nov 2012 16:18:51 +0000 (18:18 +0200)]
- Help_text for group create form
- Resource_presentation dict
Sofia Papagiannaki [Mon, 5 Nov 2012 16:01:03 +0000 (18:01 +0200)]
Fix default resource groups
Olga Brani [Mon, 5 Nov 2012 14:04:30 +0000 (16:04 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Mon, 5 Nov 2012 14:00:55 +0000 (16:00 +0200)]
Merge billing
Olga Brani [Mon, 5 Nov 2012 13:38:54 +0000 (15:38 +0200)]
Merged demo
Olga Brani [Mon, 5 Nov 2012 13:29:33 +0000 (15:29 +0200)]
Radio button fixes
Bug fixes
Sofia Papagiannaki [Mon, 5 Nov 2012 13:08:19 +0000 (15:08 +0200)]
Set additional default resource information (description, unit)
Sofia Papagiannaki [Mon, 5 Nov 2012 11:58:25 +0000 (13:58 +0200)]
Merge branch 'future' into 0.6.4
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
Sofia Papagiannaki [Mon, 5 Nov 2012 10:52:12 +0000 (12:52 +0200)]
Merge with future branch
Olga Brani [Fri, 2 Nov 2012 15:25:16 +0000 (17:25 +0200)]
Style bug fixes
Sofia Papagiannaki [Fri, 2 Nov 2012 12:23:35 +0000 (14:23 +0200)]
Merge branch '0.6.4' into future
Sofia Papagiannaki [Fri, 2 Nov 2012 12:22:43 +0000 (14:22 +0200)]
Merge branch '0.6.4' into future
Conflicts:
snf-astakos-app/astakos/im/synnefo_settings.py
Olga Brani [Fri, 2 Nov 2012 12:14:51 +0000 (14:14 +0200)]
Correct id, name in create_group_demo form
Olga Brani [Fri, 2 Nov 2012 10:50:28 +0000 (12:50 +0200)]
New create group page.
Changes in resources page.
Style fixes
Sofia Papagiannaki [Sun, 28 Oct 2012 15:30:22 +0000 (17:30 +0200)]
Resolve conflict after merge
Sofia Papagiannaki [Sun, 28 Oct 2012 15:25:07 +0000 (17:25 +0200)]
Merge branch '0.6.4' into future
Sofia Papagiannaki [Thu, 25 Oct 2012 16:11:16 +0000 (19:11 +0300)]
Fix undefined variable
Sofia Papagiannaki [Thu, 25 Oct 2012 16:10:14 +0000 (19:10 +0300)]
Minor changes (mainly formatting)
Sofia Papagiannaki [Thu, 25 Oct 2012 16:06:48 +0000 (19:06 +0300)]
Fix undefined variable
Sofia Papagiannaki [Thu, 25 Oct 2012 16:04:10 +0000 (19:04 +0300)]
Changes in the format
Sofia Papagiannaki [Thu, 25 Oct 2012 16:02:04 +0000 (19:02 +0300)]
Remove duplicate command
Olga Brani [Thu, 25 Oct 2012 10:29:37 +0000 (13:29 +0300)]
Resources statistic page
Olga Brani [Tue, 23 Oct 2012 09:26:36 +0000 (12:26 +0300)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts:
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/templates/im/astakosuserquota_list.html
snf-astakos-app/astakos/im/views.py
Olga Brani [Tue, 23 Oct 2012 09:11:44 +0000 (12:11 +0300)]
astakos_group_form_demo page
astakos_group_ressources_statistics page
Sofia Papagiannaki [Mon, 22 Oct 2012 14:31:46 +0000 (17:31 +0300)]
Merge remote-tracking branch 'origin' into future
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
Sofia Papagiannaki [Mon, 22 Oct 2012 13:56:15 +0000 (16:56 +0300)]
Merge remote-tracking branch 'origin' into future
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
Sofia Papagiannaki [Tue, 16 Oct 2012 15:53:26 +0000 (18:53 +0300)]
Change setting name
Refs: #2612
Sofia Papagiannaki [Tue, 16 Oct 2012 15:23:29 +0000 (18:23 +0300)]
Optionally enforce token renewal via settings. Set initial value to True in the forms.
Refs: #2612
Sofia Papagiannaki [Fri, 12 Oct 2012 15:44:35 +0000 (18:44 +0300)]
Remove obsolete import
Sofia Papagiannaki [Fri, 12 Oct 2012 15:43:20 +0000 (18:43 +0300)]
Explicitly allow only POST and GET requests
Sofia Papagiannaki [Fri, 12 Oct 2012 15:39:06 +0000 (18:39 +0300)]
Handle AttributeError in case of other than GET or POST method
Vangelis Koukis [Tue, 9 Oct 2012 09:13:45 +0000 (12:13 +0300)]
Rename user-update mgmt command to user-modify
Sofia Papagiannaki [Thu, 4 Oct 2012 10:21:21 +0000 (13:21 +0300)]
Change saved emails to lowercase
Refs: #2883
Sofia Papagiannaki [Thu, 4 Oct 2012 10:20:28 +0000 (13:20 +0300)]
Turn emails to case-insensitive.
Refs: #2883
Sofia Papagiannaki [Thu, 4 Oct 2012 09:53:06 +0000 (12:53 +0300)]
Merge branch 'dev' into 0.6.4
Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
Sofia Papagiannaki [Thu, 4 Oct 2012 09:42:15 +0000 (12:42 +0300)]
View and management commands for adding/removing user resource quota
Refs: #2793
Sofia Papagiannaki [Wed, 3 Oct 2012 10:34:20 +0000 (13:34 +0300)]
Rename management commands
Sofia Papagiannaki [Wed, 3 Oct 2012 09:50:13 +0000 (12:50 +0300)]
Rename management commands
root [Tue, 2 Oct 2012 11:59:30 +0000 (14:59 +0300)]
Set obsolete user and group limit field nullable
Olga Brani [Tue, 2 Oct 2012 10:13:26 +0000 (13:13 +0300)]
Anchor to select
root [Tue, 2 Oct 2012 09:06:14 +0000 (12:06 +0300)]
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
Sofia Papagiannaki [Tue, 2 Oct 2012 09:05:26 +0000 (12:05 +0300)]
Merge branch '0.6.4' into dev
Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/views.py
root [Mon, 1 Oct 2012 14:45:05 +0000 (17:45 +0300)]
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
root [Mon, 1 Oct 2012 14:44:32 +0000 (17:44 +0300)]
commit dev84 changes
Sofia Papagiannaki [Fri, 28 Sep 2012 15:41:49 +0000 (18:41 +0300)]
Display resource limit details
Sofia Papagiannaki [Fri, 28 Sep 2012 14:25:29 +0000 (17:25 +0300)]
Fix group search
Sofia Papagiannaki [Fri, 28 Sep 2012 14:14:14 +0000 (17:14 +0300)]
Catch EmptyPage exception in paginate empty tag
Sofia Papagiannaki [Fri, 28 Sep 2012 14:13:44 +0000 (17:13 +0300)]
Add sorting parameter validation
Sofia Papagiannaki [Fri, 28 Sep 2012 13:37:58 +0000 (16:37 +0300)]
Change pagination in group list
Sofia Papagiannaki [Fri, 28 Sep 2012 12:48:44 +0000 (15:48 +0300)]
Fix members sorting in group detail
Sofia Papagiannaki [Fri, 28 Sep 2012 12:17:11 +0000 (15:17 +0300)]
Add erroneously deleted line
Sofia Papagiannaki [Fri, 28 Sep 2012 12:14:55 +0000 (15:14 +0300)]
Fix bugs in views
Sofia Papagiannaki [Fri, 28 Sep 2012 10:19:44 +0000 (13:19 +0300)]
Reduce database interaction in group_detail
Sofia Papagiannaki [Fri, 28 Sep 2012 09:04:01 +0000 (12:04 +0300)]
Do now allow owner to leave group: remove link from group search
Sofia Papagiannaki [Fri, 28 Sep 2012 08:54:06 +0000 (11:54 +0300)]
Minor changes in group list
Sofia Papagiannaki [Thu, 27 Sep 2012 17:00:06 +0000 (20:00 +0300)]
Add group_detail members table pagination
Olga Brani [Thu, 27 Sep 2012 11:01:48 +0000 (14:01 +0300)]
Bug fixes for pagination and select
Sofia Papagiannaki [Thu, 27 Sep 2012 08:37:47 +0000 (11:37 +0300)]
Fix group_list
Sofia Papagiannaki [Thu, 27 Sep 2012 08:34:19 +0000 (11:34 +0300)]
Merge remote-tracking branch 'origin' into dev
Conflicts:
snf-astakos-app/Changelog
snf-astakos-app/README
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
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/templates/im/base.html
snf-astakos-app/astakos/im/views.py
snf-astakos-app/conf/20-snf-astakos-app-settings.conf
Olga Brani [Wed, 26 Sep 2012 12:54:59 +0000 (15:54 +0300)]
Group changes
- Pagination set to 8
- Extra fields in sorting select
- X to close widjets
Vangelis Koukis [Wed, 26 Sep 2012 09:37:59 +0000 (12:37 +0300)]
Rename Astakos management commands for uniformity
root [Tue, 25 Sep 2012 13:33:07 +0000 (16:33 +0300)]
Fix group_list view in case current user is not of any group
or does not participate in any group
root [Tue, 25 Sep 2012 13:15:37 +0000 (16:15 +0300)]
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py
Sofia Papagiannaki [Tue, 25 Sep 2012 13:12:17 +0000 (16:12 +0300)]
Merge branch '0.6.4' into dev
Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py
Sofia Papagiannaki [Tue, 25 Sep 2012 13:07:49 +0000 (16:07 +0300)]
merge with 0.6.4
Sofia Papagiannaki [Tue, 25 Sep 2012 11:27:32 +0000 (14:27 +0300)]
Add group tables sorting & decrease interaction with database
projects / astakos / log