Merge branch 'release/1.0.13'

Author: felliott

app/components/isp-consent-form/consentText.js

@@ -649,20 +649,6 @@ export default [
         ],
         "name": "Ukraine"
     },
-    {
-        "code": "AE",
-        "languages": [
-            {
-                "code": "en-AE",
-                "name": "English"
-            },
-            {
-                "code": "ar-AE",
-                "name": "العربية"
-            }
-        ],
-        "name": "United Arab Emirates"
-    },
     {
         "code": "GB",
         "languages": [

app/components/language-picker/countries.js

@@ -19,5 +19,25 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
             query['filter[extra.studyId]'] = params.siteId;
         }
         return this.store.queryEverything('account', query);
+    },
+
+    actions: {
+
+        // Override Embers queryParamsDidChange function, and make a few modifications.
+        // The initial function uses 'this.refresh' which will call multiple times, causing transition aborts
+        // Replacing with nesting the call in a Ember.run.once fixes this
+        queryParamsDidChange(changed, totalPresent, removed){
+            //queryParams map
+            var qpMap = this.get('_qp').map;
+            var totalChanged = Object.keys(changed).concat(Object.keys(removed));
+            for (var i = 0; i < totalChanged.length; ++i){
+                var qp = qpMap[totalChanged[i]];
+                // the this.router.currentState variable causes a page refresh to fail this check. Prevents a failed promise. 
+                if (qp && this._optionsForQueryParam(qp).refreshModel && this.router.currentState) {
+                    Ember.run.once(this, this.refresh);
+                }
+            }
+            return true;
+        },
     }
 });

app/routes/manage/who-completed.js

@@ -77,4 +77,11 @@
 
 .supported-browser {
   width: 1.5em;
+
+}
+.fa-check-square-o {
+  color: #008000;
+}
+.fa-times {
+  color:#FF0000;
 }

app/styles/app.scss

@@ -39,18 +39,18 @@
           The International Situations Project does not support Internet Explorer. If you are using Internet Explorer, please switch to another browser.
         </p>
         <p>
-          <i class="supported-browser fa fa-times" aria-hidden="true"></i>
-          <i class="supported-browser fa fa-check-square-o" aria-hidden="true"></i>
-          <i class="supported-browser fa fa-check-square-o" aria-hidden="true"></i>
-          <i class="supported-browser fa fa-check-square-o" aria-hidden="true"></i>
-          <i class="supported-browser fa fa-check-square-o" aria-hidden="true"></i>
+          <i class="supported-browser fa fa-2x fa-times" aria-hidden="true"></i>
+          <i class="supported-browser fa fa-2x fa-check-square-o" aria-hidden="true"></i>
+          <i class="supported-browser fa fa-2x fa-check-square-o" aria-hidden="true"></i>
+          <i class="supported-browser fa fa-2x fa-check-square-o" aria-hidden="true"></i>
+          <i class="supported-browser fa fa-2x fa-check-square-o" aria-hidden="true"></i>
         </p>
         <p>
-          <i class="supported-browser fa fa-internet-explorer" title="Internet explorer (not supported)" aria-label="Internet explorer (not supported)"></i>
-          <i class="supported-browser fa fa-safari" title="Safari (supported)" aria-label="Safari (supported)"></i>
-          <i class="supported-browser fa fa-firefox" title="Firefox (supported)" aria-label="Firefox (supported)"></i>
-          <i class="supported-browser fa fa-chrome" title="Chrome (supported)" aria-label="Chrome (supported)"></i>
-          <i class="supported-browser fa fa-edge" title="Edge (supported)" aria-label="Edge (supported)"></i>
+          <i class="supported-browser fa fa-2x fa-internet-explorer" title="Internet explorer (not supported)" aria-label="Internet explorer (not supported)"></i>
+          <i class="supported-browser fa fa-2x fa-safari" title="Safari (supported)" aria-label="Safari (supported)"></i>
+          <i class="supported-browser fa fa-2x fa-firefox" title="Firefox (supported)" aria-label="Firefox (supported)"></i>
+          <i class="supported-browser fa fa-2x fa-chrome" title="Chrome (supported)" aria-label="Chrome (supported)"></i>
+          <i class="supported-browser fa fa-2x fa-edge" title="Edge (supported)" aria-label="Edge (supported)"></i>
         </p>
       </div>
     </div>

app/templates/participate/login.hbs

@@ -1,6 +1,6 @@
 {
   "name": "isp",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "International Situations Project (ISP)",
   "private": true,
   "directories": {