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

Feature/764 background layer info #808

Merged
merged 21 commits into from
Aug 31, 2021
Merged

Feature/764 background layer info #808

merged 21 commits into from
Aug 31, 2021

Commits on May 6, 2021

  1. Updates to allow for settings and information to be displayed for bac… 

    …kground layers
    @hitomin21
    hitomin21 committed May 6, 2021
    Configuration menu
    Copy the full SHA
    bf997b9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/764-background-layer-info 

    # Conflicts:
#	new-client/src/plugins/LayerSwitcher/components/BackgroundSwitcher.js
    @hitomin21
    hitomin21 committed May 6, 2021
    Configuration menu
    Copy the full SHA
    33746a7 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. Removed extra line that was shown when displaying background layers i… 

    …n layerswitcher
    @hitomin21
    hitomin21 committed May 7, 2021
    Configuration menu
    Copy the full SHA
    ee72a29 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. Merge branch 'develop' into feature/764-background-layer-info 

    # Conflicts:
#	new-client/src/plugins/LayerSwitcher/components/LayerItem.js
    @hitomin21
    hitomin21 committed May 10, 2021
    Configuration menu
    Copy the full SHA
    0904dac View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. removed unnecessary props

    @hitomin21
    hitomin21 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    f026ffe View commit details
    Browse the repository at this point in the history

Commits on May 28, 2021

  1. Modified init of osmlayer to remove need of using an array

    @hitomin21
    hitomin21 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    3486a1f View commit details
    Browse the repository at this point in the history

  2. Added so osmlayer is not inited if osmlayer is disabled

    @hitomin21
    hitomin21 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    1cf7059 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Fixed two warnings in the code and removed the left margin for backgr… 

    …ound layers
    @hitomin21
    hitomin21 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    83393e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. Merge branch 'develop' of github.com:hajkmap/Hajk into feature/764-ba… 

    …ckground-layer-info

# Conflicts:
#	new-client/package-lock.json
    @jesade-vbg
    jesade-vbg committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    ffb4385 View commit details
    Browse the repository at this point in the history

  2. Added a tiny pixel

    @jesade-vbg
    jesade-vbg committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    81b2d9e View commit details
    Browse the repository at this point in the history

  3. Fixed Prettier errors.

    @jesade-vbg
    jesade-vbg committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    618c39c View commit details
    Browse the repository at this point in the history

  4. Fixed Prettier errors

    @jesade-vbg
    jesade-vbg committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    1948af8 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Prettier....

    @jesade-vbg
    jesade-vbg committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    7f1a642 View commit details
    Browse the repository at this point in the history

  2. trying to fix prettier

    @hitomin21
    hitomin21 committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    fd5d410 View commit details
    Browse the repository at this point in the history

  3. prettier fix on admin

    @hitomin21
    hitomin21 committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    22af961 View commit details
    Browse the repository at this point in the history

  4. admin prettier

    @hitomin21
    hitomin21 committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    9ae5837 View commit details
    Browse the repository at this point in the history

  5. formatting

    @hitomin21
    hitomin21 committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    7904a21 View commit details
    Browse the repository at this point in the history

  6. formatting for remaining files

    @hitomin21
    hitomin21 committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    a6673fc View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Reverted prettier changes

    @hitomin21
    hitomin21 committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    e87f706 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. Merge remote-tracking branch 'origin/develop' into feature/764-backgr… 

    …ound-layer-info
    @Hallbergs
    Hallbergs committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    aac2187 View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @Hallbergs
    Hallbergs committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    6678826 View commit details
    Browse the repository at this point in the history