Merge branch 'dev' into release/v1.0.2

Parth Shah · Parth Shah · commit ce26757ea102 · 2015-10-02T11:43:38.000-07:00
diff --git a/app/services/profile.service.js b/app/services/profile.service.js
@@ -103,6 +103,8 @@
             'rating': subTrack.rank.rating || 0,
             'wins': subTrack.wins
           };
+        }).filter(function(subTrack) {
+          return !(subTrack.subTrack == 'COPILOT_POSTING' && subTrack.track == 'DEVELOP');
         });
       }
       // show # of wins for design
diff --git a/app/settings/edit-profile/edit-profile.jade b/app/settings/edit-profile/edit-profile.jade
@@ -38,7 +38,7 @@
         .bio
           .form-label short bio
             span(style="float:right;") {{vm.userData.description.length || 0}}/144
-          textarea.form-field(name="description", ng-model="vm.userData.description" ng-maxlength="144")
+          textarea.form-field(name="description", ng-model="vm.userData.description", maxlength="144")
 
     .settings-section.tracks
       .section-info

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,8 @@`
`103`	`103`	`'rating': subTrack.rank.rating \|\| 0,`
`104`	`104`	`'wins': subTrack.wins`
`105`	`105`	`};`
	`106`	`+ }).filter(function(subTrack) {`
	`107`	`+ return !(subTrack.subTrack == 'COPILOT_POSTING' && subTrack.track == 'DEVELOP');`
`106`	`108`	`});`
`107`	`109`	`}`
`108`	`110`	`// show # of wins for design`