Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ej/background map selection #744

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Ej/background map selection #744

wants to merge 60 commits into from

Commits on Jun 28, 2023

  1. Revert "add SettingsMenu tabs component (WIP)" 

    This reverts commit 9a478ed.
    @lightlii
    lightlii committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    108cf02 View commit details
    Browse the repository at this point in the history

  2. Revert "add settings menu tab" 

    This reverts commit fd8a0ba.
    @lightlii
    lightlii committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    8fbdd3f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Merge branch 'master' of github.com:digidem/mapeo-desktop

    @lightlii
    lightlii committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    5f7d37d View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge branch 'master' of github.com:digidem/mapeo-desktop

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    7fed094 View commit details
    Browse the repository at this point in the history

  2. add settingsmenu component

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    91b89ec View commit details
    Browse the repository at this point in the history

  3. better menu styling

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    e51c12d View commit details
    Browse the repository at this point in the history

  4. Revert "Revert "add SettingsMenu tabs component (WIP)"" 

    This reverts commit 108cf02.
    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    b35e0ef View commit details
    Browse the repository at this point in the history

  5. fix breaks from bad merge (/revert order)

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    9342e17 View commit details
    Browse the repository at this point in the history

  6. chore: better jsdoc typing

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    467263f View commit details
    Browse the repository at this point in the history

  7. chore: add better typing

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    e44e678 View commit details
    Browse the repository at this point in the history

  8. chore: more improved typing

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    3ea703b View commit details
    Browse the repository at this point in the history

  9. add experiments menu

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    6ebab38 View commit details
    Browse the repository at this point in the history

  10. chore: usability improvements to settings list items

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    f39b76b View commit details
    Browse the repository at this point in the history

  11. autogenerated translations file

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    9bfeb19 View commit details
    Browse the repository at this point in the history

  12. add experiments menu

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    bab7bcc View commit details
    Browse the repository at this point in the history

  13. chore: add ExperimentsMenu types

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    2e1d547 View commit details
    Browse the repository at this point in the history

  14. chore: styling fixes

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    80ff041 View commit details
    Browse the repository at this point in the history

  15. chore: integrate background maps settings menu

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    9f9e086 View commit details
    Browse the repository at this point in the history

  16. autogenerated translations file

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    398178d View commit details
    Browse the repository at this point in the history

  17. add experiments menu

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    1e283fe View commit details
    Browse the repository at this point in the history

  18. chore: usability improvements to settings list items

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    47c9d61 View commit details
    Browse the repository at this point in the history

  19. add experiments menu

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    b3ee3dd View commit details
    Browse the repository at this point in the history

  20. remove redundant translation

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    290569e View commit details
    Browse the repository at this point in the history

  21. chore: add mapstyle deletion

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    f46cd69 View commit details
    Browse the repository at this point in the history

  22. fix: restore selectMbTileFile functionality

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    22c5935 View commit details
    Browse the repository at this point in the history

  23. chore: internationalise 'Import File' label

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    bd00458 View commit details
    Browse the repository at this point in the history

  24. chore: disable continuous querying and call refresh when new style is… 

    … added
    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    16257b2 View commit details
    Browse the repository at this point in the history

  25. chore: add error handling when importing map style

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    ffb723a View commit details
    Browse the repository at this point in the history

  26. chore: auto-gen translation file

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    2ea6977 View commit details
    Browse the repository at this point in the history

  27. fix: remove merge-duplication

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    5c1ac88 View commit details
    Browse the repository at this point in the history

  28. chore: auto-gen translation file

    @lightlii
    lightlii committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    9fd494e View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge branch 'master' of github.com:digidem/mapeo-desktop

    @lightlii
    lightlii committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    7753f87 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ej/background-map-selection

    @lightlii
    lightlii committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    a27c04b View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. feat: add button to select current map

    @lightlii
    lightlii committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    4fd671f View commit details
    Browse the repository at this point in the history

  2. wip: add backgroundMap selector component to Observations view

    @lightlii
    lightlii committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    35472d3 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. chore: add background maps selector component. Currently with hardcod… 

    …ed data...
    @lightlii
    lightlii committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    8494d0e View commit details
    Browse the repository at this point in the history

  2. chore: remove hardcoded value (still WIP)

    @lightlii
    lightlii committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    be8a4d0 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Merge branch 'master' of github.com:digidem/mapeo-desktop

    @lightlii
    lightlii committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    99e3c16 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ej/background-map-selection

    @lightlii
    lightlii committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    96b4ef3 View commit details
    Browse the repository at this point in the history

  3. fix: restore setting persisted storage async

    @lightlii
    lightlii committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    b434580 View commit details
    Browse the repository at this point in the history

  4. fix: make saved types in config consistent

    @lightlii
    lightlii committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    06c68b8 View commit details
    Browse the repository at this point in the history

  5. fix: revert async await again (??) problem appears to be the format t… 

    …hat's being saved (JSON or string)
    @lightlii
    lightlii committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    c8c0848 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. fix: revert zustand serialisation stuf... persisted store working cor… 

    …rectly now
    @lightlii
    lightlii committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    6aa6578 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ej/fix-persisted-store' into ej/background-map-selection

    @lightlii
    lightlii committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    cc800ef View commit details
    Browse the repository at this point in the history

  3. feat: implement map selection

    @lightlii
    lightlii committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    879bfb3 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. fix: add key to Fragment in map

    @lightlii
    lightlii committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    70e3726 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:digidem/mapeo-desktop

    @lightlii
    lightlii committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e6fea7f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ej/background-map-selection

    @lightlii
    lightlii committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    0666a81 View commit details
    Browse the repository at this point in the history

  4. fix: remove unused inports

    @lightlii
    lightlii committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    610e745 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. fix: use fuill screen dialog for BackgroundMapSelector and fix overflow

    @lightlii
    lightlii committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    99d7450 View commit details
    Browse the repository at this point in the history

  2. fix: make style list in background maps screen scrollable

    @lightlii
    lightlii committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    0cc0147 View commit details
    Browse the repository at this point in the history

  3. fix: refactor hooks to simplify where styles data is coming from

    @lightlii
    lightlii committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    d07b385 View commit details
    Browse the repository at this point in the history

  4. fix: clean up unused variables

    @lightlii
    lightlii committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    472cfa1 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. fix: save full map style in store and get rid of lookp hook + more ti… 

    …dying up
    @lightlii
    lightlii committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    0f15556 View commit details
    Browse the repository at this point in the history

  2. fix: map use default style when backgroundmaps flagdisabled

    @lightlii
    lightlii committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    9b19b39 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Es/example of persisted state (#747) 

    * persisted state

* chore: translations

* chore: create default map export & adapt code

---------

Co-authored-by: lightlii <32508751+lightlii@users.noreply.github.com>
    @ErikSin @lightlii
    ErikSin and lightlii committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    c6b63ff View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. chore: make background maps description text translatable

    @lightlii
    lightlii committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    fbd5e4a View commit details
    Browse the repository at this point in the history

  2. chore: set default map when current map is deleted

    @lightlii
    lightlii committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    8a00112 View commit details
    Browse the repository at this point in the history

  3. chore: make map preview card non-interactive

    @lightlii
    lightlii committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    6012b8a View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. chore: remove log

    @lightlii
    lightlii committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    eb8e950 View commit details
    Browse the repository at this point in the history