Merge pull request #120 from TK-data/dev

release 1.0
TK-data · May 29, 2018 · cd3a323 · cd3a323
2 parents fc92cb5 + 0c8094b
commit cd3a323
Show file tree

Hide file tree

Showing 183 changed files with 21,670 additions and 15,200 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ before_install:
   - cd src
   - cd config
   - cp connections.js.example connections.js
+  - echo $GOOGLE_KEY_CONNECTIONS >> connections.js
   - cd ..
   - cd ..
 

diff --git a/Backend/.editorconfig b/Backend/.editorconfig
diff --git a/Backend/.eslintignore b/Backend/.eslintignore
diff --git a/Backend/.eslintrc b/Backend/.eslintrc
diff --git a/Backend/.gitignore b/Backend/.gitignore
diff --git a/Backend/.sailsrc b/Backend/.sailsrc
diff --git a/Backend/Gruntfile.js b/Backend/Gruntfile.js
diff --git a/Backend/README.md b/Backend/README.md
diff --git a/Backend/api/controllers/.gitkeep b/Backend/api/controllers/.gitkeep
diff --git a/Backend/api/controllers/CarController.js b/Backend/api/controllers/CarController.js