Kostas Papadimitriou [Fri, 24 Feb 2012 15:49:15 +0000 (17:49 +0200)]
Move debian dir
Kostas Papadimitriou [Fri, 24 Feb 2012 15:48:41 +0000 (17:48 +0200)]
Remove conf dir from repository root
Kostas Papadimitriou [Fri, 24 Feb 2012 15:47:17 +0000 (17:47 +0200)]
Merge branch 'master' into debian
Kostas Papadimitriou [Fri, 24 Feb 2012 15:47:00 +0000 (17:47 +0200)]
Update snf-common version requirement
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 18:01:21 +0000 (20:01 +0200)]
Updated gbp.conf
Kostas Papadimitriou [Tue, 21 Feb 2012 17:44:58 +0000 (19:44 +0200)]
Change upstream branch to master
Kostas Papadimitriou [Tue, 21 Feb 2012 17:43:25 +0000 (19:43 +0200)]
Merge branch 'packaging'
Kostas Papadimitriou [Tue, 21 Feb 2012 17:42:33 +0000 (19:42 +0200)]
Copy default settings in /etc/synnefo
Kostas Papadimitriou [Tue, 21 Feb 2012 17:08:47 +0000 (19:08 +0200)]
Initial debian packaging files
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.
root [Tue, 14 Feb 2012 13:18:16 +0000 (15:18 +0200)]
Add file logger.
Antony Chazapis [Tue, 14 Feb 2012 11:50:16 +0000 (13:50 +0200)]
Drop redundant horizontal menu from pages.
Antony Chazapis [Tue, 14 Feb 2012 11:16:55 +0000 (13:16 +0200)]
Merge branch 'cloudbar'
Antony Chazapis [Tue, 14 Feb 2012 11:12:18 +0000 (13:12 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Kostas Papadimitriou [Mon, 13 Feb 2012 14:49:59 +0000 (16:49 +0200)]
Configurable cloudbar settings in base.html
Kostas Papadimitriou [Mon, 13 Feb 2012 14:49:29 +0000 (16:49 +0200)]
Initial commit of cloudbar static files
root [Fri, 10 Feb 2012 11:35:11 +0000 (13:35 +0200)]
Fix docs.
Antony Chazapis [Fri, 10 Feb 2012 10:59:54 +0000 (12:59 +0200)]
Merge branch 'moderation'
Sofia Papagiannaki [Thu, 9 Feb 2012 14:09:47 +0000 (16:09 +0200)]
enable moderation in SimpleBackend
Refs: #1990
Sofia Papagiannaki [Thu, 9 Feb 2012 13:23:23 +0000 (15:23 +0200)]
commit documentation images
Refs: #1928
Sofia Papagiannaki [Thu, 9 Feb 2012 12:04:02 +0000 (14:04 +0200)]
employ new logging mechanism
Sofia Papagiannaki [Thu, 9 Feb 2012 10:10:54 +0000 (12:10 +0200)]
fix logging
Sofia Papagiannaki [Thu, 9 Feb 2012 10:10:10 +0000 (12:10 +0200)]
more documentation
Refs: #1928
Sofia Papagiannaki [Thu, 9 Feb 2012 09:49:05 +0000 (11:49 +0200)]
add support for renew in redirect target
Sofia Papagiannaki [Thu, 9 Feb 2012 09:47:52 +0000 (11:47 +0200)]
propagate next parameter in case of invalid login form
Antony Chazapis [Wed, 8 Feb 2012 14:55:26 +0000 (16:55 +0200)]
Change logging mechanism.
Refs #2016
Kostas Papadimitriou [Tue, 7 Feb 2012 15:38:41 +0000 (17:38 +0200)]
Proper cloudbar configuration
Kostas Papadimitriou [Tue, 7 Feb 2012 15:36:27 +0000 (17:36 +0200)]
Remove duplicate jquery import in base.html
root [Tue, 7 Feb 2012 14:54:07 +0000 (16:54 +0200)]
Add top bar to template.
Antony Chazapis [Mon, 6 Feb 2012 18:03:44 +0000 (20:03 +0200)]
Remove parentheses.
Antony Chazapis [Mon, 6 Feb 2012 18:01:45 +0000 (20:01 +0200)]
Remove reference to TEST variable.
Sofia Papagiannaki [Mon, 6 Feb 2012 16:13:50 +0000 (18:13 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Mon, 6 Feb 2012 16:13:40 +0000 (18:13 +0200)]
change word `consumed` in `used`
root [Mon, 6 Feb 2012 15:19:59 +0000 (17:19 +0200)]
Resolve.
Sofia Papagiannaki [Mon, 6 Feb 2012 15:12:56 +0000 (17:12 +0200)]
fix LOGIN_URL setting
Refs: #1997
Sofia Papagiannaki [Mon, 6 Feb 2012 14:23:13 +0000 (16:23 +0200)]
Hide service description.
Sofia Papagiannaki [Mon, 6 Feb 2012 14:19:19 +0000 (16:19 +0200)]
change IM_MEDIA_URL to IM_STATIC_URL
Refs: #1993
Sofia Papagiannaki [Mon, 6 Feb 2012 14:11:46 +0000 (16:11 +0200)]
change settings namespace
Refs: #1997
Sofia Papagiannaki [Mon, 6 Feb 2012 11:36:32 +0000 (13:36 +0200)]
fix tab activation
Sofia Papagiannaki [Mon, 6 Feb 2012 11:17:56 +0000 (13:17 +0200)]
restructure templates
Refs: #1993
Sofia Papagiannaki [Mon, 6 Feb 2012 10:39:39 +0000 (12:39 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Mon, 6 Feb 2012 10:39:20 +0000 (12:39 +0200)]
change api faults
Refs: #1958
Antony Chazapis [Mon, 6 Feb 2012 09:46:27 +0000 (11:46 +0200)]
Merge branch 'grnetstyles'
projects / astakos / log