Merge commit 'c8290bbcf8320dc795f41f99933e05f4de16ef2b'

# Conflicts:
#	package-lock.json
#	package.json

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 sudo: true
 node_js:
-  - "6"
   - "8"
 dist: trusty
 before_install: if [[ `npm -v` < 3 ]]; then npm i -g npm@latest; fi

CHANGELOG.md

@@ -2,7 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-[Unreleased]
+[1.69.0] - 2018-07-19
+---------------------
+##### Removed 
+- NodeJS 6 support.
+
+##### Added
+- Support for 'no-ticks' appearance in range widget.
+
+##### Fixed
+- Range widget in FF, the ticks partially disappear when the widget has a value.
+- Randomize() doesn't work for itemsets that use itext() labels (in enketo-transformer).
+- An architectural issue with modal dialogs.
+
+[1.68.0] - 2018-07-11
 ---------------------
 ##### Added
 - api/v2/version endpoint to obtain current Enketo Express version.
@@ -13,6 +26,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ##### Fixed
 - The form width in IE11 is sometimes too small.
+- Exceptions thrown with complex jr:choice-name() usage.
+- Various Geo Widget styling issues with buttons, mobile (fullscreen) and RTL scripts.
 
 [1.67.1] - 2018-06-27
 ---------------------

Gruntfile.js

@@ -31,6 +31,7 @@ module.exports = grunt => {
         },
         sass: {
             options: {
+                implementation: nodeSass,
                 functions: {
                     'base64-url($mimeType, $data)': function( mimeType, data ) {
                         const base64 = new Buffer( data.getValue() ).toString( 'base64' );
@@ -161,7 +162,7 @@ module.exports = grunt => {
                 },
             },
             options: {
-                // ensure that enketo-config and widgets are overridden in **enketo-core**
+                // ensure that several placeholder modules in **enketo-core** are overridden 
                 transform: [
                     [ 'aliasify', {
                         aliases: pkg.aliasify.aliases,

README.md

@@ -19,7 +19,7 @@ This is a fork of [enketo/enketo-express](https://github.com/enketo/enketo-expre
 
 #### Manually:
 
-1. Install JS prerequisites: [Node.js](https://github.com/nodesource/distributions) (8.x LTS recommended, and at least 6.x), [Grunt Client](http://gruntjs.com), and [Node-Gyp](https://github.com/TooTallNate/node-gyp)
+1. Install JS prerequisites: [Node.js](https://github.com/nodesource/distributions) (8.x LTS recommended), [Grunt Client](http://gruntjs.com), and [Node-Gyp](https://github.com/TooTallNate/node-gyp)
 2. Install [Redis](http://redis.io/topics/quickstart)
 3. Install build-essential and git (and libfontconfig to run tests) with `(sudo) apt-get install build-essential git libfontconfig`
 4. Clone this repository

app/views/styles/component/_buttons.scss

@@ -20,7 +20,7 @@ $button-sml: 10px !default;
 $button-med: 16px !default;
 
 // We use this to control the display property.
-$button-display: inline-block !default;
+$button-display: flex !default;
 $button-margin-bottom: 16px !default;
 
 // We use these to control button text styles.
@@ -78,6 +78,8 @@ $button-disabled-cursor: $cursor-default-value !default;
         text-align: $button-font-align;
         -webkit-appearance: none;
         -webkit-border-radius: 0;
+        align-items: center;
+        justify-content: center;
     }
 
     @if $display {
@@ -229,6 +231,7 @@ button::-moz-focus-inner {
     color: $text-color;
     background: none;
     border: none;
+    font-size: 20px;
 
     @include box-shadow-none;
 
@@ -289,7 +292,8 @@ button::-moz-focus-inner {
 }
 
 .add-repeat-btn,
-.repeat-buttons .remove {
+.repeat-buttons .remove,
+.geopicker [name="geodetect"] {
     .icon {
         margin-right: 0;
     }

locales/es/translation.json

@@ -290,6 +290,7 @@
         "pl": "Polaco",
         "pt": "Portugués",
         "ro": "Rumano",
+        "ru": "Ruso",
         "sk": "Eslovaco",
         "supported": "Idiomas soportados:",
         "sv": "Sueco",

locales/nl/translation.json

@@ -290,6 +290,7 @@
         "pl": "Pools",
         "pt": "Portugees",
         "ro": "Roemeens",
+        "ru": "Russisch",
         "sk": "Slowaaks",
         "supported": "Talen ondersteund:",
         "sv": "Zweeds",

locales/ru/translation.json

@@ -290,6 +290,7 @@
         "pl": "Польский",
         "pt": "Португальский",
         "ro": "Румынский",
+        "ru": "Русский",
         "sk": "Словацкий ",
         "supported": "Поддерживаемые языки:",
         "sv": "Шведский",