Merge remote-tracking branch 'upstream/master' into origin/master
Project: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/commit/49227ed8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/tree/49227ed8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/diff/49227ed8 Branch: refs/heads/master Commit: 49227ed8692e3a3b4df9084cf0fcd9fe4a7b722c Parents: 2f3c3fe 2545b7e Author: Robert Walsh <rjwalsh1...@gmail.com> Authored: Mon Oct 10 11:39:19 2016 -0500 Committer: Robert Walsh <rjwalsh1...@gmail.com> Committed: Mon Oct 10 11:39:19 2016 -0500 ---------------------------------------------------------------------- LICENSE | 29 +- README.md | 850 ++++++++++++++----- examples/api-proxy/README.md | 4 + examples/api-proxy/app.js | 30 + examples/api-proxy/config/usergrid.example.json | 8 + examples/api-proxy/package.json | 19 + helpers/args.js | 14 + helpers/build.js | 14 + helpers/cb.js | 14 + helpers/client.js | 20 +- helpers/config.js | 37 +- helpers/index.js | 14 + helpers/mutability.js | 14 + helpers/query.js | 14 + helpers/time.js | 14 + helpers/user.js | 14 + lib/appAuth.js | 27 +- lib/asset.js | 14 + lib/auth.js | 14 + lib/client.js | 50 +- lib/entity.js | 14 + lib/query.js | 14 + lib/request.js | 14 + lib/response.js | 14 + lib/responseError.js | 14 + lib/user.js | 14 + lib/userAuth.js | 14 + package.json | 9 +- tests/lib/client.auth.test.js | 16 +- usergrid.js | 21 +- 30 files changed, 1088 insertions(+), 270 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/49227ed8/lib/query.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/49227ed8/lib/response.js ----------------------------------------------------------------------