From e338739d83149006dffa270703b5f5b9016b4448 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 6 Feb 2018 15:22:19 +0100 Subject: Fix compile for libcrashreporter-qt on macOS --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index d25acc3cc..3b2444afb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = git://github.com/owncloud/owncloud-client-binary.git [submodule "src/3rdparty/libcrashreporter-qt"] path = src/3rdparty/libcrashreporter-qt - url = git://github.com/dschmidt/libcrashreporter-qt.git + url = git@github.com:guruz/libcrashreporter-qt.git -- cgit v1.2.3 From 3aeeb1113597e381bc4c1f570f2a8c8e1edccee9 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 6 Feb 2018 15:51:11 +0100 Subject: Fix submodule URL --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 3b2444afb..3ea087ed7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = git://github.com/owncloud/owncloud-client-binary.git [submodule "src/3rdparty/libcrashreporter-qt"] path = src/3rdparty/libcrashreporter-qt - url = git@github.com:guruz/libcrashreporter-qt.git + url = git://github.com/guruz/libcrashreporter-qt.git -- cgit v1.2.3 From e5dd54d4f4a54a8a987525ba68b93b2476ffa13c Mon Sep 17 00:00:00 2001 From: Matthew Setter Date: Wed, 2 May 2018 12:04:14 +0200 Subject: Add the docs-themes repository as a submodule This provides a simpler way of integrating the external theme. Relates to: - owncloud/client#6163 - owncloud/client#6169 - #3240 - owncloud/client#6497 --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 3ea087ed7..54e830dbc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "src/3rdparty/libcrashreporter-qt"] path = src/3rdparty/libcrashreporter-qt url = git://github.com/guruz/libcrashreporter-qt.git +[submodule "doc/_shared_assets"] + path = doc/_shared_assets + url = git@github.com:owncloud/docs-themes.git -- cgit v1.2.3 From 5e13d519d9d597d0b14f198acc18ca0ea7de8015 Mon Sep 17 00:00:00 2001 From: Samuel Alfageme Date: Wed, 2 May 2018 16:56:44 +0200 Subject: Use HTTPS rather than SSH schema for the _shared_assets submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 54e830dbc..b233d3d56 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ url = git://github.com/guruz/libcrashreporter-qt.git [submodule "doc/_shared_assets"] path = doc/_shared_assets - url = git@github.com:owncloud/docs-themes.git + url = git://github.com/owncloud/docs-themes.git -- cgit v1.2.3 From 0ce287d96dff585b61da491b347e11694fbc64ad Mon Sep 17 00:00:00 2001 From: Matthew Setter Date: Wed, 2 May 2018 12:06:32 +0200 Subject: Use external theme in documentation --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index b233d3d56..3c7bbde42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,6 @@ [submodule "src/3rdparty/libcrashreporter-qt"] path = src/3rdparty/libcrashreporter-qt url = git://github.com/guruz/libcrashreporter-qt.git -[submodule "doc/_shared_assets"] - path = doc/_shared_assets - url = git://github.com/owncloud/docs-themes.git +[submodule "doc/docs-themes"] + path = doc/docs-themes + url = https://github.com/owncloud/docs-themes.git -- cgit v1.2.3 From 13d05952967f3d6fc741b4c7c5e9806fd321e470 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 23 May 2018 14:30:01 +0200 Subject: Update libcrashreporter-qt to build it with msvc (cherry picked from commit b9323bd1913a91471b13bb17069d43dd0acea27b) --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 3c7bbde42..b273a04bd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = git://github.com/owncloud/owncloud-client-binary.git [submodule "src/3rdparty/libcrashreporter-qt"] path = src/3rdparty/libcrashreporter-qt - url = git://github.com/guruz/libcrashreporter-qt.git + url = git://github.com/dschmidt/libcrashreporter-qt.git [submodule "doc/docs-themes"] path = doc/docs-themes url = https://github.com/owncloud/docs-themes.git -- cgit v1.2.3