Merge remote-tracking branch 'origin/develop'

.travis.yml

@@ -18,9 +18,6 @@ matrix:
   - node_js: stable
   include:
   # Run everything with v5 (match production)
-  # Skip e2e test during mustang build
-  #- node_js: 5
-  #  env: TEST_SUITE=e2e
   - node_js: 5
     env: TEST_SUITE=lint
   - node_js: 5

README.md

@@ -104,21 +104,14 @@ To build with the mock backend service, run `gulp build --mock-backend`.
 
 #### Running unit specs
 
-To run unit tests run:
+To run unit tests once, run:
 ```
 gulp test
 ```
 
-To run end-to-end integration tests run:
-
-```
-gulp build --mock-backend
-gulp node-server # <- might need to run this in another window
-npm run protractor
-```
-
 For test driven development we have a gulp task `gulp tdd`. This watches for JS changes and re-runs the unit tests.
 
+
 ### Native Server (Apache or Nginx)
 
 If you are running the client with a native web server like Apache or nginx, you will need to use URL rewriting to point all non-existant files to `index.html`. There is a sample `.htaccess` file, which can be used with Apache:

app/common/services/maps.js

@@ -10,7 +10,7 @@ function Maps(ConfigEndpoint, L, _, CONST) {
                 layerOptions: {
                     apikey: CONST.MAPBOX_API_KEY,
                     mapid: 'mapbox.satellite',
-                    attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>, &copy; <a href="https://www.mapbox.com/about/maps/"">Mapbox</a>'
+                    attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>, &copy; <a href="https://www.mapbox.com/about/maps/"">Mapbox</a> | <a href="https://www.mapbox.com/feedback/" target="_blank">Improve the underlying map</a>'
                 }
             },
             streets: {
@@ -19,14 +19,14 @@ function Maps(ConfigEndpoint, L, _, CONST) {
                 layerOptions: {
                     apikey: CONST.MAPBOX_API_KEY,
                     mapid: 'mapbox.streets',
-                    attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>, &copy; <a href="https://www.mapbox.com/about/maps/"">Mapbox</a>'
+                    attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>, &copy; <a href="https://www.mapbox.com/about/maps/"">Mapbox</a> | <a href="https://www.mapbox.com/feedback/" target="_blank">Improve the underlying map</a>'
                 }
             },
             hOSM: {
                 name: 'Humanitarian',
                 url: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
                 layerOptions: {
-                    attribution: 'Map data &copy; <a href="http://osm.org/copyright">OpenStreetMap</a>, Tiles <a href="http://hot.openstreetmap.org/">Humanitarian OpenStreetMap Team</a>'
+                    attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>, &copy; <a href="http://hot.openstreetmap.org/">Humanitarian OpenStreetMap</a> | <a href="https://www.mapbox.com/feedback/" target="_blank">Improve the underlying map</a>'
                 }
             }
         }

app/main/posts/views/mode-context-form-filter.html

@@ -38,7 +38,7 @@
             <li><a translate="post.hide_form" translate-values="{ form: form.name }" ng-click="hide(form.id)">Hide</a></li>
             <div class="divider"></div>
             <li ng-show="hasManageSettingsPermission()">
-                <a ng-href="/settings/surveys/{{ form.id }}">
+                <a ng-href="/settings/surveys/edit/{{ form.id }}">
                     <svg class="iconic">
                         <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#cog"></use>
                     </svg>