Kostas Papadimitriou [Thu, 14 Feb 2013 17:11:08 +0000 (17:11 +0000)]
Merge branch 'release-0.13' into debian-develop
Conflicts:
version
Kostas Papadimitriou [Thu, 14 Feb 2013 17:10:17 +0000 (17:10 +0000)]
Update version
Kostas Papadimitriou [Thu, 14 Feb 2013 17:09:52 +0000 (17:09 +0000)]
Update version
Kostas Papadimitriou [Thu, 14 Feb 2013 17:09:14 +0000 (17:09 +0000)]
Update version
Kostas Papadimitriou [Thu, 14 Feb 2013 17:08:27 +0000 (17:08 +0000)]
Fix version file
Kostas Papadimitriou [Thu, 14 Feb 2013 17:08:02 +0000 (17:08 +0000)]
Merge branch 'release-0.13' into debian-develop
Conflicts:
version
Kostas Papadimitriou [Thu, 14 Feb 2013 15:39:07 +0000 (15:39 +0000)]
Merge branch 'develop' into release-0.13
Kostas Papadimitriou [Thu, 14 Feb 2013 15:38:43 +0000 (15:38 +0000)]
Merge branch 'develop' into debian-develop
Kostas Papadimitriou [Thu, 14 Feb 2013 15:37:23 +0000 (15:37 +0000)]
Bump version
Kostas Papadimitriou [Wed, 13 Feb 2013 17:11:59 +0000 (19:11 +0200)]
Tests fix
Kostas Papadimitriou [Tue, 12 Feb 2013 15:19:33 +0000 (17:19 +0200)]
Merge branch 'develop'
Conflicts:
version
Kostas Papadimitriou [Fri, 8 Feb 2013 12:19:09 +0000 (14:19 +0200)]
Update include-binaries
Kostas Papadimitriou [Fri, 8 Feb 2013 12:14:44 +0000 (14:14 +0200)]
Merge branch 'debian-develop' into debian
Conflicts:
version
Kostas Papadimitriou [Fri, 8 Feb 2013 12:14:15 +0000 (14:14 +0200)]
Merge branch 'master' into debian
Kostas Papadimitriou [Fri, 8 Feb 2013 12:14:02 +0000 (14:14 +0200)]
Bump version
Kostas Papadimitriou [Fri, 8 Feb 2013 12:03:50 +0000 (14:03 +0200)]
Merge branch 'develop' into debian-develop
Kostas Papadimitriou [Fri, 8 Feb 2013 12:03:04 +0000 (14:03 +0200)]
Initializing devflow develop branch
Kostas Papadimitriou [Fri, 8 Feb 2013 12:02:45 +0000 (14:02 +0200)]
Merge branch 'master' into develop
Kostas Papadimitriou [Fri, 8 Feb 2013 12:02:03 +0000 (14:02 +0200)]
Devflow integration
Olga Brani [Thu, 10 Jan 2013 10:47:27 +0000 (12:47 +0200)]
Merge branch 'newstyles' of https://code.grnet.gr/git/snf-cloudcms into newstyles
Conflicts:
cloudcms/static/cloudcms/css/forms.css
cloudcms/static/cloudcms/css/modules.css
cloudcms/static/cloudcms/js/common.js
cloudcms/templates/cms/base.html
Olga Brani [Thu, 10 Jan 2013 10:27:24 +0000 (12:27 +0200)]
Static files sync with astakos
Olga Brani [Thu, 10 Jan 2013 10:18:22 +0000 (12:18 +0200)]
Style sync with astakos
Kostas Papadimitriou [Wed, 9 Jan 2013 13:16:41 +0000 (15:16 +0200)]
Styles sync
sync astakos style changes with cms
Kostas Papadimitriou [Thu, 8 Nov 2012 15:13:30 +0000 (17:13 +0200)]
Fix documentation typo
Kostas Papadimitriou [Thu, 25 Oct 2012 12:20:27 +0000 (15:20 +0300)]
Merge branch 'newstyles'
Conflicts:
cloudcms/templates/cms/base.html
Kostas Papadimitriou [Thu, 25 Oct 2012 12:19:13 +0000 (15:19 +0300)]
Merge branch 'newstyles' of https://code.grnet.gr/git/snf-cloudcms into newstyles
Olga Brani [Thu, 25 Oct 2012 12:16:20 +0000 (15:16 +0300)]
Style fixes
Kostas Papadimitriou [Thu, 25 Oct 2012 12:00:57 +0000 (15:00 +0300)]
Base template fix
Stratos Psomadakis [Tue, 16 Oct 2012 15:15:51 +0000 (18:15 +0300)]
Debian version bump
Stratos Psomadakis [Tue, 16 Oct 2012 15:14:51 +0000 (18:14 +0300)]
Fix permissions for conf files/dir
Olga Brani [Wed, 10 Oct 2012 13:06:43 +0000 (16:06 +0300)]
Update link for google fonts to https
Olga Brani [Fri, 7 Sep 2012 10:18:45 +0000 (13:18 +0300)]
Various style fixes
Olga Brani [Fri, 7 Sep 2012 10:17:13 +0000 (13:17 +0300)]
New font (Open Sans)
Olga Brani [Fri, 7 Sep 2012 10:16:22 +0000 (13:16 +0300)]
W3c validation correction ( br inside ul)
Kostas Papadimitriou [Mon, 6 Aug 2012 13:44:03 +0000 (16:44 +0300)]
New debian release for v0.7.3
Kostas Papadimitriou [Mon, 6 Aug 2012 13:43:48 +0000 (16:43 +0300)]
Merge branch 'master' into debian
Kostas Papadimitriou [Mon, 6 Aug 2012 13:42:33 +0000 (16:42 +0300)]
Proper user action messages display
migrate html code for user action messages display
Kostas Papadimitriou [Mon, 6 Aug 2012 13:04:51 +0000 (16:04 +0300)]
New debian release for v0.7.2
Kostas Papadimitriou [Mon, 6 Aug 2012 13:01:54 +0000 (16:01 +0300)]
Merge branch 'master' into debian
Kostas Papadimitriou [Mon, 6 Aug 2012 12:51:06 +0000 (15:51 +0300)]
Update google webfonts to use https protocol
Kostas Papadimitriou [Thu, 2 Aug 2012 17:56:31 +0000 (20:56 +0300)]
Merge branch 'debian' of https://code.grnet.gr/git/snf-cloudcms into debian
Conflicts:
debian/changelog
Kostas Papadimitriou [Thu, 2 Aug 2012 17:55:35 +0000 (20:55 +0300)]
New debian release for v0.7.1
Kostas Papadimitriou [Thu, 2 Aug 2012 17:55:19 +0000 (20:55 +0300)]
Merge branch 'master' into debian
Kostas Papadimitriou [Thu, 2 Aug 2012 17:19:23 +0000 (20:19 +0300)]
Merge branch 'master' into debian
Kostas Papadimitriou [Thu, 2 Aug 2012 16:58:58 +0000 (19:58 +0300)]
New debian release for v0.7.2
Kostas Papadimitriou [Thu, 2 Aug 2012 16:56:52 +0000 (19:56 +0300)]
Update Changelog for v0.7.2
Kostas Papadimitriou [Thu, 2 Aug 2012 16:40:53 +0000 (19:40 +0300)]
Merge branch 'master' into debian
Olga Brani [Thu, 2 Aug 2012 13:17:09 +0000 (16:17 +0300)]
Merge remote-tracking branch 'origin/master' into newstyles
Olga Brani [Thu, 2 Aug 2012 13:16:11 +0000 (16:16 +0300)]
Update theme
- Font change
- New colors
Kostas Papadimitriou [Wed, 1 Aug 2012 09:19:05 +0000 (12:19 +0300)]
New debian release for v0.7.0
Kostas Papadimitriou [Tue, 31 Jul 2012 18:51:40 +0000 (21:51 +0300)]
New debian release for v0.11.0
Kostas Papadimitriou [Tue, 31 Jul 2012 18:51:06 +0000 (21:51 +0300)]
Merge branch 'master' into debian
Kostas Papadimitriou [Tue, 31 Jul 2012 18:50:12 +0000 (21:50 +0300)]
Update documentation and Changelog
Kostas Papadimitriou [Tue, 31 Jul 2012 18:49:35 +0000 (21:49 +0300)]
Variable name typo
Kostas Papadimitriou [Tue, 31 Jul 2012 18:49:11 +0000 (21:49 +0300)]
Rename admin url
Kostas Papadimitriou [Tue, 31 Jul 2012 16:17:22 +0000 (19:17 +0300)]
Update include-binaries
include new image
Kostas Papadimitriou [Tue, 31 Jul 2012 16:13:29 +0000 (19:13 +0300)]
Merge branch 'master' into debian
Olga Brani [Tue, 31 Jul 2012 13:57:21 +0000 (16:57 +0300)]
Merge remote-tracking branch 'origin/master' into newstyles
Olga Brani [Tue, 31 Jul 2012 13:54:37 +0000 (16:54 +0300)]
Styles and html updates
Kostas Papadimitriou [Tue, 31 Jul 2012 13:28:47 +0000 (16:28 +0300)]
Improved sphinx import db errors handling
- Catch rollback excpetion
- Force slug length to db length
Kostas Papadimitriou [Tue, 31 Jul 2012 13:28:14 +0000 (16:28 +0300)]
Changed FAQ entry title length
to support longer titles in faq entries
Kostas Papadimitriou [Tue, 31 Jul 2012 11:43:27 +0000 (14:43 +0300)]
Python 2.6 compatibility
use django SortedDict instead of collections.OrderedDict
Kostas Papadimitriou [Tue, 31 Jul 2012 11:12:05 +0000 (14:12 +0300)]
Faq/Blog categories admin improvements
display related objects count instead of object list
Kostas Papadimitriou [Mon, 30 Jul 2012 18:37:36 +0000 (21:37 +0300)]
Merge branch 'master' into debian
Kostas Papadimitriou [Mon, 30 Jul 2012 18:34:42 +0000 (21:34 +0300)]
Proper handling of lxml strings
convert lxml.etree._ElementStringResult to unicode strings to avoid
psycopg2 driver from raising "can't adapt" errors.
Kostas Papadimitriou [Mon, 30 Jul 2012 14:23:57 +0000 (17:23 +0300)]
Update pydist-overrides mappings
Kostas Papadimitriou [Mon, 30 Jul 2012 13:11:19 +0000 (16:11 +0300)]
Merge branch 'master' into debian
Kostas Papadimitriou [Mon, 30 Jul 2012 13:04:03 +0000 (16:04 +0300)]
Update MANIFEST.in
Include faq/guide/resources extra dirs
Kostas Papadimitriou [Mon, 30 Jul 2012 12:57:07 +0000 (15:57 +0300)]
Update setup.py required packages
Kostas Papadimitriou [Mon, 30 Jul 2012 12:49:56 +0000 (15:49 +0300)]
Fix south migration orders
proper dependecies for migrations scrips to prevent south migrations
from failing
Olga Brani [Tue, 17 Jul 2012 15:54:29 +0000 (18:54 +0300)]
Userguide changes
Kostas Papadimitriou [Tue, 17 Jul 2012 11:22:33 +0000 (14:22 +0300)]
Missing imports
Kostas Papadimitriou [Mon, 16 Jul 2012 15:26:48 +0000 (18:26 +0300)]
Use get_object_or_404 in slug views
to moderate 500 responses when no object available for the requested
slug.
Kostas Papadimitriou [Mon, 16 Jul 2012 15:21:27 +0000 (18:21 +0300)]
Updated sphinx import tests
Kostas Papadimitriou [Mon, 16 Jul 2012 15:21:10 +0000 (18:21 +0300)]
Fix ordering of UserGuideEntry model
Kostas Papadimitriou [Mon, 16 Jul 2012 15:20:29 +0000 (18:20 +0300)]
Improved sphinx import admin page
- Display log
- Improved vew exception handling
Kostas Papadimitriou [Mon, 16 Jul 2012 15:18:55 +0000 (18:18 +0300)]
Sphinx docs import form improvements
- Custom stream logging handler to capture logging output of the
convertion process.
- Fix media object creation/update (proper categories handling)
Olga Brani [Mon, 16 Jul 2012 14:09:55 +0000 (17:09 +0300)]
Userguide styles
Kostas Papadimitriou [Mon, 16 Jul 2012 11:42:10 +0000 (14:42 +0300)]
Update cloudcmsguide migrations
Kostas Papadimitriou [Thu, 12 Jul 2012 15:08:05 +0000 (18:08 +0300)]
Wiser logging settings
Kostas Papadimitriou [Thu, 12 Jul 2012 14:51:10 +0000 (17:51 +0300)]
Fix migration
Kostas Papadimitriou [Thu, 12 Jul 2012 14:49:10 +0000 (17:49 +0300)]
Merge branch 'newstyles' into userguide
Kostas Papadimitriou [Thu, 12 Jul 2012 14:48:30 +0000 (17:48 +0300)]
Cloudcms tests for rst import form/view
Kostas Papadimitriou [Thu, 12 Jul 2012 14:48:14 +0000 (17:48 +0300)]
Remove print statement
Kostas Papadimitriou [Thu, 12 Jul 2012 14:46:03 +0000 (17:46 +0300)]
Automatic import of rst documentation
Form class and admin view to automatically parse zip file with specific
rst content and generate faq/userguide entries.
Kostas Papadimitriou [Thu, 12 Jul 2012 14:45:10 +0000 (17:45 +0300)]
Initial integration of userguide application in cms
Kostas Papadimitriou [Thu, 12 Jul 2012 14:41:06 +0000 (17:41 +0300)]
Initial commit of userguide app
Olga Brani [Thu, 12 Jul 2012 13:34:08 +0000 (16:34 +0300)]
New Styles & Functionality for Faq/Userguide
Kostas Papadimitriou [Tue, 10 Jul 2012 11:16:00 +0000 (14:16 +0300)]
Keep url entry points compatible with 0.9 snf-common
snf-common ordering of url entry points not yet released
Kostas Papadimitriou [Tue, 10 Jul 2012 11:05:17 +0000 (14:05 +0300)]
Update Changelog
Kostas Papadimitriou [Tue, 10 Jul 2012 11:04:12 +0000 (14:04 +0300)]
Late append of cms urls
since cms includes generic url pattern for /*, to avoid conflict with
other apps urls.
Kostas Papadimitriou [Tue, 10 Jul 2012 11:03:47 +0000 (14:03 +0300)]
Include auth context processor for snf-webproject
Kostas Papadimitriou [Tue, 15 May 2012 16:14:37 +0000 (19:14 +0300)]
Update required packages
add lxml package
Kostas Papadimitriou [Tue, 15 May 2012 16:11:43 +0000 (19:11 +0300)]
Set default client version
Kostas Papadimitriou [Tue, 10 Jul 2012 07:47:34 +0000 (10:47 +0300)]
Cloudcmsfaq services as primary category
Use cloudcmsfaq service model as the primary category of a question
Kostas Papadimitriou [Tue, 10 Jul 2012 07:46:59 +0000 (10:46 +0300)]
Fix circular import
Kostas Papadimitriou [Tue, 10 Jul 2012 07:46:24 +0000 (10:46 +0300)]
Cloudcms Service model
Kostas Papadimitriou [Tue, 10 Jul 2012 07:28:36 +0000 (10:28 +0300)]
Fix migrations file
Olga Brani [Tue, 26 Jun 2012 13:27:17 +0000 (16:27 +0300)]
Orientation fix for iPhone/iPad
Olga Brani [Tue, 26 Jun 2012 13:26:46 +0000 (16:26 +0300)]
Fixes
projects / snf-cloudcms / log