Skip to content
This repository has been archived by the owner on Nov 6, 2022. It is now read-only.

Commit

Permalink
Merge pull request #158 from trailimage/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Jason-Abbott authored Sep 23, 2019
2 parents 053e9a8 + f959799 commit 4a6f677
Show file tree
Hide file tree
Showing 4 changed files with 2,677 additions and 638 deletions.
12 changes: 12 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
"command": "node_modules/.bin/gulp",
"args": ["watch"],
"group": "build",
"presentation": {
"group": "run"
},
"type": "shell",
"problemMatcher": ["$gulp-tsc"]
},
Expand All @@ -64,6 +67,9 @@
{
"label": "Build and Watch Server",
"group": "build",
"presentation": {
"group": "run"
},
"command": "./node_modules/.bin/tsc",
"args": ["-p", "tsconfig.node.json", "-w"],
"type": "shell",
Expand All @@ -74,6 +80,9 @@
"command": "node",
"args": ["./lib/app.js"],
"type": "shell",
"presentation": {
"group": "run"
},
"dependsOn": ["Build Server"],
"problemMatcher": []
},
Expand All @@ -83,6 +92,9 @@
"kind": "build",
"isDefault": true
},
"presentation": {
"group": "run"
},
"command": "./node_modules/.bin/nodemon",
"args": [
"--exec",
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 4.3.1

- Update Google API and other dependencies

## 4.3.0

- Adjust design for more white space
Expand Down
Loading

0 comments on commit 4a6f677

Please sign in to comment.