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
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: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
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
Olga Brani [Fri, 21 Sep 2012 13:34:10 +0000 (16:34 +0300)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Fri, 21 Sep 2012 13:30:26 +0000 (16:30 +0300)]
Sorting + Pagination bug
Sofia Papagiannaki [Fri, 21 Sep 2012 12:17:04 +0000 (15:17 +0300)]
Fix migration integrity error
root [Fri, 21 Sep 2012 12:04:03 +0000 (15:04 +0300)]
handle limit conditions in timeline charging
root [Fri, 21 Sep 2012 09:51:50 +0000 (12:51 +0300)]
enhance timeline form, traffic charging support
root [Fri, 21 Sep 2012 09:50:30 +0000 (12:50 +0300)]
fetch form in GET (by spapagian)
root [Thu, 20 Sep 2012 16:20:24 +0000 (19:20 +0300)]
timeline charging hello world
root [Thu, 20 Sep 2012 15:02:31 +0000 (18:02 +0300)]
enhance mock timeline form and listing
Sofia Papagiannaki [Fri, 21 Sep 2012 11:32:47 +0000 (14:32 +0300)]
Fix pagination in search group view
Sofia Papagiannaki [Fri, 21 Sep 2012 09:59:16 +0000 (12:59 +0300)]
Change resource representation
Olga Brani [Fri, 21 Sep 2012 09:55:22 +0000 (12:55 +0300)]
- Pagination style change
- Extra select for sorting table
Sofia Papagiannaki [Fri, 21 Sep 2012 09:00:18 +0000 (12:00 +0300)]
Add signed_terms_required & login_required decorators in timeline view.
Sofia Papagiannaki [Thu, 20 Sep 2012 15:19:29 +0000 (18:19 +0300)]
Change Timeline date field format
Sofia Papagiannaki [Thu, 20 Sep 2012 15:11:49 +0000 (18:11 +0300)]
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
Sofia Papagiannaki [Thu, 20 Sep 2012 15:10:54 +0000 (18:10 +0300)]
Manipulate Timeline form fields
root [Thu, 20 Sep 2012 14:12:08 +0000 (17:12 +0300)]
Remove email validation
root [Thu, 20 Sep 2012 14:10:17 +0000 (17:10 +0300)]
Fix migration 0023. Supply limit default value.
Sofia Papagiannaki [Thu, 20 Sep 2012 14:03:51 +0000 (17:03 +0300)]
Display calendar in timeline date fields
Sofia Papagiannaki [Thu, 20 Sep 2012 13:12:51 +0000 (16:12 +0300)]
Add timeline tab
Sofia Papagiannaki [Thu, 20 Sep 2012 12:53:53 +0000 (15:53 +0300)]
New timeline tab
Sofia Papagiannaki [Thu, 20 Sep 2012 10:33:21 +0000 (13:33 +0300)]
Add pagination
Sofia Papagiannaki [Thu, 20 Sep 2012 10:28:58 +0000 (13:28 +0300)]
Merge branch '0.6.4' into dev
Olga Brani [Wed, 19 Sep 2012 12:23:42 +0000 (15:23 +0300)]
Addcredits
Sofia Papagiannaki [Tue, 18 Sep 2012 16:32:49 +0000 (19:32 +0300)]
Change rename and change quota limit field to bigint
Sofia Papagiannaki [Tue, 18 Sep 2012 12:35:41 +0000 (15:35 +0300)]
Merge branch '0.6.4' into dev
Olga Brani [Tue, 18 Sep 2012 12:30:19 +0000 (15:30 +0300)]
:Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts:
snf-astakos-app/astakos/im/templates/im/billing.html
snf-astakos-app/astakos/im/templatetags/filters.py
snf-astakos-app/astakos/im/views.py
Sofia Papagiannaki [Tue, 18 Sep 2012 12:20:33 +0000 (15:20 +0300)]
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
Olga Brani [Tue, 18 Sep 2012 12:14:44 +0000 (15:14 +0300)]
Billing json
Sofia Papagiannaki [Tue, 18 Sep 2012 11:52:46 +0000 (14:52 +0300)]
Alter limit column type to bigint
root [Tue, 18 Sep 2012 09:40:12 +0000 (12:40 +0300)]
Fix transaction management in signup views
Sofia Papagiannaki [Mon, 17 Sep 2012 15:47:02 +0000 (18:47 +0300)]
Change handle membership wrapper
Sofia Papagiannaki [Mon, 17 Sep 2012 15:46:03 +0000 (18:46 +0300)]
Alter billing view to accepted another start date instead of today()
Sofia Papagiannaki [Mon, 17 Sep 2012 15:44:56 +0000 (18:44 +0300)]
Custom template tag for months since a specific date
Sofia Papagiannaki [Mon, 17 Sep 2012 15:36:50 +0000 (18:36 +0300)]
Register resources in quota holder
Olga Brani [Mon, 17 Sep 2012 07:51:11 +0000 (10:51 +0300)]
Align actions in table (groups)
Sofia Papagiannaki [Fri, 14 Sep 2012 15:08:39 +0000 (18:08 +0300)]
Enable group owner to add members
Refs: #2793
Sofia Papagiannaki [Fri, 14 Sep 2012 15:05:10 +0000 (18:05 +0300)]
Merge branch 'dev' into 0.6.4
Sofia Papagiannaki [Fri, 14 Sep 2012 14:06:48 +0000 (17:06 +0300)]
remove django_extensions from installed_apps
Sofia Papagiannaki [Fri, 14 Sep 2012 13:48:51 +0000 (16:48 +0300)]
Enable group owner to add members
Refs: #2793
Olga Brani [Fri, 14 Sep 2012 12:08:59 +0000 (15:08 +0300)]
Style changes in group_edit and show_all_groups
Sofia Papagiannaki [Fri, 14 Sep 2012 09:18:00 +0000 (12:18 +0300)]
Remove debug_toolbar from installed_apps
Sofia Papagiannaki [Fri, 14 Sep 2012 09:06:38 +0000 (12:06 +0300)]
Rollback transaction in case signup failure
Sofia Papagiannaki [Thu, 13 Sep 2012 14:43:47 +0000 (17:43 +0300)]
Add button show all in group search page
Refs: #2793
Sofia Papagiannaki [Thu, 13 Sep 2012 13:37:42 +0000 (16:37 +0300)]
Group owner can update group description & homepage
Refs: #2793
Sofia Papagiannaki [Thu, 13 Sep 2012 13:23:31 +0000 (16:23 +0300)]
Group owner can update group description & homepage
Refs: #2793
Sofia Papagiannaki [Thu, 13 Sep 2012 13:21:31 +0000 (16:21 +0300)]
remove obsolete view
Sofia Papagiannaki [Thu, 13 Sep 2012 13:21:03 +0000 (16:21 +0300)]
merge with origin 0.6.4
Sofia Papagiannaki [Thu, 13 Sep 2012 08:19:54 +0000 (11:19 +0300)]
Merge branch '0.6.4' into dev
Olga Brani [Tue, 11 Sep 2012 13:46:36 +0000 (16:46 +0300)]
- Editable group fields
- Show all feature in search
-
Olga Brani [Tue, 11 Sep 2012 10:45:46 +0000 (13:45 +0300)]
UI changes
- Show more/less button
- Removed table sorting
Olga Brani [Mon, 10 Sep 2012 13:51:34 +0000 (16:51 +0300)]
Various presentation fixes
Sofia Papagiannaki [Mon, 10 Sep 2012 10:52:00 +0000 (13:52 +0300)]
Fix code formatting to conform to the PEP 8 style guide
Sofia Papagiannaki [Mon, 10 Sep 2012 09:11:38 +0000 (12:11 +0300)]
Inject user email in notification mail subjects
Update README
Olga Brani [Mon, 10 Sep 2012 08:48:00 +0000 (11:48 +0300)]
Bug fixes
- Homepage field appearing in form
- Fix for search_group page
Kostas Papadimitriou [Fri, 7 Sep 2012 15:52:55 +0000 (18:52 +0300)]
Inject user email in notification mail subjects
projects / astakos / log