[merlot] 2 new revisions pushed by esar...@gmail.com on 2012-03-19 00:29 GMT

[mer...@googlecode.com]

2 new revisions:

Revision: 99f3f6c1a2e0
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 13:25:45 2012
Log: Updated changelog.
http://code.google.com/p/merlot/source/detail?r=99f3f6c1a2e0

Revision: 2245938b06c8
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 17:29:36 2012
Log: Added buildout configuration for deployment.
http://code.google.com/p/merlot/source/detail?r=2245938b06c8

==============================================================================
Revision: 99f3f6c1a2e0
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 13:25:45 2012
Log: Updated changelog.
http://code.google.com/p/merlot/source/detail?r=99f3f6c1a2e0

Modified:
/docs-source/changelog.rst
/docs-source/conf.py

=======================================
--- /docs-source/changelog.rst Thu Mar 24 13:46:50 2011
+++ /docs-source/changelog.rst Sun Mar 18 13:25:45 2012
@@ -8,6 +8,19 @@
* Silvestre Huens (quimera)
* Juan A. Diaz (nueces)

+**0.2 - unreleased**
+
+* Upgraded Grok version to 1.4.1. [emanuel]
+* Added Japanese translation contributed by OCHIAI Gouji. [emanuel]
+* Styling tweaks for the JS date range widget. [emanuel]
+* Improved i18n support for the data of the `hours usage` and `due in`
columns
+ in the project view. [emanuel]
+* Make sure that i18n is picked in the templates for the Clients section.
+ [emanuel]
+* Tweaked quicklog style and update some wordings. [emanuel]
+* Fixed default values for some fields in the task and project models.
+ [emanuel]
+
**0.1 - 2011-03-24**

* Initial implementation: models for projects, tasks, logs, users and
clients
=======================================
--- /docs-source/conf.py Fri Mar 16 18:42:04 2012
+++ /docs-source/conf.py Sun Mar 18 13:25:45 2012
@@ -47,16 +47,16 @@

# General information about the project.
project = u'Merlot'
-copyright = u'2010, Menttes SRL'
+copyright = u'2010-2012, Menttes SRL'

# The version info for the project you're documenting, acts as replacement
for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '1.0dev'
+version = '0.2'
# The full version, including alpha/beta/rc tags.
-release = '1.0dev'
+release = '0.2dev'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

==============================================================================
Revision: 2245938b06c8
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 17:29:36 2012
Log: Added buildout configuration for deployment.
http://code.google.com/p/merlot/source/detail?r=2245938b06c8

Added:
/deploy.cfg
Modified:
/.hgignore

=======================================
--- /dev/null
+++ /deploy.cfg Sun Mar 18 17:29:36 2012
@@ -0,0 +1,50 @@
+[buildout]
+extends =
+ buildout.cfg
+ versions.cfg
+parts =
+ app
+ merlot_server
+ paster_deploy_ini
+ mkdirs
+ site_zcml
+ zope_conf_deploy
+ zpasswd
+ repozo
+ backup
+ backup-daily
+versions = versions
+
+[mkdirs]
+paths +=
+ ${buildout:directory}/backups
+
+[merlot_server]
+inline =
+ #!/bin/bash
+ export zope_i18n_compile_mo_files=True
+ paster serve ${paster_deploy_ini:output} --daemon
--pid-file=${buildout:directory}/var/merlot.pid
--log-file=${buildout:directory}/var/log/merlog.log
+
+# Backup parts
+[repozo]
+recipe = zc.recipe.egg
+eggs = ZODB3
+scripts = repozo
+
+[backup]
+recipe = collective.recipe.backup
+backup_blobs = true
+blob_storage = ${buildout:directory}/var/blobstorage
+location = ${buildout:directory}/backups/filestorage
+blobbackuplocation = ${buildout:directory}/backups/blobstorage
+snapshotlocation = ${buildout:directory}/backups/snapshot-filestorage
+blobsnapshotlocation = ${buildout:directory}/backups/snapshot-blobstorage
+
+[backup-daily]
+recipe = z3c.recipe.usercrontab
+times = 0 3 * * *
+command = ${buildout:directory}/bin/backup
+
+[versions]
+collective.recipe.backup = 2.4
+z3c.recipe.usercrontab = 1.1
=======================================
--- /.hgignore Wed Mar 23 23:56:38 2011
+++ /.hgignore Sun Mar 18 17:29:36 2012
@@ -1,9 +1,11 @@
develop-eggs/
include/
var/
+log/
parts/
.installed.cfg
lib/
+backups/
bin/
docs/
coverage/