Merge branch 'release/1.2.1' into production

CHANGES.md

@@ -0,0 +1,46 @@
+2015-01-28, Version 1.2.1
+=========================
+
+ * package: add jshint to devDependencies (Miroslav Bajtoš)
+
+ * Fix crash in `id(model, property)` (Miroslav Bajtoš)
+
+ * Fix bad CLA URL in CONTRIBUTING.md (Ryan Graham)
+
+
+2014-10-13, Version 1.2.0
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Make sure callback happens if a model is not attached to the data source (Raymond Feng)
+
+ * Update contribution guidelines (Ryan Graham)
+
+
+2014-07-20, Version 1.1.1
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Fix updateAttributes impl (Raymond Feng)
+
+
+2014-06-20, Version 1.1.0
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Fix style to pass jlint (Raymond Feng)
+
+ * Add space (Raymond Feng)
+
+ * Add bulk update support (Raymond Feng)
+
+ * Fix the count() impl to use buildWhere() from the subclass (Raymond Feng)
+
+
+2014-06-03, Version 1.0.0
+=========================
+
+ * First release!

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Contributing to `loopback-connector` is easy. In a few simple steps:
   * Adhere to code style outlined in the [Google C++ Style Guide][] and
     [Google Javascript Style Guide][].
 
-  * Sign the [Contributor License Agreement](https://cla.strongloop.com/strongloop/loopback-connector)
+  * Sign the [Contributor License Agreement](https://cla.strongloop.com/agreements/strongloop/loopback-connector)
 
   * Submit a pull request through Github.
 

lib/connector.js

@@ -104,10 +104,7 @@ Connector.prototype.idNames = function (model) {
  */
 Connector.prototype.id = function (model, prop) {
   var p = this._models[model].properties[prop];
-  if (!p) {
+  return p && p.id;
-    console.trace('Property not found: ' + model + '.' + prop);
-  }
-  return p.id;
 };
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-connector",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Building blocks for LoopBack connectors",
   "keywords": [
     "StrongLoop",
@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "chai": "~1.9.2",
+    "jshint": "^2.6.0",
     "loopback-datasource-juggler": "^2.0.0",
     "mocha": "^1.19.0"
   }