Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 54be7c3
Author: Jen Jones Arnesen <[email protected]>
Date:   Thu Sep 24 13:44:06 2020 +0200

    fix: dashboard filter - filter dialog incorrectly shows filter as selected even though it was removed [DHIS2-9560] (#1074)

    The FilterDialog component was always rendered, because FilterSelector is always rendered in the ViewTitleBar. That meant that the filter state was never reset, causing previous item filter to still show.

    Fix includes:

    * only render the FilterDialog if there is a selected dimension
    * move item handling (onSelect, onDeselect...) to the FilterDialog. Since FilterDialog is removed when closed, it will be able to pick up the current state from redux in the useState statement when reopened.

commit 5a0b3b2
Author: Jen Jones Arnesen <[email protected]>
Date:   Thu Sep 24 11:35:39 2020 +0200

    Revert "fix: use better spacing in item title when the title wraps to multiple lines (#1099)" (#1112)

    This reverts commit f76ed0e.

commit f76ed0e
Author: Jen Jones Arnesen <[email protected]>
Date:   Thu Sep 24 10:33:16 2020 +0200

    fix: use better spacing in item title when the title wraps to multiple lines (#1099)

commit b01a670
Author: @dhis2-bot <[email protected]>
Date:   Thu Sep 24 01:41:12 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit db98d5c
Author: Jan Henrik Øverland <[email protected]>
Date:   Wed Sep 23 14:58:55 2020 +0200

    fix: upgrade plugin and analytics (#1105)

commit 050c052
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 23 04:22:00 2020 +0000

    chore(deps): bump @dhis2/d2-ui-interpretations from 7.0.7 to 7.0.8 (#1103)

commit 35e0e51
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 23 04:13:55 2020 +0000

    chore(deps): bump @dhis2/d2-ui-sharing-dialog from 7.0.7 to 7.0.8 (#1101)

commit e356864
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 23 04:04:53 2020 +0000

    chore(deps): bump @dhis2/data-visualizer-plugin (#1102)

commit 1922df8
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 23 03:56:38 2020 +0000

    chore(deps): bump @dhis2/analytics from 11.0.5 to 11.0.6 (#1100)

commit 763881b
Author: Jen Jones Arnesen <[email protected]>
Date:   Tue Sep 22 16:06:03 2020 +0200

    fix: set passive to true for scroll event listener in ProgressiveLoadingContainer [DHIS2-9508] (#1084)

    A minor optimization that probably won't have much impact on the performance, but nevertheless doesn't have a negative impact.

    Changes include:

    * do not add eventListener on the window
    * set passive: true on the event listener (see explanation here: https://web.dev/uses-passive-event-listeners/?utm_source=lighthouse&utm_medium=devtools)

commit b1d7fab
Author: Martin <[email protected]>
Date:   Tue Sep 22 10:38:38 2020 +0200

    fix: bump Analytics to v11.0.5 and DV plugin to latest (#1097)

commit 0a41693
Author: @dhis2-bot <[email protected]>
Date:   Tue Sep 22 01:40:48 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit c7ad13f
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 17:27:25 2020 +0000

    chore(deps): bump @dhis2/app-runtime from 2.2.2 to 2.3.0 (#1090)

commit 0b8606f
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 17:19:15 2020 +0000

    chore(deps): bump @dhis2/d2-ui-rich-text from 7.0.7 to 7.0.8 (#1086)

commit 95b2de6
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 17:10:14 2020 +0000

    chore(deps): bump @dhis2/ui from 5.5.6 to 5.6.1 (#1087)

commit b80d100
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 17:01:04 2020 +0000

    chore(deps): bump @dhis2/d2-ui-translation-dialog from 7.0.7 to 7.0.8 (#1089)

commit ea41e00
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 21 16:52:49 2020 +0000

    chore(deps): bump @dhis2/d2-ui-mentions-wrapper from 7.0.7 to 7.0.8 (#1085)

commit 147000e
Author: Jen Jones Arnesen <[email protected]>
Date:   Mon Sep 21 16:20:00 2020 +0200

    fix: unmount map when switching dashboard mode or changing active type [DHIS2-9558] (#1083)

    * fix: call unmount when Plugin unmounts

    * fix: unmount already called when switching vis

commit f573db0
Author: Edoardo Sabadelli <[email protected]>
Date:   Mon Sep 21 10:25:47 2020 +0200

    fix: filter bar position (DHIS2-9453) (#1073)

    * fix: filter bar position (DHIS2-9453)

    The calculation of the position of the filter bar was based on the
    height of the control bar.
    After the change for the scrollbar, the filter bar was positioned lower
    than where it should have.
    Removing the height of the control bar from the top position of the
    filter bar puts it back in the right place.

    * chore: explain the FilterBar top position value

    Co-authored-by: Jan Henrik Øverland <[email protected]>

commit 491d592
Author: @dhis2-bot <[email protected]>
Date:   Sun Sep 20 01:40:45 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit 7a03b07
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 16 05:25:45 2020 +0000

    chore(deps): bump @dhis2/ui from 5.5.5 to 5.5.6 (#1072)

commit 96f50f2
Author: Jen Jones Arnesen <[email protected]>
Date:   Tue Sep 15 14:37:06 2020 +0200

    fix: use hooks to exert finer control on setting dashboard [DHIS2-9508] (#1067)

    Redux actions were being executed multiple times unnecessarily because of changes in props that had nothing to do with whether the dashboard needed to be set.

    Implementation is a switch to using useEffect rather than class componentDidMount and componentDidUpdate.

    Additional change includes moving print constants to a single file

commit a0a7365
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 14 17:07:44 2020 +0000

    chore(deps): bump @dhis2/analytics from 10.0.3 to 10.0.5 (#1070)

commit b640761
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Sep 14 16:59:21 2020 +0000

    chore(deps-dev): bump @dhis2/cli-app-scripts from 5.1.0 to 5.2.0 (#1068)

commit 7badec8
Author: @dhis2-bot <[email protected]>
Date:   Thu Sep 10 01:40:35 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.

commit d6e27e9
Author: Jen Jones Arnesen <[email protected]>
Date:   Wed Sep 9 09:12:49 2020 +0200

    fix: remove unhelpful warning (#1064)

commit e236a1d
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 9 04:36:17 2020 +0000

    chore(deps): bump @dhis2/d2-ui-sharing-dialog from 7.0.5 to 7.0.7 (#1063)

commit 0a39eb7
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 9 03:50:29 2020 +0000

    chore(deps): bump @dhis2/d2-ui-mentions-wrapper from 7.0.5 to 7.0.7 (#1061)

commit 5ec2d52
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 9 03:43:12 2020 +0000

    chore(deps): bump @dhis2/d2-ui-rich-text from 7.0.5 to 7.0.7 (#1062)

commit f7519d7
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 9 03:35:26 2020 +0000

    chore(deps): bump @dhis2/d2-ui-translation-dialog from 7.0.5 to 7.0.7 (#1060)

commit 6187c11
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 9 03:28:05 2020 +0000

    chore(deps): bump @dhis2/ui from 5.5.4 to 5.5.5 (#1059)

commit d5b7e03
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Sep 9 03:19:35 2020 +0000

    chore(deps): bump @dhis2/d2-ui-core from 7.0.5 to 7.0.7 (#1058)

commit 6a2bb23
Author: @dhis2-bot <[email protected]>
Date:   Wed Sep 9 01:40:33 2020 +0200

    fix(translations): sync translations from transifex (master)

    Automatically merged.
  • Loading branch information
janhenrikoverland committed Sep 24, 2020
1 parent fc00558 commit 7f418ac
Show file tree
Hide file tree
Showing 44 changed files with 800 additions and 748 deletions.
28 changes: 15 additions & 13 deletions i18n/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2020-08-31T08:37:42.542Z\n"
"POT-Creation-Date: 2020-09-08T17:54:39.674Z\n"
"PO-Revision-Date: 2019-06-25 12:37+0000\n"
"Last-Translator: Viktor Varland <[email protected]>, 2020\n"
"Language-Team: Arabic (https://www.transifex.com/hisp-uio/teams/100509/ar/)\n"
Expand Down Expand Up @@ -81,28 +81,27 @@ msgstr ""
msgid "Print"
msgstr "طباعة"

msgid ""
"The pages below are a preview of how the dashboard layout will be printed."
msgid "dashboard layout"
msgstr ""

msgid ""
"The pages below are a preview of how each dashboard item will be printed on "
"a separate page."
msgid "one item per page"
msgstr ""

msgid ""
"Use the default printer settings for best results and check that all "
"dashboard items have finished loading before printing. This text will not be"
" printed."
msgid "Print Preview"
msgstr ""

msgid "dashboard layout"
msgid "For best print results"
msgstr ""

msgid "one item per page"
msgid "Use Chrome or Edge web browser"
msgstr ""

msgid "Print Preview"
msgid "Wait for all dashboard items to load before printing"
msgstr ""

msgid ""
"Use A4 landscape paper size and default margin settings in the browser print"
" dialog"
msgstr ""

msgid "{{count}} selected"
Expand All @@ -120,6 +119,9 @@ msgstr "إزالة"
msgid "Delete item"
msgstr "حذف العنصر"

msgid "This item has been shortened to fit on one page"
msgstr ""

msgid "Messages"
msgstr "الرسائل"

Expand Down
28 changes: 15 additions & 13 deletions i18n/ar_IQ.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2020-08-31T08:37:42.542Z\n"
"POT-Creation-Date: 2020-09-08T17:54:39.674Z\n"
"PO-Revision-Date: 2019-06-25 12:37+0000\n"
"Last-Translator: KRG HIS <[email protected]>, 2020\n"
"Language-Team: Arabic (Iraq) (https://www.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n"
Expand Down Expand Up @@ -79,28 +79,27 @@ msgstr ""
msgid "Print"
msgstr ""

msgid ""
"The pages below are a preview of how the dashboard layout will be printed."
msgid "dashboard layout"
msgstr ""

msgid ""
"The pages below are a preview of how each dashboard item will be printed on "
"a separate page."
msgid "one item per page"
msgstr ""

msgid ""
"Use the default printer settings for best results and check that all "
"dashboard items have finished loading before printing. This text will not be"
" printed."
msgid "Print Preview"
msgstr ""

msgid "dashboard layout"
msgid "For best print results"
msgstr ""

msgid "one item per page"
msgid "Use Chrome or Edge web browser"
msgstr ""

msgid "Print Preview"
msgid "Wait for all dashboard items to load before printing"
msgstr ""

msgid ""
"Use A4 landscape paper size and default margin settings in the browser print"
" dialog"
msgstr ""

msgid "{{count}} selected"
Expand All @@ -118,6 +117,9 @@ msgstr "إزالة"
msgid "Delete item"
msgstr "حذف العنصر"

msgid "This item has been shortened to fit on one page"
msgstr ""

msgid "Messages"
msgstr "الرسائل"

Expand Down
Loading

0 comments on commit 7f418ac

Please sign in to comment.