Sofia Papagiannaki [Mon, 5 Mar 2012 09:34:55 +0000 (11:34 +0200)]
integration with aquarium: Progress II
Refs: #1824
Sofia Papagiannaki [Fri, 2 Mar 2012 14:50:55 +0000 (16:50 +0200)]
integration with aquarium progress I
Refs: #1824
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.
Antony Chazapis [Sat, 25 Feb 2012 23:27:27 +0000 (01:27 +0200)]
Proper README.
Sofia Papagiannaki [Sat, 25 Feb 2012 20:38:56 +0000 (22:38 +0200)]
remove hardcoded urls to the astakos api services from the cloudar
Sofia Papagiannaki [Sat, 25 Feb 2012 20:03:32 +0000 (22:03 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos into cloudbar
Sofia Papagiannaki [Sat, 25 Feb 2012 19:57:54 +0000 (21:57 +0200)]
change cloudbar to contain dynamic links
Antony Chazapis [Sat, 25 Feb 2012 11:08:17 +0000 (13:08 +0200)]
Include images in package.
Sofia Papagiannaki [Fri, 24 Feb 2012 12:08:40 +0000 (14:08 +0200)]
fix bugs
* welcome_email.txt template location
* in activateuser do not change user's state in case of send_email failure
* fix inviteuser
Antony Chazapis [Fri, 24 Feb 2012 01:26:30 +0000 (03:26 +0200)]
Fix package.
Kostas Papadimitriou [Thu, 23 Feb 2012 18:04:59 +0000 (20:04 +0200)]
Fix loggers webproject entry point
Kostas Papadimitriou [Thu, 23 Feb 2012 16:17:40 +0000 (18:17 +0200)]
Fixed im static files configuration
Kostas Papadimitriou [Thu, 23 Feb 2012 15:56:18 +0000 (17:56 +0200)]
Add astakos/urls.py
Kostas Papadimitriou [Thu, 23 Feb 2012 15:45:21 +0000 (17:45 +0200)]
Default settings configuration file
Kostas Papadimitriou [Thu, 23 Feb 2012 15:36:55 +0000 (17:36 +0200)]
Merge branch 'master' into packaging
Kostas Papadimitriou [Thu, 23 Feb 2012 15:36:25 +0000 (17:36 +0200)]
Repo refactor and webproject hooks fixes
Antony Chazapis [Thu, 23 Feb 2012 11:24:51 +0000 (13:24 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Conflicts:
astakos/im/util.py
Antony Chazapis [Thu, 23 Feb 2012 11:22:59 +0000 (13:22 +0200)]
Use option for secure cookie.
Refs #2069
Sofia Papagiannaki [Thu, 23 Feb 2012 11:19:45 +0000 (13:19 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 23 Feb 2012 11:19:20 +0000 (13:19 +0200)]
secure cookies
Refs: #2069
Kostas Papadimitriou [Tue, 21 Feb 2012 17:43:25 +0000 (19:43 +0200)]
Merge branch 'packaging'
Antony Chazapis [Tue, 21 Feb 2012 16:48:16 +0000 (18:48 +0200)]
Bump version.
Sofia Papagiannaki [Tue, 21 Feb 2012 14:54:48 +0000 (16:54 +0200)]
fix reset password email template
Sofia Papagiannaki [Tue, 21 Feb 2012 14:44:57 +0000 (16:44 +0200)]
fix reset password link in email template
Kostas Papadimitriou [Tue, 21 Feb 2012 14:41:07 +0000 (16:41 +0200)]
Merge branch 'master' into packaging
Sofia Papagiannaki [Tue, 21 Feb 2012 14:27:08 +0000 (16:27 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Tue, 21 Feb 2012 14:26:53 +0000 (16:26 +0200)]
add welcome_email template
Antony Chazapis [Tue, 21 Feb 2012 14:18:29 +0000 (16:18 +0200)]
Fix reference to external js.
root [Tue, 21 Feb 2012 14:15:17 +0000 (16:15 +0200)]
Bring top elements a little bit closer.
Kostas Papadimitriou [Tue, 21 Feb 2012 14:08:46 +0000 (16:08 +0200)]
Updated styles.css
Sofia Papagiannaki [Tue, 21 Feb 2012 14:05:45 +0000 (16:05 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Tue, 21 Feb 2012 14:05:30 +0000 (16:05 +0200)]
fix functions.py
Kostas Papadimitriou [Tue, 21 Feb 2012 13:56:25 +0000 (15:56 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Kostas Papadimitriou [Tue, 21 Feb 2012 13:55:04 +0000 (15:55 +0200)]
Update styles and minor html fixes
- Update styles.less and styles.css
- Add checkbox styles and jquery plugin
- Fix google font import (use https)
Sofia Papagiannaki [Tue, 21 Feb 2012 13:52:24 +0000 (15:52 +0200)]
remove sites
Antony Chazapis [Tue, 21 Feb 2012 13:48:57 +0000 (15:48 +0200)]
No parameter in email addresses.
Antony Chazapis [Tue, 21 Feb 2012 13:35:38 +0000 (15:35 +0200)]
Bring back admin functions.
Antony Chazapis [Tue, 21 Feb 2012 13:25:57 +0000 (15:25 +0200)]
Remove invite script.
Antony Chazapis [Tue, 21 Feb 2012 13:17:44 +0000 (15:17 +0200)]
Merge branch 'admin'
Antony Chazapis [Tue, 21 Feb 2012 13:16:44 +0000 (15:16 +0200)]
Remove custom web admin.
Refs #1996
Giorgos Verigakis [Tue, 21 Feb 2012 13:15:06 +0000 (15:15 +0200)]
Move common code to _common.py
Kostas Papadimitriou [Tue, 21 Feb 2012 13:08:45 +0000 (15:08 +0200)]
Merge branch 'master' into packaging
Antony Chazapis [Tue, 21 Feb 2012 13:06:51 +0000 (15:06 +0200)]
Delete cookie with path and domain.
Fixes #2080
Antony Chazapis [Tue, 21 Feb 2012 13:05:16 +0000 (15:05 +0200)]
Hide service descriptions.
Antony Chazapis [Tue, 21 Feb 2012 13:04:50 +0000 (15:04 +0200)]
Remove obsolete import.
Kostas Papadimitriou [Tue, 21 Feb 2012 13:02:26 +0000 (15:02 +0200)]
Merge branch 'master' into packaging
Antony Chazapis [Tue, 21 Feb 2012 12:51:56 +0000 (14:51 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Antony Chazapis [Tue, 21 Feb 2012 12:51:32 +0000 (14:51 +0200)]
Remove site fixture.
Giorgos Verigakis [Tue, 21 Feb 2012 12:50:06 +0000 (14:50 +0200)]
Add inviteuser command
Giorgos Verigakis [Tue, 21 Feb 2012 12:49:17 +0000 (14:49 +0200)]
Send an email to user when activating
Sofia Papagiannaki [Tue, 21 Feb 2012 12:08:50 +0000 (14:08 +0200)]
enable user to renew token
Refs: #2047
Giorgos Verigakis [Tue, 21 Feb 2012 11:43:55 +0000 (13:43 +0200)]
Use the correct year in copyright clauses
Giorgos Verigakis [Tue, 21 Feb 2012 11:38:14 +0000 (13:38 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos into admin
Kostas Papadimitriou [Mon, 20 Feb 2012 16:59:03 +0000 (18:59 +0200)]
Enable cloudbar context processor
Kostas Papadimitriou [Mon, 20 Feb 2012 16:13:14 +0000 (18:13 +0200)]
Add auth and sessions contrib apps for synnefo hooks
Sofia Papagiannaki [Mon, 20 Feb 2012 14:08:51 +0000 (16:08 +0200)]
remove site framework, introduce invite function
Kostas Papadimitriou [Mon, 20 Feb 2012 11:23:43 +0000 (13:23 +0200)]
Merge branch 'master' into packaging
Giorgos Verigakis [Fri, 17 Feb 2012 16:33:37 +0000 (18:33 +0200)]
Add admin management commands
Added the following commands:
* activate user
* create user
* list invitations
* list users
* modify user
* show invitation
* show user
Sofia Papagiannaki [Fri, 17 Feb 2012 14:20:12 +0000 (16:20 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Fri, 17 Feb 2012 14:19:49 +0000 (16:19 +0200)]
introduce ``activate`` function
root [Fri, 17 Feb 2012 14:02:37 +0000 (16:02 +0200)]
Use relative paths in cloudbar.
Antony Chazapis [Wed, 15 Feb 2012 12:25:17 +0000 (14:25 +0200)]
Bump version.
Kostas Papadimitriou [Tue, 14 Feb 2012 17:15:20 +0000 (19:15 +0200)]
Fix in synnefo specific settings
Kostas Papadimitriou [Tue, 14 Feb 2012 17:05:48 +0000 (19:05 +0200)]
Add LOGGING_SETUP setting in synnefo default settings
Kostas Papadimitriou [Tue, 14 Feb 2012 16:45:10 +0000 (18:45 +0200)]
Remove console_script entry point
Kostas Papadimitriou [Tue, 14 Feb 2012 16:43:16 +0000 (18:43 +0200)]
Initial commit for webproject integration
- Add entry points for snf-webproject
- Python packaging improvements
root [Tue, 14 Feb 2012 13:48:35 +0000 (15:48 +0200)]
Fix okeanos page.
projects / astakos / log