Merge branch 'dev' into feature/number_of_screens_valiation_802

* dev:
  moving best match to the top of the sort list
  Github issue#405, White spaces are recognized as valid input for NOTES -- Trimmed form field value, before checking if it is empty or not, if it is a string.
  fixes #876
  Github issue#9, Add favicon.ico -- Used highest resolution favicon image from the archive provided initially in the github issue. favicon-webpack-plugin would take care of generating the icons for other devices and browsers.
  Update to Connect Terms per Joey's request
  Github issue#691, Refresh Project Estimate component on change of number of screens -- Fired PROJECT_DIRTY action for every change event fired by the form. Earlier it was firing the PROJECT_DIRTY action only if the form has actually changed its model from the original value.
  fixes #840
  fixing codebot bug
  fixing bug
  updating coderbot value and fixes system hardcoded values

Conflicts:
	src/projects/detail/components/EditProjectForm.jsx

Author: Vikas Agarwal

docs/dependency-notes.txt

@@ -0,0 +1,4 @@
+
+This document outlines the dependency concerns faced during the development of the application.
+
+1. We have overridden the version to 1.1.2 of to-ico library which is used indirectly by "favicon-webpack-plugin" which in turn is used for generating the favicons for different devices and browser combinations. This was required because with versions above 1.1.2 to-ico library is using some features from node v5.10+.

package.json

@@ -18,6 +18,8 @@
     "deep-freeze-node": "^1.1.2",
     "eslint": "^2.2.0",
     "eslint-plugin-react": "^4.1.0",
+    "favicons-webpack-plugin": "0.0.7",
+    "to-ico":"1.1.2",
     "ignore-styles": "^1.2.0",
     "mocha": "^2.4.5",
     "mocha-jsdom": "^1.1.0",

src/components/ConnectTerms/ConnectTerms.jsx

@@ -8,7 +8,7 @@ const ConnectTerms = () => (
       <h1>Terms</h1>
       <p>This User Agreement (the "<strong>Agreement</strong>") is a contract between you (referred to herein as "<strong>User</strong>") and Topcoder Inc. ("Topcoder") and applies to User's use and viewing of <a href="http://connect.topcoder.com">connect.topcoder.com</a> and related sub-domains ("<strong>Topcoder Connect</strong>") and all services available through Topcoder Connect (the "<strong>Services</strong>"). By visiting Topcoder Connect, User has accepted this Agreement and has agreed to be bound by the terms of this Agreement. Any Custom Software ordered (as defined below) or Services used through Topcoder Connect are also governed by these Terms. Topcoder may amend this Agreement at any time by posting a revised version on Topcoder Connect. The revised version will be effective at the time Topcoder posts it.</p>
       <h2>1. Services and Specifications.</h2>
-      <p>The Services provide for the creation of certain types of mock-ups, prototypes, and application development of computer software applications (the "<b>Deliverables</b>") through Topcoder's crowdsourcing platform (as defined below) through a Topcoder representative or co-pilot (referred to herein as a "<b>User Success Manager</b>"), as further described on Topcoder Connect. To utilize the Services, User has provided specifications with respect to the Deliverables in reasonable detail as prompted in several fields on webpages associated with Topcoder Connect where the User was requested to enter information regarding the intended Deliverable (such information, the "<b>Preliminary Specifications</b>"). After payment of Project Fees (as defined below) associated with the Deliverable, a User Success Manager shall contact User to gather additional information regarding the Deliverables, as may be necessary in Topcoder's sole discretion. Topcoder and User shall mutually agree on a final set of specifications, which shall be referred to herein as the "<b>Specifications</b>". To the extent the parties are not able to reach agreement on the Specifications, including, but not limited to situations where the information provided by User is insufficient to create Specifications or the Preliminary Specifications are outside the scope of the services described on Topcoder Connect, Topcoder shall refund to User any Project Fees paid by User and Topcoder shall have no further liability or obligations under this Agreement.</p>
+      <p>The Services provide for the creation of certain types of mock-ups, prototypes, and application development of computer software applications (the "<b>Deliverables</b>") through Topcoder's crowdsourcing platform (as defined below) through a Topcoder representative or co-pilot (referred to herein as a "<b>User Success Manager</b>"), as further described on Topcoder Connect. To utilize the Services, User has provided specifications with respect to the Deliverables in reasonable detail as prompted in several fields on webpages associated with Topcoder Connect where the User was requested to enter information regarding the intended Deliverable (such information, the "<b>Preliminary Specifications</b>"). After payment of Project Fees (as defined below) associated with the Deliverable, a User Success Manager shall contact User to gather additional information regarding the Deliverables, as may be necessary in Topcoder's sole discretion. Topcoder and User shall mutually agree on a final set of specifications, which shall be referred to herein as the "<b>Specifications</b>". As part of this process, Topcoder may provide services to User on an hourly basis. To the extent the parties are not able to reach agreement on the Specifications, including, but not limited to situations where the information provided by User is insufficient to create Specifications or the Preliminary Specifications are outside the scope of the services described on Topcoder Connect, Topcoder shall refund to User any Project Fees paid by User (excluding fees associated with hourly services previously provided) and Topcoder shall have no further liability or obligations under this Agreement.</p>
       <h2>2. Definitions.</h2>
       <p>For the purposes of this Agreement, the following capitalized terms have the meanings assigned to them in this Section 2. Any capitalized terms used in this Agreement but not otherwise defined in this Section shall have the meanings assigned to them elsewhere in this Agreement.</p>
       <ul>

src/components/TextInput/TextInput.scss

@@ -45,6 +45,11 @@
     border-bottom: 1px solid $tc-gray-40;
     color: $tc-gray-30;
   }
+  &.error{
+    border-left: 3px solid $tc-red-70!important;
+    border-bottom: 1px solid $tc-red-70!important;
+    background: $tc-gray-neutral-light!important;
+  }
 }
 
 .input-lg,

src/components/TopBar/TopBarContainer.js

@@ -77,8 +77,11 @@ class TopBarContainer extends React.Component {
 
   applyFilters(filter) {
     const criteria = _.assign({}, this.props.criteria, filter)
-    if (criteria && criteria.keyword)
+    if (criteria && criteria.keyword) {
       criteria.keyword = encodeURIComponent(criteria.keyword)
+      // force sort criteria to best match
+      criteria.sort = 'best match'
+    }
     this.routeWithParams(criteria, 1)
   }
 

src/config/constants.js

@@ -215,7 +215,7 @@ export const PROJECT_FEED_TYPE_PRIMARY  = 'PRIMARY'
 export const PROJECT_FEED_TYPE_MESSAGES = 'MESSAGES'
 
 export const DISCOURSE_BOT_USERID = 'system'
-export const CODER_BOT_USERID = 'system'
+export const CODER_BOT_USERID = 'CoderBot'
 export const CODER_BOT_USER_FNAME = 'Coder'
 export const CODER_BOT_USER_LNAME = 'Bot'
 

src/favicon.png

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link ref="icon" href="/favicon/favicon.ico" />
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">

src/index.html

@@ -7,7 +7,9 @@ import {
   CREATE_PROJECT_FEED,
   LOAD_PROJECT_FEED_COMMENTS,
   CREATE_PROJECT_FEED_COMMENT,
-  LOAD_PROJECT_FEEDS_MEMBERS
+  LOAD_PROJECT_FEEDS_MEMBERS,
+  DISCOURSE_BOT_USERID,
+  CODER_BOT_USERID
 } from '../../config/constants'
 import { loadMembers } from '../../actions/members'
 import { EventTypes } from 'redux-segment'
@@ -85,7 +87,7 @@ const getProjectTopicsWithMember = (dispatch, projectId, tag) => {
         userIds = _.union(userIds, _.map(topic.posts, 'userId'))
       })
       // this is to remove any nulls from the list (dev had some bad data)
-      _.remove(userIds, i => !i || i === 'system')
+      _.remove(userIds, i => !i || [DISCOURSE_BOT_USERID, CODER_BOT_USERID].indexOf(i) > -1)
       // return if there are no userIds to retrieve, empty result set
       if (!userIds.length)
         resolve(value)

src/projects/actions/projectTopics.js

@@ -143,10 +143,15 @@ class EditProjectForm extends Component {
     this.props.submitHandler(model)
   }
 
-  handleChange(change, isChanged) {
-    if (isChanged) {
-      this.props.fireProjectDirty(unflatten(change))
-    }
+  /**
+   * Handles the change event of the form.
+   *
+   * @param change changed form model in flattened form
+   * @param isChanged flag that indicates if form actually changed from initial model values
+   */
+  handleChange(change) {
+    // removed check for isChanged argument to fire the PROJECT_DIRTY event for every change in the form
+    this.props.fireProjectDirty(change)
   }