Georgios D. Tsoukalas [Thu, 6 Dec 2012 14:58:33 +0000 (16:58 +0200)]
whitespace tab fix
Sofia Papagiannaki [Thu, 6 Dec 2012 13:52:50 +0000 (15:52 +0200)]
Progress I
Olga Brani [Thu, 6 Dec 2012 10:25:23 +0000 (12:25 +0200)]
Text fixes
Style fixes
Olga Brani [Wed, 5 Dec 2012 13:23:25 +0000 (15:23 +0200)]
Resource usage new % style
Olga Brani [Wed, 5 Dec 2012 13:23:08 +0000 (15:23 +0200)]
Uniform text in group details/group list
Olga Brani [Wed, 5 Dec 2012 11:15:15 +0000 (13:15 +0200)]
Style fixes
Olga Brani [Wed, 5 Dec 2012 11:15:07 +0000 (13:15 +0200)]
Text changes
Sofia Papagiannaki [Wed, 5 Dec 2012 11:11:16 +0000 (13:11 +0200)]
Change some default values in settings
Sofia Papagiannaki [Tue, 4 Dec 2012 13:43:41 +0000 (15:43 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Sofia Papagiannaki [Tue, 4 Dec 2012 13:43:01 +0000 (15:43 +0200)]
Fix migrations
Georgios D. Tsoukalas [Tue, 4 Dec 2012 12:07:13 +0000 (14:07 +0200)]
fix tab
Sofia Papagiannaki [Tue, 4 Dec 2012 12:22:28 +0000 (14:22 +0200)]
Fix migrations
Olga Brani [Tue, 4 Dec 2012 12:05:52 +0000 (14:05 +0200)]
Limit usage ratio
Fix link in how-it-works page
Olga Brani [Tue, 4 Dec 2012 12:05:07 +0000 (14:05 +0200)]
- Flag is_active_member to group_details
Olga Brani [Tue, 4 Dec 2012 12:05:01 +0000 (14:05 +0200)]
- Update user/project activation status
- Fix float bug
Olga Brani [Tue, 4 Dec 2012 10:00:42 +0000 (12:00 +0200)]
Moderation fix
Olga Brani [Tue, 4 Dec 2012 09:31:34 +0000 (11:31 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Olga Brani [Tue, 4 Dec 2012 09:31:04 +0000 (11:31 +0200)]
Interactivity in how-it-works page
Kostas Papadimitriou [Tue, 4 Dec 2012 09:23:56 +0000 (11:23 +0200)]
Automatic local auth provider assignment
when a valid user with empty authentication providers list tries to
log in
Kostas Papadimitriou [Tue, 4 Dec 2012 09:20:55 +0000 (11:20 +0200)]
Create local auth provider for superadmin user
if one created after syncdb command
Olga Brani [Tue, 4 Dec 2012 08:45:19 +0000 (10:45 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Conflicts:
snf-astakos-app/astakos/im/api/__init__.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
Olga Brani [Tue, 4 Dec 2012 08:10:13 +0000 (10:10 +0200)]
Style fixes
New menu
Kostas Papadimitriou [Tue, 4 Dec 2012 07:10:02 +0000 (09:10 +0200)]
Dynamic third party signup url
Kostas Papadimitriou [Tue, 4 Dec 2012 07:05:48 +0000 (09:05 +0200)]
Merge branch 'twitterauth' into devel-0.13
Sofia Papagiannaki [Mon, 3 Dec 2012 16:28:04 +0000 (18:28 +0200)]
Change menu ``Report`` to ``Usage``
Sofia Papagiannaki [Mon, 3 Dec 2012 16:04:33 +0000 (18:04 +0200)]
Fix group list view working with sqlite
Sofia Papagiannaki [Mon, 3 Dec 2012 16:03:26 +0000 (18:03 +0200)]
Remove forgotten merge mark
Sofia Papagiannaki [Mon, 3 Dec 2012 15:55:43 +0000 (17:55 +0200)]
Update snf-manage commands in email templates.
Sofia Papagiannaki [Mon, 3 Dec 2012 15:49:24 +0000 (17:49 +0200)]
Update snf-manage commands in email templates. Fix authentication token renewal.
Olga Brani [Mon, 3 Dec 2012 13:37:06 +0000 (15:37 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
snf-astakos-app/astakos/im/templates/im/profile.html
Olga Brani [Mon, 3 Dec 2012 13:27:42 +0000 (15:27 +0200)]
Bug fixes
Style improvents
Authorisation methods page
Sofia Papagiannaki [Mon, 3 Dec 2012 12:46:18 +0000 (14:46 +0200)]
Fix AttributeError invalid method name
Sofia Papagiannaki [Mon, 3 Dec 2012 12:13:05 +0000 (14:13 +0200)]
Do not show default groups in project lists
Kostas Papadimitriou [Mon, 3 Dec 2012 11:53:17 +0000 (13:53 +0200)]
auth_providers context processro fix
pass auth provider instances in templates
Kostas Papadimitriou [Mon, 3 Dec 2012 11:47:14 +0000 (13:47 +0200)]
Include inactive auth providers in registry
Kostas Papadimitriou [Mon, 3 Dec 2012 11:35:41 +0000 (13:35 +0200)]
Twitter authentication backend
Kostas Papadimitriou [Mon, 3 Dec 2012 11:34:27 +0000 (13:34 +0200)]
Handle empty third party email
Kostas Papadimitriou [Mon, 3 Dec 2012 11:33:44 +0000 (13:33 +0200)]
Remove unused template
root [Mon, 3 Dec 2012 11:30:18 +0000 (13:30 +0200)]
More meaningful login failure explanations
root [Mon, 3 Dec 2012 11:00:47 +0000 (13:00 +0200)]
Fix syntax in uls.py
root [Mon, 3 Dec 2012 10:59:15 +0000 (12:59 +0200)]
Remove billing from urls
root [Mon, 3 Dec 2012 10:56:21 +0000 (12:56 +0200)]
Remove celery tasks execution
root [Mon, 3 Dec 2012 10:45:10 +0000 (12:45 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
root [Mon, 3 Dec 2012 10:43:20 +0000 (12:43 +0200)]
Change ASTAKOS_QUOTAHOLDER_Token to ASTAKOS_QUOTAHOLDER_TOKEN
Sofia Papagiannaki [Mon, 3 Dec 2012 10:40:56 +0000 (12:40 +0200)]
Fix import error in astakos.im.functions
Olga Brani [Mon, 3 Dec 2012 10:30:46 +0000 (12:30 +0200)]
Fix legend margin bug
Kostas Papadimitriou [Mon, 3 Dec 2012 09:27:12 +0000 (11:27 +0200)]
Fix setting name case
Kostas Papadimitriou [Mon, 3 Dec 2012 09:20:48 +0000 (11:20 +0200)]
Configurable auth providers templates/titles
Kostas Papadimitriou [Mon, 3 Dec 2012 08:08:36 +0000 (10:08 +0200)]
Proper MODERATION_ENABLED check when invitations are enabled
Kostas Papadimitriou [Mon, 3 Dec 2012 08:04:47 +0000 (10:04 +0200)]
Set local login method for new users
Kostas Papadimitriou [Mon, 3 Dec 2012 02:41:08 +0000 (04:41 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Sofia Papagiannaki [Sat, 1 Dec 2012 22:55:31 +0000 (00:55 +0200)]
Extend/Update management commands
Sofia Papagiannaki [Sat, 1 Dec 2012 21:33:17 +0000 (23:33 +0200)]
Fix infinite loop in case another user with the same email already exists
Sofia Papagiannaki [Sat, 1 Dec 2012 21:03:12 +0000 (23:03 +0200)]
Change AstakosUserManager to inherit from django.contrib.auth.models.UserManager
Sofia Papagiannaki [Sat, 1 Dec 2012 20:47:47 +0000 (22:47 +0200)]
Fix group detail template: specify post targets
Sofia Papagiannaki [Sat, 1 Dec 2012 20:47:07 +0000 (22:47 +0200)]
Enable group owner to modify moderation
Sofia Papagiannaki [Sat, 1 Dec 2012 20:34:47 +0000 (22:34 +0200)]
Enable group owner to disapprove already approved members
Sofia Papagiannaki [Sat, 1 Dec 2012 20:28:25 +0000 (22:28 +0200)]
Fix sorting parameter validation in group detail
Sofia Papagiannaki [Sat, 1 Dec 2012 20:06:05 +0000 (22:06 +0200)]
Remove obsolete strip_http from the templates
Sofia Papagiannaki [Sat, 1 Dec 2012 18:20:50 +0000 (20:20 +0200)]
Fixes in group creation
Sofia Papagiannaki [Sat, 1 Dec 2012 17:05:04 +0000 (19:05 +0200)]
Validate sorting request parameter in group views
Sofia Papagiannaki [Sat, 1 Dec 2012 16:03:09 +0000 (18:03 +0200)]
Remove obsolete rcut filter in templates
Sofia Papagiannaki [Sat, 1 Dec 2012 16:02:14 +0000 (18:02 +0200)]
Change email authentication backend to check username/password pair in any case if email/password authentication fails (not only if username does not match email regex)
Sofia Papagiannaki [Fri, 30 Nov 2012 19:15:06 +0000 (21:15 +0200)]
Do not save url prefix in group names
Kostas Papadimitriou [Fri, 30 Nov 2012 17:09:59 +0000 (19:09 +0200)]
Remove explicit link to change password view
Kostas Papadimitriou [Fri, 30 Nov 2012 16:48:31 +0000 (18:48 +0200)]
Reset password when removing local auth provider
Kostas Papadimitriou [Fri, 30 Nov 2012 16:29:10 +0000 (18:29 +0200)]
Keep third party token between signup form errors
Olga Brani [Fri, 30 Nov 2012 15:44:40 +0000 (17:44 +0200)]
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Conflicts:
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py
Olga Brani [Fri, 30 Nov 2012 15:42:21 +0000 (17:42 +0200)]
How it works page
Kostas Papadimitriou [Fri, 30 Nov 2012 15:18:05 +0000 (17:18 +0200)]
Proper commit files for b48b6a2
Kostas Papadimitriou [Fri, 30 Nov 2012 15:14:45 +0000 (17:14 +0200)]
Update management commands
to conform with multiple auth providers feature
Kostas Papadimitriou [Fri, 30 Nov 2012 14:56:24 +0000 (16:56 +0200)]
Multiple auth providers migration
Kostas Papadimitriou [Fri, 30 Nov 2012 14:56:08 +0000 (16:56 +0200)]
is_local is no longer used
Kostas Papadimitriou [Fri, 30 Nov 2012 14:45:17 +0000 (16:45 +0200)]
Additional multiple auth methods fixes and tests
Kostas Papadimitriou [Fri, 30 Nov 2012 13:41:19 +0000 (15:41 +0200)]
Create missing migrations
Kostas Papadimitriou [Fri, 30 Nov 2012 13:38:39 +0000 (15:38 +0200)]
Remove conflicting migrations
Kostas Papadimitriou [Fri, 30 Nov 2012 13:36:33 +0000 (15:36 +0200)]
Merge remote-tracking branch 'origin/devel-0.13' into multipleauthmethods
Kostas Papadimitriou [Fri, 30 Nov 2012 12:58:44 +0000 (14:58 +0200)]
Merge branch 'devel-0.13' into multipleauthmethods
Conflicts:
snf-astakos-app/astakos/im/context_processors.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/target/local.py
snf-astakos-app/astakos/im/target/shibboleth.py
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py
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
Kostas Papadimitriou [Fri, 30 Nov 2012 12:40:22 +0000 (14:40 +0200)]
Allow multiple login methods per account
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