From 4a38f568ad617c149aba1367f2c6cebd9000822c Mon Sep 17 00:00:00 2001 From: Loft Date: Tue, 19 Jan 2021 13:54:26 +0100 Subject: [PATCH 1/3] This is my contribution to Superalgos --- .../Schemas/Docs-Concepts/client copy.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Projects/Superalgos/Schemas/Docs-Concepts/client copy.json diff --git a/Projects/Superalgos/Schemas/Docs-Concepts/client copy.json b/Projects/Superalgos/Schemas/Docs-Concepts/client copy.json new file mode 100644 index 000000000..93b2ed1af --- /dev/null +++ b/Projects/Superalgos/Schemas/Docs-Concepts/client copy.json @@ -0,0 +1,14 @@ +{ + "type": "Client", + "definition": { + "text": "The Client, together with the TS and the UI is one of the three core components of the Superalgos Software.", + "updated": 1610911936882 + }, + "paragraphs": [ + { + "style": "Success", + "text": "The Client is what users run.", + "updated": 1610912048355 + } + ] +} \ No newline at end of file From e4386130936f5d581e8b8c3386eee08eb29f35d6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 19 Jan 2021 14:05:43 +0100 Subject: [PATCH 2/3] Bug Fixed in Mac Os, Git not recognizing upstream --- Client/httpInterface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/httpInterface.js b/Client/httpInterface.js index 2a968bdd2..253b4e4a1 100644 --- a/Client/httpInterface.js +++ b/Client/httpInterface.js @@ -723,7 +723,7 @@ exports.newHttpInterface = function newHttpInterface(WEB_SERVER, DATA_FILE_SERVE let message try { - message = await git.pull('upstream', currentBranch) + message = await git.pull('https://github.com/Superalgos/Superalgos', currentBranch) return message } catch (err) { console.log('[ERROR] Error updating ' + currentBranch) From 8f94483a20aeb7632675052c56fa09be83c8d2ca Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 19 Jan 2021 14:08:05 +0100 Subject: [PATCH 3/3] Bug Fixed in Mac Os, Git not recognizing upstream --- .../Schemas/Docs-Concepts/client copy.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 Projects/Superalgos/Schemas/Docs-Concepts/client copy.json diff --git a/Projects/Superalgos/Schemas/Docs-Concepts/client copy.json b/Projects/Superalgos/Schemas/Docs-Concepts/client copy.json deleted file mode 100644 index 93b2ed1af..000000000 --- a/Projects/Superalgos/Schemas/Docs-Concepts/client copy.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "Client", - "definition": { - "text": "The Client, together with the TS and the UI is one of the three core components of the Superalgos Software.", - "updated": 1610911936882 - }, - "paragraphs": [ - { - "style": "Success", - "text": "The Client is what users run.", - "updated": 1610912048355 - } - ] -} \ No newline at end of file