Merge branch 'release/1.1.0'

Conflicts:
	bower.json
	package.json

.travis.yml

@@ -4,6 +4,12 @@ notifications:
   slack:
     rooms:
       - secure: "DdtU4qimOtkilUhk3JbKgqmceemoeZ6NgBOK408wi/UP+YNKc1g/zbh0cRF8xoMxUTKOnV1xn7p5MbXRkLbG0jbLiSSdZNkte83GKI+rHmHq5IF+wAcXrwLO+oSFaUDdkQREqMwgPoiQw1OhrMROWj2IW0ynbv08Lr9TfN+jlK4Oj4JEIOb2xNSHgqJexBWKR+qg3JPdSL2kbY6J1PZZ6gqvopQUYOO0toziyUiqdcVpzPBxn6fufL9URybOJdLJI9qnosBNCzzhe8NWoqxNwCLCnF4Pu01249edmtViFFO+ayipfcF+qwiPAcWXgXYl1raRA6h59WDN+Qv/XjHZDXZTJccSXi7tX1J+OelF2S3Tz4HgAKpn+cbmm6VwtrNdsRxHIxuRCaAPBp/SciuLoF0NtwGtXpes1T2cFku1lPDV3/j6FVeMJUHCYF7birjRroY1jveURJxRaKDclmO5UgxYMx2uiO9vltNRgsaKtBtFvkA5oBHxwm6guCRlDI8Vz6VbgvRfA9JC4Cbnoeokmrrea+gcXS35Lh+FdjEPtpSbzeajHwZRxEOmSjwTF/TDH6RItB41jv5YNuTMt+E8uW3585NVcgILQMNFThP5WadwZVRuzVt/3/Zpdx9n/uGqubBgV6UMT+mhuHmyV6NlyO71s4aAMv/XW0zVz6hvggc="
+    webhooks:
+      urls:
+        - https://webhooks.gitter.im/e/5fa07f51d08a12d76eff
+      on_success: change  # options: [always|never|change] default: always
+      on_failure: always  # options: [always|never|change] default: always
+      on_start: never     # options: [always|never|change] default: always
 
 branches:
   only:

README.md

@@ -1,38 +1,35 @@
 # Bullhorn Career Portal
-A Bullhorn Platform SDK sample. Allow candidates to search for and apply to jobs.
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bullhorn/career-portal?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Build Status](https://travis-ci.org/bullhorn/career-portal.svg?branch=development)](https://travis-ci.org/bullhorn/career-portal)
 [![Dependency Status](https://gemnasium.com/bullhorn/career-portal.svg)](https://gemnasium.com/bullhorn/career-portal)
 [![Code Climate](https://codeclimate.com/github/bullhorn/career-portal/badges/gpa.svg)](https://codeclimate.com/github/bullhorn/career-portal)
 [![Test Coverage](https://codeclimate.com/github/bullhorn/career-portal/badges/coverage.svg)](https://codeclimate.com/github/bullhorn/career-portal/coverage)
 
-[Bullhorn Career Portal](http://www.bullhornt.com/) is the next-generation way to share jobs and source candidates from your Bullhorn ATS/CRM instance. Download, configure and host your own career portal, or fork the source code and make it your own.
+**[Bullhorn Career Portal](http://www.bullhorn.com)** is the next-generation way to share jobs and source candidates from your Bullhorn ATS/CRM instance. Download, configure and host your own career portal, or fork the source code and make it your own.
 
 ## Releases
 
-[Latest Stable Version](https://github.com/bullhorn/career-portal/releases/tag/v0.9.1)
-
-Prior Versions
-* [v0.9.0](https://github.com/bullhorn/career-portal/releases/tag/v0.9.0)
-* [v0.0.0](https://github.com/bullhorn/career-portal/releases/tag/v0.0.0)
+* **[Latest Release](https://github.com/bullhorn/career-portal/releases/latest)**
+* **[All Releases](https://github.com/bullhorn/career-portal/releases)**
 
 ## Contribute
 
-There are many ways to [contribute](https://github.com/bullhorn/career-portal/blob/master/CONTRIBUTING.md) to Bullhorn Career Portal.
-* [Submit bugs](https://github.com/bullhorn/career-portal/issues) and help us verify fixes as they are checked in.
-* Review the [source code changes](https://github.com/bullhorn/career-portal/pulls).
-* [Contribute bug fixes](https://github.com/bullhorn/career-portal/blob/master/CONTRIBUTING.md).
+There are many ways to **[contribute](https://github.com/bullhorn/career-portal/blob/master/CONTRIBUTING.md)** to Bullhorn Career Portal.
+* **[Submit bugs](https://github.com/bullhorn/career-portal/issues)** and help us verify fixes as they are checked in.
+* Review **[source code changes](https://github.com/bullhorn/career-portal/pulls)**.
+* **[Contribute bug fixes](https://github.com/bullhorn/career-portal/blob/master/CONTRIBUTING.md)**.
 
 ## Documentation
 
-*  [Hosting](http://www.bullhorn.com)
-*  [Bullhorn REST API Reference](http://developer.bullhorn.com/articles/getting_started)
-*  [Bullhorn Platform](http://bullhorn.github.io/platform/)
-*  [Homepage](http://www.bullhorn.com/)
+*  **[Hosting](https://github.com/bullhorn/career-portal/wiki)**
+*  **[Bullhorn REST API Reference](http://developer.bullhorn.com/articles/getting_started)**
+*  **[Bullhorn Platform](http://bullhorn.github.io/platform)**
+*  **[Bullhorn Website](http://www.bullhorn.com)**
 
 ## Building
 
-In order to build the Bullhorn Career Portal, ensure that you have [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/) installed.
+In order to build Bullhorn Career Portal, ensure that you have **[Git](http://git-scm.com/downloads)** and **[Node.js](http://nodejs.org)** installed.
 
 Clone a copy of the repo:
 
@@ -53,7 +50,6 @@ npm install -g bower
 npm install -g gulp
 npm install
 bower install
-
 ```
 
 Use one of the following to build and test:
@@ -69,6 +65,7 @@ gulp protractor      # Execute e2e tests with Protractor
 gulp protractor:dist # Execute e2e tests with Protractor on build output
 ```
 
-### Additional Utilities
-* [NPM-Check-Updates](https://github.com/tjunnone/npm-check-updates)        # Checks for updates of node modules with CLI
-* [Bower-Check-Updates](https://github.com/se-panfilov/bower-check-updates) # Checks for updates of bower dependencies with CLI
+## Helpful Utilities
+
+* **[NPM-Check-Updates](https://github.com/tjunnone/npm-check-updates)** - checks for updates of node modules with CLI
+* **[Bower-Check-Updates](https://github.com/se-panfilov/bower-check-updates)** - checks for updates of bower dependencies with CLI

bower.json

@@ -1,7 +1,6 @@
 {
     "name": "CareerPortal",
-    "version": "0.9.1",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "dependencies": {
         "angular": "~1.4.3",
         "angular-animate": "~1.4.3",
@@ -11,7 +10,7 @@
         "angular-tooltips": "~0.1.18",
         "angular-touch": "~1.4.3",
         "angular-ui-router": "~0.2.15",
-        "bullhorn-icons": "~1.0.1",
+        "bullhorn-icons": "~1.1.1",
         "moment": "~2.10.6",
         "ng-fastclick": "~1.0.1",
         "ng-file-upload": "~6.0.4",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "CareerPortal",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "devDependencies": {
         "babel-core": "~5.8.21",
         "babel-loader": "~5.3.2",
@@ -28,7 +28,7 @@
         "gulp-rev": "~5.1.0",
         "gulp-rev-replace": "~0.4.2",
         "gulp-sass": "~2.0.4",
-        "gulp-size": "~1.2.3",
+        "gulp-size": "~1.3.0",
         "gulp-sourcemaps": "~1.5.2",
         "gulp-uglify": "~1.2.0",
         "gulp-useref": "~1.3.0",
@@ -46,7 +46,7 @@
         "karma-phantomjs-launcher": "~0.2.1",
         "lodash": "~3.10.1",
         "main-bower-files": "~2.9.0",
-        "merge-stream": "~0.1.8",
+        "merge-stream": "~1.0.0",
         "plato": "^1.5.0",
         "require-dir": "~0.3.0",
         "run-sequence": "^1.1.2",

src/app/detail/detail.controller.js

@@ -1,6 +1,6 @@
 class JobDetailController {
     /* jshint -W072 */
-    constructor($window, $location, ShareService, SearchService, SharedData, job, moment) {
+    constructor($window, $location, ShareService, SearchService, SharedData, job, moment, detectUtils) {
         'ngInject';
 
         this.moment = moment;
@@ -10,6 +10,8 @@ class JobDetailController {
         this.ShareService = ShareService;
         this.SearchService = SearchService;
         this.job = job;
+        this.isIOS = detectUtils.isIOS();
+
 
         // Load the related jobs
         this.loadRelatedJobs();

src/app/detail/detail.html

@@ -14,7 +14,7 @@
         <span class="card-separator" data-ng-show="::((detail.job.address.city || detail.job.address.state) && detail.job.employmentType)">|</span>
         <span class="card-type">{{::detail.job.employmentType}}</span>
 
-        <button class="apply" data-ng-click="detail.applyModal()">{{'detail.applyButton' | i18n}}</button>
+        <button class="apply" data-ng-click="detail.applyModal()" data-ng-if="!detail.isIOS">{{'detail.applyButton' | i18n}}</button>
 
         <hr data-ng-if="detail.relatedJobs.length !== 0"/>
 

src/app/modal/modal.html

@@ -59,7 +59,7 @@ <h3>{{'modal.successSubHeading' | i18n}}</h3>
                         <input type="text" name="mobile-phone" value="" data-ng-model="modal.ApplyService.form.phone" data-i18n-attr="{placeholder: 'modal.phonePlaceholder'}">
                     </div>
                 </div>
-                <div class="upload-label">
+                <div class="upload-label" >
                     <span class="field-label">
                         {{'modal.resumeFilePlaceholder' | i18n}}
                         <i class="bhi-question" data-ng-if="!modal.isMobile" data-tooltips data-tooltip-class="accepted-formats" data-tooltip-show-trigger="mouseenter" data-tooltip-hide-trigger="mouseleave" data-tooltip-side="right" data-tooltip-title="Supported File Formats" data-tooltip-html="{{::modal.getTooltipText()}}"></i>