[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - loleaflet/src

2020-09-02 Thread Gary Kim (via logerrit) 
 loleaflet/src/core/Socket.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22b8be43c0be4011af59d36a7b335578f30860e4
Author: Gary Kim 
AuthorDate: Mon May 18 23:14:07 2020 +0800
Commit: Andras Timar 
CommitDate: Wed Sep 2 08:08:40 2020 +0200

fix: remove target="_blank" on javascript open links

Using target="_blank" on these links cause them
to not work in browsers.

This commit removes the attribute to fix the issue.

Change-Id: I157f15589b17722aa5c0ef5eada02084fe5b2a5e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94435
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101888
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9f48d3145..80decbee2 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -283,7 +283,7 @@ L.Socket = L.Class.extend({
this.WSDServer = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = this.WSDServer.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';

$('#loolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
}
else {
@@ -306,7 +306,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - .gitreview

2020-09-01 Thread Gary Kim (via logerrit) 
 .gitreview |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b4698ad57a52e4bcf782bc75fcbe348483f86497
Author: Gary Kim 
AuthorDate: Tue Sep 1 13:48:29 2020 -0400
Commit: Michael Meeks 
CommitDate: Tue Sep 1 20:46:00 2020 +0200

Fix incorrect spelling of branch in .gitreview

Change-Id: Ic6d48e484ddd81fe6dfb9916fcd6144d954f7be5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101889
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/.gitreview b/.gitreview
index 0f0114e0e..f7d0683a6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
 port=29418
 project=online
 defaultremote=logerrit
-defaultbranch=libreofiice-7-0
+defaultbranch=libreoffice-7-0
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

2020-07-23 Thread Gary Kim (via logerrit) 
 loleaflet/src/core/Socket.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 018264f03f0b7d0b456c6153da8593d9f8f22ba0
Author: Gary Kim 
AuthorDate: Mon May 18 23:14:07 2020 +0800
Commit: Jan Holesovsky 
CommitDate: Thu Jul 23 19:38:52 2020 +0200

fix: remove target="_blank" on javascript open links

Using target="_blank" on these links cause them
to not work in browsers.

This commit removes the attribute to fix the issue.

Change-Id: I157f15589b17722aa5c0ef5eada02084fe5b2a5e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94435
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
(cherry picked from commit 6d7128e79301c73557f65968b2f46740977e6364)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99301
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9f48d3145..80decbee2 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -283,7 +283,7 @@ L.Socket = L.Class.extend({
this.WSDServer = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = this.WSDServer.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';

$('#loolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
}
else {
@@ -306,7 +306,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2020-06-22 Thread Gary Kim (via logerrit) 
 loleaflet/src/core/Socket.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d7128e79301c73557f65968b2f46740977e6364
Author: Gary Kim 
AuthorDate: Mon May 18 23:14:07 2020 +0800
Commit: Jan Holesovsky 
CommitDate: Mon Jun 22 18:22:03 2020 +0200

fix: remove target="_blank" on javascript open links

Using target="_blank" on these links cause them
to not work in browsers.

This commit removes the attribute to fix the issue.

Change-Id: I157f15589b17722aa5c0ef5eada02084fe5b2a5e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94435
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9f48d3145..80decbee2 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -283,7 +283,7 @@ L.Socket = L.Class.extend({
this.WSDServer = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = this.WSDServer.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';

$('#loolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
}
else {
@@ -306,7 +306,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

2020-03-23 Thread Gary Kim (via logerrit) 
 docker/l10n-docker-nightly.sh |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 60b116f91ee3c6540d4fbaeaa6f8f7463e702f9c
Author: Gary Kim 
AuthorDate: Mon Mar 23 03:28:07 2020 +0800
Commit: Michael Meeks 
CommitDate: Mon Mar 23 13:34:42 2020 +0100

Fix docker script pushing to Docker Hub even when set not to

Change-Id: I7506c65b5412f3fd7faadcc387a54b8dfe472650
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90890
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 96d5a9be8..7dbcb1f25 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -107,7 +107,6 @@ cp -a libreoffice/instdir "$INSTDIR"/opt/libreoffice
 if [ -z "$NO_DOCKER_IMAGE" ]; then
   cd "$SRCDIR"
   docker build --no-cache -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG . || exit 1
-  docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
   if [ -z "$NO_DOCKER_PUSH" ]; then
 docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
   fi;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/Dockerfile

2019-11-28 Thread Gary Kim (via logerrit) 
 docker/Dockerfile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 997113697ec9e985b8227070b2255df304d3c959
Author: Gary Kim 
AuthorDate: Thu Nov 28 01:38:23 2019 +0800
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 28 14:05:34 2019 +0100

docker: add missing dependencies

The docker container is missing some dependencies
so cannot start properly.

Change-Id: Icfa7b318370d331ecf2935f166b3cfb3b57379c8
Reviewed-on: https://gerrit.libreoffice.org/83939
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1b9e8a3b6..b9f7a2ed6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get upgrade -y
 # install LibreOffice run-time dependencies
 # install adduser, findutils, openssl and cpio that we need later
 # install an editor
-RUN apt-get -y install locales-all libpng16-16 fontconfig adduser cpio 
findutils nano libpocoxml50 libpocoutil50 libpoconetssl50 libpoconet50 
libpocojson50 libpocofoundation50 libpococrypto50 libcap2-bin openssl 
inotify-tools procps
+RUN apt-get -y install locales-all libpng16-16 fontconfig adduser cpio 
findutils nano libpocoxml50 libpocoutil50 libpoconetssl50 libpoconet50 
libpocojson50 libpocofoundation50 libpococrypto50 libcap2-bin openssl 
inotify-tools procps libxcb-shm0 libxcb-render0 libxrender1 libxext6
 
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
 RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits