From c195cd3498e17d28ca66a5c8b38fb509372e54b9 Mon Sep 17 00:00:00 2001 From: Jack Zhuang <50353452+hotlong@users.noreply.github.com> Date: Mon, 1 Feb 2021 18:05:58 +0800 Subject: [PATCH] update submodules --- .scripts/git_submodule_reset.sh | 4 +++- apps/steedos-app-admin | 2 +- apps/steedos-app-contract | 2 +- apps/steedos-app-crm | 2 +- apps/steedos-app-oa | 2 +- apps/steedos-app-okr | 2 +- apps/steedos-app-project | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.scripts/git_submodule_reset.sh b/.scripts/git_submodule_reset.sh index d2389e83b0..08ac5efb52 100755 --- a/.scripts/git_submodule_reset.sh +++ b/.scripts/git_submodule_reset.sh @@ -2,4 +2,6 @@ git submodule foreach --recursive git clean -xfd git submodule foreach --recursive git reset --hard -git submodule update --init --recursive \ No newline at end of file +git submodule update --init --recursive +git submodule foreach --recursive git checkout master +git submodule foreach --recursive git pull \ No newline at end of file diff --git a/apps/steedos-app-admin b/apps/steedos-app-admin index a9a32972d5..7a48ecc002 160000 --- a/apps/steedos-app-admin +++ b/apps/steedos-app-admin @@ -1 +1 @@ -Subproject commit a9a32972d54e141942e530b37ffc78a5c5acb524 +Subproject commit 7a48ecc002130097e0167706535498d1d4ac09e7 diff --git a/apps/steedos-app-contract b/apps/steedos-app-contract index 0666a1b806..6f6a0c91a6 160000 --- a/apps/steedos-app-contract +++ b/apps/steedos-app-contract @@ -1 +1 @@ -Subproject commit 0666a1b806792d124ef083035bf74403261b0d8d +Subproject commit 6f6a0c91a689ad58463b9fd20c51ea2cf0321787 diff --git a/apps/steedos-app-crm b/apps/steedos-app-crm index 6c1aa085b4..e314931187 160000 --- a/apps/steedos-app-crm +++ b/apps/steedos-app-crm @@ -1 +1 @@ -Subproject commit 6c1aa085b4f3a544f83df599a9db0fd465054d5d +Subproject commit e314931187d418c7102487a51e0c526defc9b6f2 diff --git a/apps/steedos-app-oa b/apps/steedos-app-oa index 2b579c2a23..5aaba2110f 160000 --- a/apps/steedos-app-oa +++ b/apps/steedos-app-oa @@ -1 +1 @@ -Subproject commit 2b579c2a234bca77f7cde34ed52d0fec538a695b +Subproject commit 5aaba2110ffee8f5a8a9d4756b0ea604dd59eb70 diff --git a/apps/steedos-app-okr b/apps/steedos-app-okr index 9fa7dd4e80..6c4e3abd6e 160000 --- a/apps/steedos-app-okr +++ b/apps/steedos-app-okr @@ -1 +1 @@ -Subproject commit 9fa7dd4e802d9a96f56f7b9c01af8fe67e3ef865 +Subproject commit 6c4e3abd6ef916c28313c2f83a3dfae447cb44ab diff --git a/apps/steedos-app-project b/apps/steedos-app-project index 2754d966df..a7d7bc1028 160000 --- a/apps/steedos-app-project +++ b/apps/steedos-app-project @@ -1 +1 @@ -Subproject commit 2754d966df462d8a7385492b54b7acfb4751cf7e +Subproject commit a7d7bc1028652064c2c939b303f28ab7a29385ed