loleaflet/Makefile | 2 +- loleaflet/dist/toolbar/toolbar.js | 2 +- loolwsd/configure.ac | 2 +- loolwsd/loolwsd.spec.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 1866dc8eb02643057e12e252d1ee2be3c897ac21 Author: Andras Timar <[email protected]> Date: Mon Apr 25 10:39:14 2016 +0200 put %{dist} after release number diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in index abbd07b..1b34538 100644 --- a/loolwsd/loolwsd.spec.in +++ b/loolwsd/loolwsd.spec.in @@ -8,7 +8,7 @@ Name: loolwsd Version: @PACKAGE_VERSION@ -Release: 0 +Release: 1%{?dist} Vendor: Collabora Summary: LibreOffice On-Line WebSocket Daemon License: MPL commit 86a2241a7264943c43298dc50a857f935d5ea59d Author: Andras Timar <[email protected]> Date: Mon Apr 25 10:38:15 2016 +0200 Bump version to 1.6.2 diff --git a/loleaflet/Makefile b/loleaflet/Makefile index d9c3c64..f6a9f07 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile @@ -3,7 +3,7 @@ # ("micro") part: Between releases odd, even for releases (no other # changes inbetween). -VERSION=1.6.0 +VERSION=1.6.2 # Version number of the bundled 'draw' thing DRAW_VERSION=0.2.4 diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index 0083081..3a28a22 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.6.0], [[email protected]]) +AC_INIT([loolwsd], [1.6.2], [[email protected]]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects]) commit d4139add2a616c82d9091e2b0ac5207b4a8acd0a Author: Pranav Kant <[email protected]> Date: Mon Apr 25 12:56:38 2016 +0530 bccu#1693: Empty item is not an object Treating empty item as an object expects `id` attribute on which toString method would be invoked. In case of object without `id`, it would throw an error trying to call toString on undefined attribute. Change-Id: I44e591044487b0d236760cc79438ccfcf0f53846 diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 3e3e0e7..20d35a9 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -705,7 +705,7 @@ map.on('search', function (e) { map.on('updatetoolbarcommandvalues', function (e) { // we need an empty option for the place holder to work - var data = [{text: ''}]; + var data = ['']; var styles = []; var topStyles = []; if (e.commandName === '.uno:StyleApply') { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
