Merge pull request #2636 from Superalgos/develop

Develop into Master - last minute bug fixes

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

@@ -168,7 +168,7 @@ function newFoundationsDocsFooter() {
         HTML = HTML + '<div class="docs-footer-row">'
         HTML = HTML + '<div class="docs-footer-cell">'
         HTML = HTML + '<h4>About Your Deployment</h4>'
-        HTML = HTML + 'Superalgos may run from different branches in the repository. The <code class="docs-footer-code">Master</code> branch features the stable version, and the <code class="docs-footer-code">Develop</code> branch the version in development. Use the <code class="docs-footer-code">Plugins-Docs</code> branch to contribute plugins and to the Docs.'
+        HTML = HTML + 'Superalgos may run from different branches in the repository. The <code class="docs-footer-code">Master</code> branch features the stable version, and the <code class="docs-footer-code">Develop</code> branch the version in development.'
         HTML = HTML + '</div>'
 
         HTML = HTML + '<div class="docs-footer-cell">'
@@ -177,7 +177,6 @@ function newFoundationsDocsFooter() {
         HTML = HTML + '<ul>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.education.spaces.docsSpace.changeCurrentBranch(\'master\')">Master</a></li>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.education.spaces.docsSpace.changeCurrentBranch(\'develop\')">Develop</a></li>'
-        HTML = HTML + '<li><a href="#" onClick="UI.projects.education.spaces.docsSpace.changeCurrentBranch(\'plugins-docs\')">Plugins-Docs</a></li>'
         HTML = HTML + '</ul>'
         HTML = HTML + '</div>'
 
@@ -187,7 +186,6 @@ function newFoundationsDocsFooter() {
         HTML = HTML + '<ul>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.education.spaces.docsSpace.changeContributionsBranch(\'master\')">Master</code></li>'
         HTML = HTML + '<li><a href="#" onClick="UI.projects.education.spaces.docsSpace.changeContributionsBranch(\'develop\')">Develop</a></li>'
-        HTML = HTML + '<li><a href="#" onClick="UI.projects.education.spaces.docsSpace.changeContributionsBranch(\'plugins-docs\')">Plugins-Docs</a></li>'
 
         HTML = HTML + '</ul>'
         HTML = HTML + '</ul>'
@@ -211,26 +209,36 @@ function newFoundationsDocsFooter() {
         HTML = HTML + '<div class="docs-footer-row">'
         HTML = HTML + '<div class="docs-footer-cell">'
         HTML = HTML + '<h4>Join the Conversation</h4>'
-        HTML = HTML + '<p>We have a new <a href="https://discord.gg/CGeKC6WQQb" target="_blank">Discord Server</a> with multiple channels and a new <a href="https://forum.superalgos.org/" target="_blank">Community Forum</a> or you may join the original individual Telegram groups listed to the right.</p>'
+        HTML = HTML + '<p>We have a new <a href="https://discord.gg/CGeKC6WQQb" target="_blank">Discord Server</a> with multiple channels and a new <a href="https://forum.superalgos.org/" target="_blank">Community Forum</a>.</p>'
+        HTML = HTML + '<p>The community is a lot more active in the original Telegram groups listed on the right.</p>'
         HTML = HTML + '</div>'
 
         HTML = HTML + '<div class="docs-footer-cell">'
-        HTML = HTML + '<h4>In Telegram</h4>'
+        HTML = HTML + '<h4>Telegram Groups</h4>'
         HTML = HTML + '<ul>'
-        HTML = HTML + '<li><a href="https://t.me/superalgoscommunity" target="_blank">Community Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgossupport" target="_blank">Technical Support Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgosdevelop" target="_blank">Developers Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgosmachinelearning" target="_blank">Machine Learning Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgosdocs" target="_blank">Docs Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgosuxui" target="_blank">UX/UI Design Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgoscollaborations" target="_blank">Collaborations Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgoscodebase" target="_blank">Codebase Learning Group</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgos_es" target="_blank">Hablemos en Español!</a></li>'
-        HTML = HTML + '<li><a href="https://t.me/superalgos_ru" target="_blank">Говорим по русски!</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgoscommunity" target="_blank">Community</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgossupport" target="_blank">Technical Support</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgosdevelop" target="_blank">Developers</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgosdatamining" target="_blank">Data Mining</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgosmachinelearning" target="_blank">Machine Learning</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgosdocs" target="_blank">Docs/Education</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgosuxui" target="_blank">UX/UI Design</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgosmarketing" target="_blank">Marketing</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgostoken" target="_blank">Token</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgostrading" target="_blank">Trading</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgoscollaborations" target="_blank">Collaborations</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgoscodebase" target="_blank">Codebase Learning</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgosnontechusers" target="_blank">Non-Tech Users</a></li>'
         HTML = HTML + '</ul>'
         HTML = HTML + '</div>'
 
         HTML = HTML + '<div class="docs-footer-cell">'
+        HTML = HTML + '<h4>Non-English Telegram Groups</h4>'
+        HTML = HTML + '<ul>'
+        HTML = HTML + '<li><a href="https://t.me/superalgos_es" target="_blank">Spanish</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/superalgos_ru" target="_blank">Russian</a></li>'
+        HTML = HTML + '<li><a href="https://t.me/tr_superalgos" target="_blank">Turkish</a></li>'
+        HTML = HTML + '</ul>'
         HTML = HTML + '<h4>Other Resources</h4>'
         HTML = HTML + '<ul>'
         HTML = HTML + '<li><a href="https://t.me/superalgos" target="_blank">Official Announcements</a></li>'

Projects/Education/UI/Spaces/Tutorial-Space/TutorialSpace.js

@@ -1006,7 +1006,7 @@ function newEducationTutorialSpace() {
     function resumeTutorial(node) {
         if (UI.projects.foundations.spaces.designSpace.workspace.isInitialized !== true) { return }
         //Testing if removing the navigationStack reset here fixes the tutorial resume issues
-        navigationStack = []
+        //navigationStack = []
         node.payload.uiObject.isPlaying = true
         tutorialRootNode = node
         currentNode = node
@@ -1028,7 +1028,7 @@ function newEducationTutorialSpace() {
 
     function resumeTutorialTopic(node) {
         //Testing if removing the navigationStack reset here fixes the tutorial resume issues
-        navigationStack = []
+        //navigationStack = []
         currentTopicNode = node
         currentNode = node
         currentStatus = 'Playing Topic'
@@ -1049,7 +1049,7 @@ function newEducationTutorialSpace() {
 
     function resumeTutorialStep(node) {
         //Testing if removing the navigationStack reset here fixes the tutorial resume issues
-        navigationStack = []
+        //navigationStack = []
         currentStepNode = node
         currentNode = node
         currentStatus = 'Playing Step'

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-042-tutorial-step-positioning-plugins.json

@@ -6,8 +6,8 @@
         "text": "Here's the crazy bit... the Plugin File Position node determines where in the workspace the plugin is placed!",
         "updated": 1615921131447,
         "icon": {
-            "name": "Plugins\\plugin-file-position",
-            "project": "Foundations"
+            "name": "plugin-file-position",
+            "project": "Community-Plugins"
         },
         "translations": [
             {

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-043-tutorial-step-placing-plugins.json

@@ -5,8 +5,8 @@
     "definition": {
         "text": "To place a plugin in a workspace you must select the option to add the missing plugins on the node of the matching type!",
         "icon": {
-            "name": "Plugins\\plugin-trading-systems",
-            "project": "Foundations"
+            "name": "plugin-trading-systems",
+            "project": "Community-Plugins"
         },
         "updated": 1615925984822,
         "translations": [

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-044-tutorial-step-non-persistence-of-changes.json

@@ -5,7 +5,7 @@
     "definition": {
         "text": "Remember I said that the plugin file is loaded every time the workspace is loaded? This feature has an immediate consequence...",
         "icon": {
-            "name": "Bullet\\bullet-error",
+            "name": "bullet-error",
             "project": "Foundations"
         },
         "updated": 1615978752612,

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-046-tutorial-step-starting-from-a-plugin.json

@@ -5,8 +5,8 @@
     "definition": {
         "text": "Let's look into the first scenario: a typical case is when you wish to introduce changes to a strategy shipping with the system to start with a proven setup!",
         "icon": {
-            "name": "Trading\\trading-system",
-            "project": "Foundations"
+            "name": "trading-system",
+            "project": "Algorithmic-Trading"
         },
         "updated": 1629908121952,
         "translations": [

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-047-tutorial-step-improving-a-plugin.json

@@ -6,7 +6,7 @@
         "text": "About the second scenario: let's say you are testing the EMA indicator, found a bug and know how to fix it. You intend to contribute the fix so that everyone benefits from it!",
         "icon": {
             "name": "indicator-bot",
-            "project": "Foundations"
+            "project": "Data-Mining"
         },
         "updated": 1629909327051,
         "translations": [

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-053-tutorial-step-building-indicators.json

@@ -6,7 +6,7 @@
         "text": "If you are a developer or have at least a basic understanding of JavaScript you will be able to create your own indicators!",
         "icon": {
             "name": "indicator-bot",
-            "project": "Foundations"
+            "project": "Data-Mining"
         },
         "updated": 1616180582873,
         "translations": [

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-054-tutorial-step-more-indicators.json

@@ -6,8 +6,8 @@
         "text": "Indicators are built by the Community! Usually, a developer will build a few indicators he or she needs, and contribute them to the project in a new Data Mine!",
         "updated": 1616235133472,
         "icon": {
-            "name": "Data\\data-mine",
-            "project": "Foundations"
+            "name": "data-mine",
+            "project": "Data-Mining"
         },
         "translations": [
             {

Projects/Foundations/Schemas/Docs-Tutorials/B/Basic/Basic-Education/basic-education-056-tutorial-step-how-about-strategies.json

@@ -5,8 +5,8 @@
     "definition": {
         "text": "The Community may also contribute Trading Systems! At this point, there're only a few, but we hope more will emerge soon!",
         "icon": {
-            "name": "Trading\\trading-system",
-            "project": "Foundations"
+            "name": "trading-system",
+            "project": "Algorithmic-Trading"
         },
         "updated": 1616235875824,
         "translations": [

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-008-tutorial-step-switching-branches.json

@@ -80,8 +80,8 @@
         },
         {
             "style": "Callout",
-            "text": "Scroll down the Docs page to the footer and select Plugins-Docs as your Contributions Branch! It's the option on the right-hand side, not in the center!",
-            "updated": 1619794957137,
+            "text": "Scroll down the Docs page to the footer and select Develop as your Contributions Branch! It's the option on the right-hand side, not in the center!",
+            "updated": 1636912795665,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-009-tutorial-step-now-the-current-branch.json

@@ -55,33 +55,9 @@
             ]
         },
         {
-            "style": "Callout",
-            "text": "If you forked the Superalgos repo before April 6th, 2021, follow the instructions on this page to create the plugins-docs branch. Otherwise, keep going!",
-            "updated": 1618154888356,
-            "translations": [
-                {
-                    "language": "IT",
-                    "text": "Se hai fatto il fork di Superalgos prima del 6 aprile 2021, segui le istruzioni su questa pagine per creare il branch Plugins-Docs. Altrimenti continua!",
-                    "updated": 1619633825511,
-                    "style": "Callout"
-                },
-                {
-                    "language": "ES",
-                    "text": "Si has hecho fork en el repositorio de Superalgos antes del 6 de abril de 2021, sigue las instrucciones de esta página para crear la rama plugins-docs. De lo contrario, ¡sigue adelante!",
-                    "updated": 1628122733300,
-                    "style": "Callout"
-                },
-                {
-                    "language": "DE",
-                    "text": "Wenn Sie das Superalgos-Projektarchiv vor dem 6. April 2021 geforkt haben, folgen Sie den Anweisungen auf dieser Seite, um den plugins-docs-Zweig zu erstellen. Ansonsten machen Sie weiter!",
-                    "updated": 1634821743479
-                }
-            ]
-        },
-        {
-            "style": "Text",
-            "text": "When you switch branches, the app will run a series of Git commands that will download the software from the plugins-docs branch of your fork! The current software will be replaced on your disk! For that reason, you will need to close the app after switching. But let's discuss a couple more things before you proceed!",
-            "updated": 1618159009151,
+            "style": "Note",
+            "text": "When you switch branches, the app will run a series of Git commands that will download the software from the Develop branch of your fork! The current software will be replaced on your disk! For that reason, you will need to close the app after switching. But let's discuss a couple more things before you proceed!",
+            "updated": 1636912890459,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-010-tutorial-step-before-you-switch.json

@@ -80,8 +80,8 @@
         },
         {
             "style": "List",
-            "text": "Even the structure of mined data may have changed!",
-            "updated": 1617017781902,
+            "text": "The structure of mined data may have changed!",
+            "updated": 1636912993126,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-011-tutorial-step-double-trouble.json

@@ -80,8 +80,8 @@
         },
         {
             "style": "Success",
-            "text": "Such a setup allows you to run the stable version for your production tasks, and the version in another branch to contribute and test new features! But you can't run two versions at the same time, unless you change ports! We won't go there now!",
-            "updated": 1618148172616,
+            "text": "Such a setup allows you to run the stable version for your production tasks, and the version in another branch to contribute and test new features! But you can't run two versions at the same time, unless you change ports!",
+            "updated": 1636913062018,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-012-tutorial-step-lets-switch-already.json

@@ -56,8 +56,8 @@
         },
         {
             "style": "List",
-            "text": "Go back to the footer and select Plugins-Docs as your Current Branch.",
-            "updated": 1619794998745,
+            "text": "Go back to the footer and select Develop as your Current Branch.",
+            "updated": 1636913147028,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-013-tutorial-step-welcome-back.json

@@ -3,12 +3,12 @@
     "pageNumber": 13,
     "type": "Tutorial Step - Welcome Back!",
     "definition": {
-        "text": "If you followed my instructions to the letter, you should now be running the software in the plugins-docs branch! Awesome!",
+        "text": "If you followed my instructions to the letter, you should now be running the software in the Develop branch! Awesome!",
         "icon": {
             "name": "hits",
             "project": "Foundations"
         },
-        "updated": 1618159282200,
+        "updated": 1636913180861,
         "translations": [
             {
                 "language": "IT",
@@ -32,8 +32,8 @@
     "paragraphs": [
         {
             "style": "Text",
-            "text": "The software you are currently running is the version of Superalgos that was at the plugins-docs branch the day you forked the project! This is because the process of switching branches downloads the software from your fork and not the upstream repository.",
-            "updated": 1618159308510,
+            "text": "The software you are currently running is the version of Superalgos that was at the Develop branch the second you switched branches! This is good, as you now know you have the latest version of the software!",
+            "updated": 1636913978584,
             "translations": [
                 {
                     "language": "IT",
@@ -56,8 +56,8 @@
         },
         {
             "style": "Success",
-            "text": "You need to update so that you run the latest version! This is particularly important when you intend to contribute to the project. You should always work on the latest version so that the changes you make include the latest changes produced by other contributors!",
-            "updated": 1617020167891,
+            "text": "This is particularly important because you are about to contribute to the project. You should always work on the latest version so that the changes you make include the latest changes produced by other contributors!",
+            "updated": 1636914060165,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-014-tutorial-step-update-the-app.json

@@ -3,12 +3,12 @@
     "pageNumber": 14,
     "type": "Tutorial Step - Update the App!",
     "definition": {
-        "text": "The App Update Command fetches the latest version of the software from the upstream repository in the Current Branch!",
+        "text": "It's good practice to be up-to-date before contributing or when troubleshooting or reporting errors of any kind!",
         "icon": {
             "name": "indicator-process-instance",
             "project": "Foundations"
         },
-        "updated": 1617020636889,
+        "updated": 1636914372518,
         "translations": [
             {
                 "language": "IT",
@@ -32,8 +32,8 @@
     "paragraphs": [
         {
             "style": "Text",
-            "text": "That means that you may use this command on either of the branches! This is it:",
-            "updated": 1617020758219,
+            "text": "The App Update Command fetches the latest version of the software from the upstream repository in the Current Branch!",
+            "updated": 1636914274377,
             "translations": [
                 {
                     "language": "IT",
@@ -84,8 +84,8 @@
         },
         {
             "style": "Success",
-            "text": "Once the update is done, you will need to close the app again, restart it, find the tutorial and click Resume, just like you did earlier!",
-            "updated": 1617020620260,
+            "text": "Because you just switched branches, you should already be up to date!",
+            "updated": 1636914400732,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-017-tutorial-step-breaking-up-the-command.json

@@ -104,8 +104,8 @@
         },
         {
             "style": "List",
-            "text": "Superalgos: the Project to which the page is added.",
-            "updated": 1622026691016,
+            "text": "Foundations: the Project to which the page is added.",
+            "updated": 1636913558286,
             "translations": [
                 {
                     "language": "IT",

Projects/Foundations/Schemas/Docs-Tutorials/B/Beyond/Beyond-the-Basics/beyond-the-basics-027-tutorial-step-contributable-files.json

@@ -32,8 +32,8 @@
     "paragraphs": [
         {
             "style": "Callout",
-            "text": "These folders are exempt from being contributed: My-Workspaces, Data-Storage, and Log-Files.",
-            "updated": 1610984106655,
+            "text": "These folders are exempt from being contributed: My-Workspaces, My-Data-Storage, and My-Log-Files, within the Platform folder.",
+            "updated": 1636914532594,
             "translations": [
                 {
                     "language": "IT",