Merge pull request #1039 from Superalgos/develop

Merge Develop into Next-Version

Projects/Superalgos/Schemas/Docs-Topics/how-to-003-create-the-plugins-docs-branch-in-old-forks.json

@@ -3,7 +3,7 @@
     "pageNumber": "3",
     "type": "Create the Plugins-Docs Branch in Old Forks",
     "definition": {
-        "text": "If your Superalgos fork is older than April 6, 2021, you must create the plugin-docs branch before you may switch to that branch! Newer forks already have the branch, so you don't need to follow this guide in that case!",
+        "text": "If your Superalgos fork is older than April 6, 2021, you must create the plugins-docs branch before you may switch to that branch! Newer forks already have the branch, so you don't need to follow this guide in that case!",
         "updated": 1618155549345
     },
     "paragraphs": [

Projects/Superalgos/Schemas/Docs-Topics/repository-branches-001-introduction.json

@@ -0,0 +1,15 @@
+{
+    "topic": "Repository Branches",
+    "pageNumber": "1",
+    "type": "Introduction",
+    "definition": {
+        "text": "The Superalgos Repository has 4 main branches, each one with it's own purpose: Master, Develop, Plugins-Docs and Next-Version.",
+        "updated": 1622467436519
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "Right click and Edit to enter edit mode and change this text. ENTER to write new paragraphs. ESC to exit edit mode. Then you can use docs.save to save your changes and app.contribute to send it to the main repository."
+        }
+    ]
+}

Projects/Superalgos/Schemas/Docs-Topics/repository-branches-002-master.json

@@ -0,0 +1,34 @@
+{
+    "topic": "Repository Branches",
+    "pageNumber": "2",
+    "type": "Master",
+    "definition": {
+        "text": "The Master branch is where the stable code or current version is located at. This is the branch where the software is installed from by default. ",
+        "updated": 1622467520315
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "Users of Superalgos running the stable version at Master discuss several topics here:",
+            "updated": 1622468372179
+        },
+        {
+            "style": "Link",
+            "text": "Telegram Community Group->t.me/superalgoscommunity",
+            "updated": 1622468544375
+        },
+        {
+            "style": "Text",
+            "text": "When they have issues with the stable version at Master, they ask for help here:"
+        },
+        {
+            "style": "Link",
+            "text": "Telegram Technical Support Group->t.me/superalgossupport",
+            "updated": 1622468555501
+        },
+        {
+            "style": "Text",
+            "text": ""
+        }
+    ]
+}

Projects/Superalgos/Schemas/Docs-Topics/repository-branches-003-develop.json

@@ -0,0 +1,21 @@
+{
+    "topic": "Repository Branches",
+    "pageNumber": "3",
+    "type": "Develop",
+    "definition": {
+        "text": "The Develop branch is the branch that is being used by developers involved in contributing to Superalgos. All the changes at this branch are sent to the Master branch everytime there is a new release. The Develop branch purpose is for accumulating changes at the codebase untiil the release date when all these changes are moved into the Master branch.",
+        "updated": 1622467883706
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "Contributors working at this branch coordinate their here:",
+            "updated": 1622468223194
+        },
+        {
+            "style": "Link",
+            "text": "Telegram Developers Group->t.me/superalgosdevelop",
+            "updated": 1622468567484
+        }
+    ]
+}

Projects/Superalgos/Schemas/Docs-Topics/repository-branches-004-plugins-docs.json

@@ -0,0 +1,21 @@
+{
+    "topic": "Repository Branches",
+    "pageNumber": "4",
+    "type": "Plugins-Docs",
+    "definition": {
+        "text": "The branch Plugins-Docs is used by contributors of Plugins, documentations or tutorials. This branch in syncronized with Develop and Master everytime a new version is released, and it's purpose is to allow the flow of docs pages, plugins and tutorials into the master branch at a higher rate than changes at the codebase done at the Develop branch. This means that the Master branch might have many updates in between releases.",
+        "updated": 1622467789596
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "Contributors working at this branch coordinate their here:",
+            "updated": 1622468204165
+        },
+        {
+            "style": "Link",
+            "text": "Telegram Docs Group->t.me/superalgosdocs",
+            "updated": 1622468607270
+        }
+    ]
+}

Projects/Superalgos/Schemas/Docs-Topics/repository-branches-005-next-version.json

@@ -0,0 +1,21 @@
+{
+    "topic": "Repository Branches",
+    "pageNumber": "5",
+    "type": "Next-Version",
+    "definition": {
+        "text": "The Next-Version branch is where developers work when they are working on features that will not be part of the next release, but the release following that one. After a release, this branch is merged into Develop and devs continue working there. ",
+        "updated": 1622468029634
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "Contributors working at this branch coordinate their here:",
+            "updated": 1622468300604
+        },
+        {
+            "style": "Link",
+            "text": "Telegram Developers Group->t.me/superalgosdevelop",
+            "updated": 1622468627270
+        }
+    ]
+}

Projects/Superalgos/Schemas/Docs-Tutorials/beyond-the-basics-008-tutorial-step-switching-branches.json

@@ -52,7 +52,7 @@
             "translations": [
                 {
                     "language": "IT",
-                    "text": "Scorri la pagina dei Docs fino al footer e selezione Plugins/Docs come Contributions Branch! È l'opzione sulla destra, non al centro!",
+                    "text": "Scorri la pagina dei Docs fino al footer e selezione Plugins-Docs come Contributions Branch! È l'opzione sulla destra, non al centro!",
                     "updated": 1619633667745,
                     "style": "Callout"
                 }

Projects/Superalgos/Schemas/Docs-Tutorials/beyond-the-basics-012-tutorial-step-lets-switch-already.json

@@ -39,7 +39,7 @@
             "translations": [
                 {
                     "language": "IT",
-                    "text": "Torna al footer e seleziona Plugins/Docs come tuo Current Branch.",
+                    "text": "Torna al footer e seleziona Plugins-Docs come tuo Current Branch.",
                     "updated": 1619634755120,
                     "style": "List"
                 }

Projects/Superalgos/Schemas/Docs-Tutorials/welcome-to-superalgos-7.5-tutorial-step-repository-branches.json

@@ -55,11 +55,11 @@
         },
         {
             "style": "List",
-            "text": "Plugins/Docs Branch: Features the version in the master branch plus the latest changes in the Docs and Plugins. Submit contributions of translations, improvements in the Docs, tutorials, and plugins such as data mines, trading systems, and so on!",
+            "text": "Plugins-Docs Branch: Features the version in the master branch plus the latest changes in the Docs and Plugins. Submit contributions of translations, improvements in the Docs, tutorials, and plugins such as data mines, trading systems, and so on!",
             "translations": [
                 {
                     "language": "IT",
-                    "text": "Plugins/Docs Branch: contiene la versione del master branch più le ultime modifiche a Docs e Plugins. Presenta qui i contributi a Docs, tutorial e plugins, come Data Mines, Trading Systems e così via!",
+                    "text": "Plugins-Docs Branch: contiene la versione del master branch più le ultime modifiche a Docs e Plugins. Presenta qui i contributi a Docs, tutorial e plugins, come Data Mines, Trading Systems e così via!",
                     "updated": 1619633285534
                 }
             ]

Projects/Superalgos/UI/Spaces/Docs-Space/Footer.js

@@ -166,6 +166,7 @@ function newSuperalgosDocsFooter() {
         HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeCurrentBranch(\'master\')">Master</a></li>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeCurrentBranch(\'develop\')">Develop</a></li>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeCurrentBranch(\'plugins-docs\')">Plugins-Docs</a></li>'
+        HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeCurrentBranch(\'next-version\')">Next-Version</a></li>'
         HTML = HTML + '</ul>'
         HTML = HTML + '</div>'
 
@@ -176,6 +177,8 @@ function newSuperalgosDocsFooter() {
         HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeContributionsBranch(\'master\')">Master</code></li>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeContributionsBranch(\'develop\')">Develop</a></li>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeContributionsBranch(\'plugins-docs\')">Plugins-Docs</a></li>'
+        HTML = HTML + '<li><a href="#" onClick="UI.projects.superalgos.spaces.docsSpace.changeContributionsBranch(\'next-version\')">Next-Version</a></li>'
+
         HTML = HTML + '</ul>'
         HTML = HTML + '</ul>'
         HTML = HTML + '</div>'

Projects/Superalgos/UI/Utilities/GitBranches.js

@@ -17,7 +17,11 @@ function newSuperalgosUtilitiesGitBranches() {
                 break
             }
             case 'plugins-docs': {
-                branchLabel = 'Plugins/Docs'
+                branchLabel = 'Plugins-Docs'
+                break
+            }
+            case 'next-version': {
+                branchLabel = 'Next-Version'
                 break
             }
         }