3 commits - pykolab/setup share/templates

[Jeroen van Meeuwen]

 pykolab/setup/setup_syncroton.py                      |    4 ++--
 share/templates/roundcubemail/config.inc.php.tpl      |    1 +
 share/templates/roundcubemail/kolab_files.inc.php.tpl |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 172545ebeba5c73cbb502fcae859b27df7aafed2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Aug 20 12:20:05 2014 +0200

    Set the URL to files to '/chwala/' (#2436)

diff --git a/share/templates/roundcubemail/kolab_files.inc.php.tpl b/share/templates/roundcubemail/kolab_files.inc.php.tpl
index 1c5fced..bcdaccc 100644
--- a/share/templates/roundcubemail/kolab_files.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_files.inc.php.tpl
@@ -1,7 +1,7 @@
 <?php
 
 // URL of kolab-chwala installation
-\$config['kolab_files_url'] = 'http://' . \$_SERVER['HTTP_HOST'] . '/chwala/';
+\$config['kolab_files_url'] = '/chwala/';
 
 // List of files list columns. Available are: name, size, mtime, type
 \$config['kolab_files_list_cols'] = array('name', 'mtime', 'size');


commit cd3c4acd667c7cfe4366e3a044fa2126d8d7c079
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Aug 20 12:19:40 2014 +0200

    Add kolab_tags plugin to the default configuration

diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index bf61c2f..eb3f7ec 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -57,6 +57,7 @@
             'kolab_files',
             'kolab_folders',
             'kolab_notes',
+            'kolab_tags',
             'libkolab',
             'libcalendaring',
             'managesieve',


commit 2a97627541df44ffdb4b381482fab9cad72d209b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 19 23:24:37 2014 +0200

    Fix syntax errors

diff --git a/pykolab/setup/setup_syncroton.py b/pykolab/setup/setup_syncroton.py
index e0477b1..ca99bd5 100644
--- a/pykolab/setup/setup_syncroton.py
+++ b/pykolab/setup/setup_syncroton.py
@@ -52,9 +52,9 @@ def execute(*args, **kw):
                                 schema_files.append(schema_filepath)
                                 break
 
-                if len(schema_files) > 0
+                if len(schema_files) > 0:
                     break
-        if len(schema_files) > 0
+        if len(schema_files) > 0:
             break
 
     if not os.path.isfile('/tmp/kolab-setup-my.cnf'):