Merge remote-tracking branch 'origin/master' into vfs-debugging

docs/CODING_STANDARDS.md

@@ -695,6 +695,31 @@ API Documentation
 
 All classes and public API should be documented using [JSDuck annotations](https://github.com/senchalabs/jsduck).
 
+Commit messages
+---------------
+
+We try to adhere to https://github.com/blog/926-shiny-new-commit-styles and to a lesser extent http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html. 
+Don't write `I fixed a bug` or `Fixed bug`, or even `Added a cool fix for bug`. Just write `Fix bug in wrop wraffles` or `Add feature flip floppers`, present tense.
+
+Branch Naming
+-------------
+
+We follow the uni-repo approach so our source code is in one place. To work around some of the issues - for example looking at all PRs affecting a certain service - we prefix branches with the name of the service(s) the branch affects.
+
+PR branch names, e.g. 
+
+    “api-”, “ide-”, “multi-ide-vfs-sapi-”
+    
+Checking for branch naming consistency is part of the review process and the teams responsibility.
+
+    Use “all-” in case of doubt. E.g., https://github.com/c9/newclient/pull/12962/files affects redis schema code.
+    
+Generally, releasing changes affecting several services is a smell so this can help you identify possible issues.
+
+You can now look for all PRs which made it in like so (api in this case):
+
+    git log --oneline --first-parent SHA..origin/master | grep -v bump | grep api-
+
 Other Resources
 ===============
 

node_modules/c9/format-user-analytics.js

@@ -23,7 +23,9 @@ define(function(require, exports, module) {
                 name: user.fullname || user.name,
                 pricingPlan: user.premium ? "Premium" : "Free",
                 referredBy: user.referrer,
-                region: user.region
+                region: user.region,
+                usertype: user.usertype,
+                purpose: user.purpose,
             };
 
         return traits;

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.1897",
+    "version": "3.1.1930",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",