8 commits - bin/rebuild.sh.in configure.ac Makefile.am pykolab.spec.in share/templates
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Mon Jul 30 20:36:56 CEST 2012
Makefile.am | 5 ++---
bin/rebuild.sh.in | 2 --
configure.ac | 2 +-
pykolab.spec.in | 1 -
share/templates/roundcubemail/main.inc.php.tpl | 10 ++++------
5 files changed, 7 insertions(+), 13 deletions(-)
New commits:
commit 4ff69e9753435b90e8b9eb538dd6fdabcd7282f8
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 19:36:26 2012 +0100
Add autocomplete_single = true for roundcube configuration
Add default setting for vlv_search
diff --git a/share/templates/roundcubemail/main.inc.php.tpl b/share/templates/roundcubemail/main.inc.php.tpl
index a3762d4..e0497cb 100644
--- a/share/templates/roundcubemail/main.inc.php.tpl
+++ b/share/templates/roundcubemail/main.inc.php.tpl
@@ -225,6 +225,7 @@
'scope' => 'sub',
'filter' => '(objectClass=inetOrgPerson)',
'vlv' => false,
+ 'vlv_search' => false,
'fuzzy_search' => true,
'sizelimit' => '0',
'timelimit' => '0',
@@ -259,6 +260,8 @@
'kolab_addressbook'
);
+ \$rcmail_config['autocomplete_single'] = true;
+
\$rcmail_config['htmleditor'] = 0;
include_once("/etc/roundcubemail/kolab_auth.inc.php");
commit 0af5021ad9af906ff0ac79162f8034a2180bf33b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 18:13:20 2012 +0100
Bump pre-release
diff --git a/configure.ac b/configure.ac
index 2ec201d..44691e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([pykolab], 0.5)
-AC_SUBST([RELEASE], 0.18)
+AC_SUBST([RELEASE], 0.19)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
commit 57dce51c66cfc7425041a3b841067cdc06540e6c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 18:12:49 2012 +0100
Update roundcube's main.inc.php to include the activesync plugin instead of the zpush plugin
diff --git a/share/templates/roundcubemail/main.inc.php.tpl b/share/templates/roundcubemail/main.inc.php.tpl
index 0d790b1..a3762d4 100644
--- a/share/templates/roundcubemail/main.inc.php.tpl
+++ b/share/templates/roundcubemail/main.inc.php.tpl
@@ -93,22 +93,17 @@
'compose_addressbook',
'http_authentication',
'jqueryui',
+ 'kolab_activesync',
'kolab_addressbook',
'kolab_auth',
'kolab_core',
'kolab_config',
'kolab_folders',
- 'kolab_zpush',
'listcommands',
'managesieve',
'newmail_notifier',
'odfviewer',
-// 'owncloud',
'password',
-
- // Depends on sieverules
- // 'quickrules',
-
'redundant_attachments',
'tasklist',
'threading_as_default',
commit ad1f621259f21382478037108edfd6b987729f24
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 13:02:00 2012 +0100
Update rebuild.sh
diff --git a/bin/rebuild.sh.in b/bin/rebuild.sh.in
index 1e35ce0..4e2510d 100644
--- a/bin/rebuild.sh.in
+++ b/bin/rebuild.sh.in
@@ -15,8 +15,6 @@ declare -a tasks
dists[${#dists[@]}]='f16'; dist_tags[${#dist_tags[@]}]='fc16'; product_series[${#product_series[@]}]="3.0"
dists[${#dists[@]}]='f17'; dist_tags[${#dist_tags[@]}]='fc17'; product_series[${#product_series[@]}]="3.0"
-dists[${#dists[@]}]='el5'; dist_tags[${#dist_tags[@]}]='el5'; product_series[${#product_series[@]}]="2.4"
-dists[${#dists[@]}]='el6'; dist_tags[${#dist_tags[@]}]='el6'; product_series[${#product_series[@]}]="2.4"
dists[${#dists[@]}]='el6'; dist_tags[${#dist_tags[@]}]='el6'; product_series[${#product_series[@]}]="3.0"
autoreconf -v && ./configure && make dist || exit 1
commit d4d2317478d063688f35eb648e6f453bee5a7c92
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 13:01:41 2012 +0100
Bump pre-release
diff --git a/configure.ac b/configure.ac
index fbd4130..2ec201d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([pykolab], 0.5)
-AC_SUBST([RELEASE], 0.17)
+AC_SUBST([RELEASE], 0.18)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
commit de83ec69d5592db428090bfff90052d546115d1e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 13:01:19 2012 +0100
Do not exclude %{_sbindir}/kolab-test
diff --git a/pykolab.spec.in b/pykolab.spec.in
index cdec4dd..1ae1643 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -317,7 +317,6 @@ rm -rf %{buildroot}
%files -n kolab-cli
%defattr(-,root,root,-)
-%exclude %{_bindir}/kolab-test
%{_sbindir}/kolab
%{_sbindir}/kolab-conf
%{_sbindir}/setup-kolab
commit 29973329fbb90300770289dd59f1faa0e170ac6b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 12:27:29 2012 +0100
Correct Makefile.am (tests/* not shipped, kolabtest.py in install)
diff --git a/Makefile.am b/Makefile.am
index 18666ed..9f0b02f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,8 @@ EXTRA_DIST = \
pykolab.spec.in \
pylint.log \
$(wildcard tests/*.py) \
+ $(wildcard tests/*/*.py) \
+ $(wildcard tests/*/*/*.py) \
$(PYTHON_FILES)
SUBDIRS = \
@@ -55,7 +57,6 @@ pylint:
conf.py \
kolabd.py \
kolab.py \
- kolabtest.py \
saslauthd.py \
setup-kolab.py \
wallace.py \
@@ -197,7 +198,6 @@ endif
$(INSTALL) -p -m 755 kolabd.py $(DESTDIR)/$(sbindir)/kolabd
$(INSTALL) -p -m 755 saslauthd.py $(DESTDIR)/$(sbindir)/kolab-saslauthd
$(INSTALL) -p -m 755 wallace.py $(DESTDIR)/$(sbindir)/wallaced
- $(INSTALL) -p -m 755 kolabtest.py $(DESTDIR)/$(bindir)/kolab-test
$(INSTALL) -p -m 755 setup-kolab.py $(DESTDIR)/$(sbindir)/setup-kolab
$(INSTALL) -p -m 644 cyruslib.py $(DESTDIR)/$(pythondir)
$(INSTALL) -p -m 755 bin/kolab_parse_telemetry.py $(DESTDIR)/$(sbindir)/kolab_parse_telemetry
commit f46ca1d9d87993ba55d097ff7a919e6c685b9ec2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Mon Jul 30 12:12:33 2012 +0100
Remove kolabtest.py from automake
diff --git a/Makefile.am b/Makefile.am
index aae48d6..18666ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,6 @@ PYTHON_FILES = \
conf.py \
kolab.py \
kolabd.py \
- kolabtest.py \
saslauthd.py \
setup-kolab.py \
wallace.py
More information about the commits
mailing list