chore: squash merge master into epic branch

commit a3dbb9f
Author: Jan Henrik Øverland <jan@dhis2.org>
Date:   Mon Nov 11 14:46:30 2019 +0100

    feat: use layout rules for add-to-layout ui (#362)

    * feat: generate add to layout button/menu based on rules

    * feat: refactor logic to use rules

    * upgrade @dhis2/analytics dep

    * tmp fix add to button tests

    * TODO fix tests

    * remove comment

    * replace local fn with analytics fn

    * todo: tmp commented out tests

    * remove folder

commit d6ba4a3
Author: Jan Henrik Øverland <jan@dhis2.org>
Date:   Mon Nov 11 14:09:50 2019 +0100

    refactor: use dimension menu from @dhis2/analytics (#364)

    * refactor: Use DimensionMenu and rules logic from @dhis2/analytics for all occurrences of such duplicated menus

    * refactor: upgraded @dhis2/analytics to v2.5.1

commit 204fe7a
Author: Jan Henrik Overland <janhenrik.overland@gmail.com>
Date:   Tue Nov 5 14:02:06 2019 +0100

    fix: use axisName instead of axisKey

commit dd8b563
Author: Martin <martin@moid.se>
Date:   Tue Nov 5 11:22:22 2019 +0100

    updated analytics repo (#363)

commit 8c0ed13
Author: Martin <martin@moid.se>
Date:   Tue Nov 5 11:20:18 2019 +0100

    fix: changed height to min-height for the axes area (#361)

commit 74edb3c
Author: Viktor Varland <viktor@dhis2.org>
Date:   Thu Oct 24 19:39:35 2019 +0200

    chore(deps): upgrade d2-i18n(-generate) deps (master) (#359)

    * chore(deps): upgrade d2-i18n(-generate) deps (master)

    * chore(deps): update i18n for packages

commit 4bcb913
Author: @dhis2-bot <apps@dhis2.org>
Date:   Thu Oct 24 12:22:35 2019 +0200

    chore(translations): sync Russian translations from transifex (master)

    Automatically merged to resolve the avalance

commit 2941ee9
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:24 2019 +0200

    chore(translations): sync Arabic translations from transifex (master)

    Automatically merged to resolve the avalance

commit 6067063
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:21 2019 +0200

    chore(translations): sync Danish translations from transifex (master)

    Automatically merged to resolve the avalance

commit 5f8ec50
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:19 2019 +0200

    chore(translations): sync Spanish translations from transifex (master)

    Automatically merged to resolve the avalance

commit ee07b7b
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:16 2019 +0200

    chore(translations): sync PersianAfghanistan translations from transifex (master)

    Automatically merged to resolve the avalance

commit 3e5ab95
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:14 2019 +0200

    chore(translations): sync French translations from transifex (master)

    Automatically merged to resolve the avalance

commit 754984e
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:11 2019 +0200

    chore(translations): sync Indonesian translations from transifex (master)

    Automatically merged to resolve the avalance

commit b0c23c8
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:07 2019 +0200

    chore(translations): sync Lao translations from transifex (master)

    Automatically merged to resolve the avalance

commit e1531d0
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:02:01 2019 +0200

    chore(translations): sync Burmese translations from transifex (master)

    Automatically merged to resolve the avalance

commit 9af084b
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:58 2019 +0200

    chore(translations): sync Pushto translations from transifex (master)

    Automatically merged to resolve the avalance

commit 21f72cb
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:56 2019 +0200

    chore(translations): sync Portuguese translations from transifex (master)

    Automatically merged to resolve the avalance

commit e0d1207
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:53 2019 +0200

    chore(translations): sync PortugueseBrazil translations from transifex (master)

    Automatically merged to resolve the avalance

commit a9c2ace
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:51 2019 +0200

    chore(translations): sync Swedish translations from transifex (master)

    Automatically merged to resolve the avalance

commit 8e8e467
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:49 2019 +0200

    chore(translations): sync TetumTetun translations from transifex (master)

    Automatically merged to resolve the avalance

commit cdce03b
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:46 2019 +0200

    chore(translations): sync Tajik translations from transifex (master)

    Automatically merged to resolve the avalance

commit a63b9ec
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:44 2019 +0200

    chore(translations): sync Ukrainian translations from transifex (master)

    Automatically merged to resolve the avalance

commit c37f5a2
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:42 2019 +0200

    chore(translations): sync Urdu translations from transifex (master)

    Automatically merged to resolve the avalance

commit bbc8ebf
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:39 2019 +0200

    chore(translations): sync Vietnamese translations from transifex (master)

    Automatically merged to resolve the avalance

commit 8c5b0c7
Author: @dhis2-bot <apps@dhis2.org>
Date:   Wed Oct 23 15:01:36 2019 +0200

    chore(translations): sync Chinese translations from transifex (master)

    Automatically merged to resolve the avalance

package.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "devDependencies": {
         "@dhis2/d2-i18n-extract": "^1.0.6",
-        "@dhis2/d2-i18n-generate": "^1.0.18",
+        "@dhis2/d2-i18n-generate": "^1.1.1",
         "babel-preset-env": "^1.6.1",
         "babel-preset-stage-0": "^6.24.1",
         "create-react-class": "^15.6.3",