Merge pull request #223 from progress/develop

Merge code from 'develop' to 'master' - JSDO release 6.0

.eslintrc.json

@@ -7,8 +7,9 @@
     "env": {
         "browser": true,
         "es6": true,
-        "node": true
-    },    
+        "node": true,
+        "mocha": true
+    },
     "rules": {
         "indent": 1,
         "no-console": 0,

.gitignore

@@ -1,4 +1,12 @@
 .DS_Store
 .vscode
+package-lock.json
 tmp
 tslint.json
+node_modules/
+scratch1/
+scratch2/
+build/
+packages/ng-datasource/package-lock.json
+
+**/tsFiles

contributing.md

@@ -40,7 +40,7 @@ Notwithstanding the above, we reserve the right to ask you to sign a <a href="ht
 * Search <a href="https://github.com/progress/JSDO/pulls">GitHub</a> for an open or closed Pull Request that relates to your submission.
 * Clone the repository.
 ```bash
-    git clone [email protected]:CloudDataObject/JSDO.git
+    git clone [email protected]:progress/JSDO.git -b develop
 ```
 * Initialize the submodule.
 ```bash
@@ -50,20 +50,25 @@ Notwithstanding the above, we reserve the right to ask you to sign a <a href="ht
 ```bash
     git submodule update
 ```
-* Make your changes in a new `git` branch. We use the <a href="http://nvie.com/posts/a-successful-git-branching-model/">Gitflow branching model</a> so you will have to branch from our develop branch.
+* Make your changes in a new `git` branch. We use the <a href="http://nvie.com/posts/a-successful-git-branching-model/">Gitflow branching model</a>.
 
 * Commit your changes and create a descriptive commit message (the commit message is used to generate release notes).
 ```bash
     git commit -a
 ```
+* Ensure your changes pass the Mocha tests for the JSDO.
+```bash
+    npm install
+    npm test
+```
 * Push your branch to GitHub.
 ```bash
     git push origin my-fix-branch
 ```
-* In GitHub, send a Pull Request to JSDO:master.
+* In GitHub, send a Pull Request to JSDO:develop.
 * If we suggest changes, you can modify your branch, rebase, and force a new push to your GitHub repository to update the Pull Request.
 ```bash
-    git rebase master -i
+    git rebase develop -i
     git push -f
 ```
 
@@ -77,15 +82,15 @@ When the patch is reviewed and merged, you can safely delete your branch and pul
 ```
 * Check out the develop branch.
 ```bash
-    git checkout master -f
+    git checkout develop -f
 ```
 * Delete the local branch.
 ```bash
     git branch -D my-fix-branch
 ```
 * Update your develop branch with the latest upstream version.
 ```
-    git pull --ff upstream master
+    git pull --ff upstream develop
 ```
 
 [Back to Top][1]