Georgios D. Tsoukalas [Fri, 30 Nov 2012 13:23:34 +0000 (15:23 +0200)]
add token to quotaholder client
also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings
root [Fri, 30 Nov 2012 11:32:25 +0000 (13:32 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
root [Fri, 30 Nov 2012 11:32:04 +0000 (13:32 +0200)]
Change commissioning imports
Sofia Papagiannaki [Fri, 30 Nov 2012 11:30:35 +0000 (13:30 +0200)]
Restore im/admin_notification.txt
Sofia Papagiannaki [Fri, 30 Nov 2012 11:29:38 +0000 (13:29 +0200)]
Comment our LDAPBackend
Sofia Papagiannaki [Fri, 30 Nov 2012 11:29:18 +0000 (13:29 +0200)]
Add missing import
Sofia Papagiannaki [Fri, 30 Nov 2012 11:28:09 +0000 (13:28 +0200)]
Add missing transaction commit
Sofia Papagiannaki [Fri, 30 Nov 2012 11:27:31 +0000 (13:27 +0200)]
Case insensitive email checks
#2883
Olga Brani [Fri, 30 Nov 2012 09:52:58 +0000 (11:52 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Olga Brani [Fri, 30 Nov 2012 09:50:47 +0000 (11:50 +0200)]
Merge branch '0.6.4' into devel-0.13
Conflicts:
snf-astakos-app/astakos/im/views.py
root [Fri, 30 Nov 2012 09:22:30 +0000 (11:22 +0200)]
Restore synnefo_settings.py
root [Fri, 30 Nov 2012 09:18:09 +0000 (11:18 +0200)]
Fix middleware AtributeError in case of non astakos request
Fix service-add command: check callpoint result
Olga Brani [Thu, 29 Nov 2012 16:19:19 +0000 (18:19 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Thu, 29 Nov 2012 16:19:10 +0000 (18:19 +0200)]
Fixes
- Rename group to project in ui
- Different pagination for groups search result page
- Truncatechars filter
Sofia Papagiannaki [Thu, 29 Nov 2012 15:08:26 +0000 (17:08 +0200)]
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~
Sofia Papagiannaki [Wed, 28 Nov 2012 16:14:57 +0000 (18:14 +0200)]
Provide management command for cleaning up both inactive sessions and session catalog entries
Sofia Papagiannaki [Wed, 28 Nov 2012 16:09:19 +0000 (18:09 +0200)]
Fix type in group list command
Sofia Papagiannaki [Wed, 28 Nov 2012 14:02:12 +0000 (16:02 +0200)]
Cookie handling code refinement
Sofia Papagiannaki [Wed, 28 Nov 2012 13:45:08 +0000 (15:45 +0200)]
Ensure ASTAKOS_COOKIE is not set if there is no django session cookie: and check in process_request
Sofia Papagiannaki [Wed, 28 Nov 2012 10:02:02 +0000 (12:02 +0200)]
Flush other user sessions during password/token change
Refs: #3007
root [Tue, 27 Nov 2012 15:50:32 +0000 (17:50 +0200)]
Change resource cyclades.networks group
Georgios D. Tsoukalas [Tue, 27 Nov 2012 15:49:32 +0000 (17:49 +0200)]
fix quotaholder imports
Sofia Papagiannaki [Tue, 27 Nov 2012 15:14:56 +0000 (17:14 +0200)]
Remove response argument from Cookie __set & __delete methods
Sofia Papagiannaki [Tue, 27 Nov 2012 15:10:18 +0000 (17:10 +0200)]
Pass also response during Cookie instantiation
Sofia Papagiannaki [Tue, 27 Nov 2012 14:54:09 +0000 (16:54 +0200)]
Force astakos cookie to follow session state.
Sofia Papagiannaki [Mon, 26 Nov 2012 17:53:46 +0000 (19:53 +0200)]
Ensure ASTAKOS_COOKIE is not set if there is no django session cookie.
Sofia Papagiannaki [Mon, 26 Nov 2012 17:52:09 +0000 (19:52 +0200)]
include SECRET_KEY in token creation
Sofia Papagiannaki [Mon, 26 Nov 2012 17:41:52 +0000 (19:41 +0200)]
Fix ordering in snf-manage listing commands
Sofia Papagiannaki [Mon, 26 Nov 2012 17:29:14 +0000 (19:29 +0200)]
Fix Typo in `snf-manage service-list --help'
Refs: #3090
Sofia Papagiannaki [Mon, 26 Nov 2012 17:27:41 +0000 (19:27 +0200)]
Remove obsolete file
Constantinos Venetsanopoulos [Mon, 26 Nov 2012 12:26:57 +0000 (14:26 +0200)]
Change some default values in settings
* Disable invitations by default
* Disable recaptcha by default
* Enable only the 'local' IM module by default
Olga Brani [Mon, 26 Nov 2012 12:19:37 +0000 (14:19 +0200)]
Icon for network (create group page)
root [Fri, 23 Nov 2012 16:40:24 +0000 (18:40 +0200)]
Check if group member is already approved during approve procedure.
root [Fri, 23 Nov 2012 16:16:42 +0000 (18:16 +0200)]
Add maximun participants number reached message.
Olga Brani [Fri, 23 Nov 2012 15:40:08 +0000 (17:40 +0200)]
Style improvements
Olga Brani [Fri, 23 Nov 2012 14:44:55 +0000 (16:44 +0200)]
- New styles for select
- new Class ResourcePresentation
- Group add form javascript validation
Sofia Papagiannaki [Thu, 22 Nov 2012 11:56:54 +0000 (13:56 +0200)]
Improve unique_together email and is_active validation checking
Refs: #3041
Sofia Papagiannaki [Thu, 22 Nov 2012 11:52:40 +0000 (13:52 +0200)]
Enable inactive shibboleth users to change email
Refs: #3041
Sofia Papagiannaki [Tue, 20 Nov 2012 17:26:02 +0000 (19:26 +0200)]
Updated shibboleth workflow (enable user change email before activation)
Refs: #3041
Olga Brani [Tue, 20 Nov 2012 15:40:36 +0000 (17:40 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py
Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py
Olga Brani [Tue, 20 Nov 2012 14:01:03 +0000 (16:01 +0200)]
Fixes
Olga Brani [Tue, 20 Nov 2012 13:58:32 +0000 (15:58 +0200)]
Bug fixes
- Custom select
- Units etc for group details
- General fixes
Sofia Papagiannaki [Tue, 20 Nov 2012 12:19:20 +0000 (14:19 +0200)]
Special handling for login failure messages
Refs: #3041
Sofia Papagiannaki [Tue, 20 Nov 2012 10:26:59 +0000 (12:26 +0200)]
Fix user token creation
Sofia Papagiannaki [Mon, 19 Nov 2012 15:37:44 +0000 (17:37 +0200)]
Return BadResponse if shibboleth returns empty SHIB_EPPN
Sofia Papagiannaki [Mon, 19 Nov 2012 15:10:22 +0000 (17:10 +0200)]
Integration with updated quotaholder component
root [Mon, 19 Nov 2012 15:03:52 +0000 (17:03 +0200)]
Fix zero length field name in format in python 2.6
Sofia Papagiannaki [Mon, 19 Nov 2012 13:38:53 +0000 (15:38 +0200)]
Fix logout
Sofia Papagiannaki [Mon, 19 Nov 2012 13:37:51 +0000 (15:37 +0200)]
Update docstring for activation backends
Refs: #3008
Sofia Papagiannaki [Mon, 19 Nov 2012 10:46:47 +0000 (12:46 +0200)]
Correct logging when cookie is deleted
Sofia Papagiannaki [Mon, 19 Nov 2012 10:15:05 +0000 (12:15 +0200)]
restrict_next should not affect relative paths
Refs: #3008
Sofia Papagiannaki [Mon, 19 Nov 2012 09:52:52 +0000 (11:52 +0200)]
Log for authentication failures
Sofia Papagiannaki [Fri, 16 Nov 2012 18:17:43 +0000 (20:17 +0200)]
Restrict next url parameter
Refs: #3008
Olga Brani [Fri, 16 Nov 2012 14:44:54 +0000 (16:44 +0200)]
Style fixes
Sofia Papagiannaki [Fri, 16 Nov 2012 14:34:23 +0000 (16:34 +0200)]
Customize third party signup form fields
Refs: #3041
Olga Brani [Fri, 16 Nov 2012 14:08:03 +0000 (16:08 +0200)]
bug fix
Olga Brani [Fri, 16 Nov 2012 13:36:45 +0000 (15:36 +0200)]
Add change password link to my account page
Olga Brani [Fri, 16 Nov 2012 13:36:22 +0000 (15:36 +0200)]
Group create
- Complete form
- Fix data presentation
Olga Brani [Fri, 16 Nov 2012 13:34:44 +0000 (15:34 +0200)]
Adding placeholder to forms
Olga Brani [Fri, 16 Nov 2012 13:34:25 +0000 (15:34 +0200)]
Bug fix
Olga Brani [Fri, 16 Nov 2012 13:34:10 +0000 (15:34 +0200)]
Alter main menu
Sofia Papagiannaki [Thu, 15 Nov 2012 15:37:58 +0000 (17:37 +0200)]
Refine shibboleth signup mechanism
Refs: #3041
Olga Brani [Wed, 14 Nov 2012 13:55:54 +0000 (15:55 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Olga Brani [Wed, 14 Nov 2012 13:55:42 +0000 (15:55 +0200)]
Group create form bug fixes ( preliminary effors )
Sofia Papagiannaki [Wed, 14 Nov 2012 11:35:05 +0000 (13:35 +0200)]
Fix group list view
Olga Brani [Wed, 14 Nov 2012 10:41:04 +0000 (12:41 +0200)]
Mergind two lists into one ( preliminary efforts )
Olga Brani [Wed, 14 Nov 2012 10:27:18 +0000 (12:27 +0200)]
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html
snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.BACKUP.21131.html
Olga Brani [Wed, 14 Nov 2012 10:13:00 +0000 (12:13 +0200)]
Delete
Olga Brani [Wed, 14 Nov 2012 10:11:03 +0000 (12:11 +0200)]
Merge
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
Sofia Papagiannaki [Tue, 13 Nov 2012 11:58:59 +0000 (13:58 +0200)]
rename astakosgroup_form_demo.html to astakosgroup_form.html
Sofia Papagiannaki [Tue, 13 Nov 2012 11:57:45 +0000 (13:57 +0200)]
Enforce maximum group participant number checking
Sofia Papagiannaki [Tue, 13 Nov 2012 11:56:00 +0000 (13:56 +0200)]
Isolate astakos messages in separate module
Sofia Papagiannaki [Tue, 13 Nov 2012 11:44:24 +0000 (13:44 +0200)]
change user-modify command name to conform with the rest patterns
root [Mon, 12 Nov 2012 15:03:56 +0000 (17:03 +0200)]
Fix bugs: require_http_methods & send None uplimit incase of inlimited resource
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