Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara

# Conflicts:
#	.gitignore

3 files changed, 66 insertions, 0 deletions

diff --git a/sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json b/sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json
new file mode 100644
index 00000000..77b37457
--- /dev/null
+++ b/sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json
@@ -0,0 +1,4 @@
+{
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
+  "recommendations": ["angular.ng-template"]
+}
diff --git a/sandbox/TestAppOgnjen/FrontEnd/.vscode/launch.json b/sandbox/TestAppOgnjen/FrontEnd/.vscode/launch.json
new file mode 100644
index 00000000..740e35a0
--- /dev/null
+++ b/sandbox/TestAppOgnjen/FrontEnd/.vscode/launch.json
@@ -0,0 +1,20 @@
+{
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "ng serve",
+      "type": "pwa-chrome",
+      "request": "launch",
+      "preLaunchTask": "npm: start",
+      "url": "http://localhost:4200/"
+    },
+    {
+      "name": "ng test",
+      "type": "chrome",
+      "request": "launch",
+      "preLaunchTask": "npm: test",
+      "url": "http://localhost:9876/debug.html"
+    }
+  ]
+}
diff --git a/sandbox/TestAppOgnjen/FrontEnd/.vscode/tasks.json b/sandbox/TestAppOgnjen/FrontEnd/.vscode/tasks.json
new file mode 100644
index 00000000..a298b5bd
--- /dev/null
+++ b/sandbox/TestAppOgnjen/FrontEnd/.vscode/tasks.json
@@ -0,0 +1,42 @@
+{
+  // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "start",
+      "isBackground": true,
+      "problemMatcher": {
+        "owner": "typescript",
+        "pattern": "$tsc",
+        "background": {
+          "activeOnStart": true,
+          "beginsPattern": {
+            "regexp": "(.*?)"
+          },
+          "endsPattern": {
+            "regexp": "bundle generation complete"
+          }
+        }
+      }
+    },
+    {
+      "type": "npm",
+      "script": "test",
+      "isBackground": true,
+      "problemMatcher": {
+        "owner": "typescript",
+        "pattern": "$tsc",
+        "background": {
+          "activeOnStart": true,
+          "beginsPattern": {
+            "regexp": "(.*?)"
+          },
+          "endsPattern": {
+            "regexp": "bundle generation complete"
+          }
+        }
+      }
+    }
+  ]
+}