Sofia Papagiannaki [Fri, 16 Mar 2012 11:40:33 +0000 (13:40 +0200)]
Merge branch 'master' into aquarium
Conflicts:
snf-astakos-app/Changelog
snf-astakos-app/README
snf-astakos-app/astakos/im/api.py
snf-astakos-app/astakos/im/backends.py
snf-astakos-app/astakos/im/context_processors.py
snf-astakos-app/astakos/im/functions.py
snf-astakos-app/astakos/im/management/commands/sendactivation.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.less
snf-astakos-app/astakos/im/static/im/css/styles.css
snf-astakos-app/astakos/im/static/im/css/styles.less
snf-astakos-app/astakos/im/templates/im/login.html
snf-astakos-app/astakos/im/views.py
Sofia Papagiannaki [Thu, 15 Mar 2012 12:58:35 +0000 (14:58 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 15 Mar 2012 12:58:16 +0000 (14:58 +0200)]
fix welcome email
Kostas Papadimitriou [Thu, 15 Mar 2012 11:38:01 +0000 (13:38 +0200)]
Update Changelog
Kostas Papadimitriou [Thu, 15 Mar 2012 11:17:00 +0000 (13:17 +0200)]
Merge branch 'newstyles'
Kostas Papadimitriou [Thu, 15 Mar 2012 11:16:08 +0000 (13:16 +0200)]
Allow recaptcha to use ssl for api js files
Kostas Papadimitriou [Thu, 15 Mar 2012 11:04:50 +0000 (13:04 +0200)]
Updated styles
Kostas Papadimitriou [Thu, 15 Mar 2012 11:03:07 +0000 (13:03 +0200)]
Improve get_menu view
Allow enabling/disabling some of the menus.
Changed some of the titles.
Sofia Papagiannaki [Thu, 15 Mar 2012 10:25:15 +0000 (12:25 +0200)]
more changes in email templates
Kostas Papadimitriou [Wed, 14 Mar 2012 16:34:07 +0000 (18:34 +0200)]
Update sign up title
Sofia Papagiannaki [Wed, 14 Mar 2012 15:15:47 +0000 (17:15 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Wed, 14 Mar 2012 15:15:37 +0000 (17:15 +0200)]
fix email templates
Sofia Papagiannaki [Wed, 14 Mar 2012 15:14:54 +0000 (17:14 +0200)]
change signup flow, remove activateuser command and introduce sendactivation command
Kostas Papadimitriou [Tue, 13 Mar 2012 17:33:07 +0000 (19:33 +0200)]
Update sign up text
Kostas Papadimitriou [Tue, 13 Mar 2012 16:52:24 +0000 (18:52 +0200)]
Updated Changelog
Kostas Papadimitriou [Tue, 13 Mar 2012 15:45:24 +0000 (17:45 +0200)]
Update home icon
Kostas Papadimitriou [Tue, 13 Mar 2012 15:43:11 +0000 (17:43 +0200)]
Merge branch 'cloudbar-fixes'
Kostas Papadimitriou [Tue, 13 Mar 2012 15:31:30 +0000 (17:31 +0200)]
Improve cloudbar styles
- new home icon (okeanos small logo)
- new styles for icon link
Sofia Papagiannaki [Tue, 13 Mar 2012 15:22:04 +0000 (17:22 +0200)]
more changes in the email templates
Sofia Papagiannaki [Tue, 13 Mar 2012 15:05:30 +0000 (17:05 +0200)]
change email templates
Sofia Papagiannaki [Mon, 12 Mar 2012 16:06:49 +0000 (18:06 +0200)]
change exchange
Refs: #1824
Sofia Papagiannaki [Mon, 12 Mar 2012 12:17:17 +0000 (14:17 +0200)]
change default ASTAKOS_BILLING_FIELDS
Sofia Papagiannaki [Mon, 12 Mar 2012 12:13:35 +0000 (14:13 +0200)]
merge with master: fix conflicts
Sofia Papagiannaki [Mon, 12 Mar 2012 12:01:26 +0000 (14:01 +0200)]
``showuser`` command prints ``has_credits`` AstakosUser field
Sofia Papagiannaki [Mon, 12 Mar 2012 12:00:10 +0000 (14:00 +0200)]
add creditevent listener to set user ``has_credits`` flag and pass the information to ``authenticate`` response
Refs: #1824
Sofia Papagiannaki [Fri, 9 Mar 2012 13:05:02 +0000 (15:05 +0200)]
merge with master
Kostas Papadimitriou [Thu, 8 Mar 2012 15:29:09 +0000 (17:29 +0200)]
Updated changelog file
Kostas Papadimitriou [Thu, 8 Mar 2012 15:23:03 +0000 (17:23 +0200)]
Updated sample conf file
Kostas Papadimitriou [Thu, 8 Mar 2012 15:14:14 +0000 (17:14 +0200)]
Removed unused context processor
Sofia Papagiannaki [Thu, 8 Mar 2012 13:00:29 +0000 (15:00 +0200)]
fix internal astakos menu & minor other changes:
* invoke `get_menu` to dynamically load navigation items
* fix cloudbar settings
* fix httplib2 requirement
Kostas Papadimitriou [Thu, 8 Mar 2012 10:04:25 +0000 (12:04 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Kostas Papadimitriou [Thu, 8 Mar 2012 10:04:02 +0000 (12:04 +0200)]
Updated sample config file
Kostas Papadimitriou [Thu, 8 Mar 2012 10:03:51 +0000 (12:03 +0200)]
Updated styles
fixed textarea size
Sofia Papagiannaki [Thu, 8 Mar 2012 10:03:50 +0000 (12:03 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 8 Mar 2012 10:03:38 +0000 (12:03 +0200)]
menu: omit `Sign in` next parameter if current location is `logout` or `login` page
Kostas Papadimitriou [Wed, 7 Mar 2012 19:22:00 +0000 (21:22 +0200)]
Updated manifest file
Kostas Papadimitriou [Wed, 7 Mar 2012 19:18:05 +0000 (21:18 +0200)]
Missing IE behaviour file
Kostas Papadimitriou [Wed, 7 Mar 2012 19:11:47 +0000 (21:11 +0200)]
Updated sample .conf file
Kostas Papadimitriou [Wed, 7 Mar 2012 19:09:21 +0000 (21:09 +0200)]
Updated Changelog
Kostas Papadimitriou [Wed, 7 Mar 2012 19:03:43 +0000 (21:03 +0200)]
Merge branch 'theme'
Kostas Papadimitriou [Wed, 7 Mar 2012 19:03:24 +0000 (21:03 +0200)]
Updated sample .conf file
Kostas Papadimitriou [Wed, 7 Mar 2012 19:03:17 +0000 (21:03 +0200)]
Missing image
Kostas Papadimitriou [Wed, 7 Mar 2012 19:03:01 +0000 (21:03 +0200)]
Updated changelog
Kostas Papadimitriou [Wed, 7 Mar 2012 19:02:46 +0000 (21:02 +0200)]
Updated dependencies in setup.py
Kostas Papadimitriou [Wed, 7 Mar 2012 19:02:31 +0000 (21:02 +0200)]
Updated styles
Kostas Papadimitriou [Wed, 7 Mar 2012 19:02:01 +0000 (21:02 +0200)]
Display menu and use cloudbar processor for cloudbar
Kostas Papadimitriou [Wed, 7 Mar 2012 19:01:42 +0000 (21:01 +0200)]
Minor cloudbar improvements
Kostas Papadimitriou [Wed, 7 Mar 2012 19:01:22 +0000 (21:01 +0200)]
Updated grnet styles
Sofia Papagiannaki [Wed, 7 Mar 2012 16:02:48 +0000 (18:02 +0200)]
Automatically activate users whose email matches specific email patterns defined in settings (ASTAKOS_RE_USER_EMAIL_PATTERNS) & minor other fixes:
* introduce email_verified AstakosUser field and if False during signup send email verification
* show recaptcha fields in signup form in case of invited user
* do not allow multiple invitations with the same receiver
* enable user level modification by ``snf-manage modifyuser``
Refs: #2166
Sofia Papagiannaki [Tue, 6 Mar 2012 16:30:09 +0000 (18:30 +0200)]
support for multiple accounts authentication: introduce ``force`` parameter in redirect target
Refs: #2111
Giorgos Verigakis [Mon, 5 Mar 2012 15:52:49 +0000 (17:52 +0200)]
Add missing arg strings
Giorgos Verigakis [Mon, 5 Mar 2012 14:00:31 +0000 (16:00 +0200)]
Add --set-active and --set-inactive in modifyuser
Giorgos Verigakis [Mon, 5 Mar 2012 13:59:01 +0000 (15:59 +0200)]
Ignore .egg-info files
Kostas Papadimitriou [Mon, 5 Mar 2012 11:15:41 +0000 (13:15 +0200)]
Updated sample conf file
Sofia Papagiannaki [Mon, 5 Mar 2012 09:52:53 +0000 (11:52 +0200)]
integration with aquarium: Progress III & merge master
Refs: #1824
Sofia Papagiannaki [Mon, 5 Mar 2012 09:34:55 +0000 (11:34 +0200)]
integration with aquarium: Progress II
Refs: #1824
Sofia Papagiannaki [Sun, 4 Mar 2012 22:51:27 +0000 (00:51 +0200)]
Refs: #2141
Refs: #2146
Kostas Papadimitriou [Fri, 2 Mar 2012 17:52:36 +0000 (19:52 +0200)]
Updated default conf file
Sofia Papagiannaki [Fri, 2 Mar 2012 16:58:09 +0000 (18:58 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Fri, 2 Mar 2012 16:57:51 +0000 (18:57 +0200)]
changes in cloudier and signup & logout behavior
Refs: #2146
Sofia Papagiannaki [Fri, 2 Mar 2012 15:32:55 +0000 (17:32 +0200)]
add logging incase of exception
Refs: #2148
Sofia Papagiannaki [Fri, 2 Mar 2012 14:50:55 +0000 (16:50 +0200)]
integration with aquarium progress I
Refs: #1824
Kostas Papadimitriou [Thu, 1 Mar 2012 16:44:31 +0000 (18:44 +0200)]
Minor fix in cloudbar styles
apply different color on hover for user menu links
Kostas Papadimitriou [Thu, 1 Mar 2012 16:26:44 +0000 (18:26 +0200)]
Updated cloudbar styles
- a bit bolder links
- force font-family and size
Antony Chazapis [Thu, 1 Mar 2012 16:59:23 +0000 (18:59 +0200)]
Fix proposed settings file.
Kostas Papadimitriou [Thu, 1 Mar 2012 14:43:52 +0000 (16:43 +0200)]
Better signup button below the login form
Sofia Papagiannaki [Thu, 1 Mar 2012 13:55:10 +0000 (15:55 +0200)]
Merge branch 'master', remote-tracking branch 'origin' into aquarium
Kostas Papadimitriou [Thu, 1 Mar 2012 13:38:43 +0000 (15:38 +0200)]
Configurable captcha options
Kostas Papadimitriou [Thu, 1 Mar 2012 13:37:54 +0000 (15:37 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 1 Mar 2012 13:34:41 +0000 (15:34 +0200)]
fix README
Sofia Papagiannaki [Thu, 1 Mar 2012 13:28:53 +0000 (15:28 +0200)]
not send admin notification email if ASTAKOS_DEFAULT_ADMIN_EMAIL is not set
Refs: #2116
Kostas Papadimitriou [Thu, 1 Mar 2012 13:21:57 +0000 (15:21 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 1 Mar 2012 13:09:00 +0000 (15:09 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 1 Mar 2012 13:08:54 +0000 (15:08 +0200)]
fix README settings
Kostas Papadimitriou [Thu, 1 Mar 2012 12:24:19 +0000 (14:24 +0200)]
Include additional settings in sample .conf file
Kostas Papadimitriou [Thu, 1 Mar 2012 12:22:09 +0000 (14:22 +0200)]
updated Changelog for v0.3.1
Kostas Papadimitriou [Thu, 1 Mar 2012 11:40:38 +0000 (13:40 +0200)]
Updated css styles
- removed autocomplete for non-login forms
- proper recaptcha placement/styles
Kostas Papadimitriou [Thu, 1 Mar 2012 11:20:52 +0000 (13:20 +0200)]
Fallback on HTTP_X_REAL_IP meta to retrieve client ip
thats where nginx sets the client ip
Kostas Papadimitriou [Thu, 1 Mar 2012 10:42:45 +0000 (12:42 +0200)]
Updated default snf-common conf file
Kostas Papadimitriou [Thu, 1 Mar 2012 10:42:24 +0000 (12:42 +0200)]
Updated required snf-common version
Kostas Papadimitriou [Thu, 1 Mar 2012 10:39:03 +0000 (12:39 +0200)]
Cloudbar IE fix
fixed cloudbar to display properly on pithos app with IE
Kostas Papadimitriou [Wed, 29 Feb 2012 17:30:37 +0000 (19:30 +0200)]
Include additional settings in sample .conf file
Kostas Papadimitriou [Wed, 29 Feb 2012 16:24:32 +0000 (18:24 +0200)]
Cloudbar fix
proper callback parameter
Kostas Papadimitriou [Wed, 29 Feb 2012 16:19:02 +0000 (18:19 +0200)]
Convert cloudbar api responses to JSONP
if callback parameter is set on url use it and set the appropriate
response mimetype.
Sofia Papagiannaki [Thu, 1 Mar 2012 10:06:50 +0000 (12:06 +0200)]
notify administrator by email when an inactive account is created
Ref: #2116
Sofia Papagiannaki [Thu, 1 Mar 2012 09:07:12 +0000 (11:07 +0200)]
add captcha field in local user creation form
Ref: #2117
root [Tue, 28 Feb 2012 14:51:31 +0000 (16:51 +0200)]
Fix cloudbar.
Sofia Papagiannaki [Tue, 28 Feb 2012 14:14:04 +0000 (16:14 +0200)]
add cloudbar settings in README
Refs: #2102
Sofia Papagiannaki [Tue, 28 Feb 2012 14:11:47 +0000 (16:11 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Antony Chazapis [Tue, 28 Feb 2012 14:00:31 +0000 (16:00 +0200)]
Remove admin guide.
Sofia Papagiannaki [Tue, 28 Feb 2012 13:50:56 +0000 (15:50 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Antony Chazapis [Tue, 28 Feb 2012 13:50:32 +0000 (15:50 +0200)]
Fix README.
Sofia Papagiannaki [Tue, 28 Feb 2012 13:47:56 +0000 (15:47 +0200)]
Merge branch 'cloudbar', remote-tracking branch 'origin'
Sofia Papagiannaki [Tue, 28 Feb 2012 13:44:38 +0000 (15:44 +0200)]
Merge branch 'master', remote-tracking branch 'origin' into aquarium
Sofia Papagiannaki [Tue, 28 Feb 2012 12:07:47 +0000 (14:07 +0200)]
fix activateuser command
Sofia Papagiannaki [Tue, 28 Feb 2012 11:32:10 +0000 (13:32 +0200)]
Document used settings
Refs: #2103
Sofia Papagiannaki [Tue, 28 Feb 2012 09:42:12 +0000 (11:42 +0200)]
Merge branch 'master', remote-tracking branch 'origin' into aquarium
Sofia Papagiannaki [Sun, 26 Feb 2012 16:12:58 +0000 (18:12 +0200)]
use Astakos's external URL to prepend all links
Refs: #2102
Sofia Papagiannaki [Sun, 26 Feb 2012 16:00:48 +0000 (18:00 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos into cloudbar
Antony Chazapis [Sat, 25 Feb 2012 23:41:38 +0000 (01:41 +0200)]
Clear out management command descriptions.