Merge branch 'master' into error_states

.eslintrc

@@ -26,7 +26,8 @@
         "semi": 0,
         "no-console": 0,
         "global-strict": 0,
-        "new-cap": 0
+        "new-cap": 0,
+        "strict": [2, "never"]
     },
     "plugins": [
         "react"

build-uberjar

@@ -4,14 +4,16 @@
 version() {
     # Skip on CircleCI since this is interactive
     if [ ! $CI ]; then
-        VERSION=$(./version)
-        SHORT_VERSION=$(./version --short)
+        VERSION_INFO=$(./version)
+        IFS=', ' read -a info <<< ${VERSION_INFO}
 
-        echo "Tagging uberjar with version '$VERSION'..."
+        echo "Tagging uberjar with version '$VERSION_INFO'..."
 
         # Ok, now generate the appropriate version.properties file.
-        echo "long=$VERSION" > resources/version.properties
-        echo "short=$SHORT_VERSION" >> resources/version.properties
+        echo "tag=${info[0]}" > resources/version.properties
+        echo "hash=${info[1]}" >> resources/version.properties
+        echo "branch=${info[2]}" >> resources/version.properties
+        echo "date=${info[3]}" >> resources/version.properties
     fi
 }
 

frontend/app/activity/activity.services.js

-'use strict';
-
-
 var ActivityServices = angular.module('metabase.activity.services', ['ngResource', 'ngCookies']);
 
 ActivityServices.factory('Activity', ['$resource', '$cookies', function($resource, $cookies) {

frontend/app/admin/databases/databases.controllers.js

-"use strict";
-
 import _ from "underscore";
 
 var DatabasesControllers = angular.module('metabaseadmin.databases.controllers', ['metabase.metabase.services']);

frontend/app/admin/databases/databases.module.js

-'use strict';
-
 var AdminDatabases = angular.module('metabaseadmin.databases', [
     'metabaseadmin.databases.controllers'
 ]);

frontend/app/admin/metadata/components/MetadataEditor.react.js

-'use strict';
-
 import MetadataHeader from './MetadataHeader.react';
 import MetadataTableList from './MetadataTableList.react';
 import MetadataTable from './MetadataTable.react';

frontend/app/admin/metadata/components/MetadataField.react.js

-"use strict";
-
 import Input from "metabase/components/Input.react";
 import Select from "metabase/components/Select.react";
 

frontend/app/admin/metadata/components/MetadataHeader.react.js

-'use strict';
-
 import SaveStatus from "metabase/components/SaveStatus.react";
 import Toggle from "metabase/components/Toggle.react";
 

frontend/app/admin/metadata/components/MetadataSchema.react.js

-'use strict';
-
 export default React.createClass({
     displayName: "MetadataSchema",
     propTypes: {

frontend/app/admin/metadata/components/MetadataTable.react.js

-'use strict';
-
 import Input from "metabase/components/Input.react";
 import MetadataField from "./MetadataField.react";
 import ProgressBar from "metabase/components/ProgressBar.react";

frontend/app/admin/metadata/components/MetadataTableList.react.js

-'use strict';
-
 import _ from "underscore";
 
 import ProgressBar from "metabase/components/ProgressBar.react";

frontend/app/admin/metadata/metadata.controllers.js

-'use strict';
-
 import _ from "underscore";
 
 import MetadataEditor from './components/MetadataEditor.react';

frontend/app/admin/metadata/metadata.module.js

-'use strict';
-
 angular
 .module('metabase.admin.metadata', [
     'metabase.admin.metadata.controllers'

frontend/app/admin/people/actions.js

-"use strict";
-
 import { createAction } from "redux-actions";
 import moment from "moment";
 import { normalize, Schema, arrayOf } from "normalizr";

frontend/app/admin/people/components/AdminPeople.react.js

-"use strict";
-
 import React, { Component, PropTypes } from "react";
 import _ from "underscore";
 

frontend/app/admin/people/components/EditUserForm.react.js

-"use strict";
-
 import React, { Component, PropTypes } from "react";
 import _ from "underscore";
 import cx from "classnames";

frontend/app/admin/people/components/UserActionsSelect.react.js

-"use strict";
-
 import React, { Component, PropTypes } from "react";
 
 import Icon from "metabase/components/Icon.react";

frontend/app/admin/people/components/UserRoleSelect.react.js

-"use strict";
-
 import React, { Component, PropTypes } from "react";
 import cx from "classnames";
 

frontend/app/admin/people/containers/AdminPeopleApp.react.js

-"use strict";
-
 import React, { Component, PropTypes } from "react";
 import { connect } from "react-redux";