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

Interactive map, including OKAPI-based style markers #2185

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

Interactive map, including OKAPI-based style markers #2185

wants to merge 21 commits into from

Commits on Jul 15, 2020

  1. Interactive Map: validation ready

    @rapotek
    rapotek committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    36efbca View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Interactive Map with OKAPI-based style icons: validation ready

    @rapotek
    rapotek committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    7ce34c3 View commit details
    Browse the repository at this point in the history

  2. Map config unnecessary entry removed

    @rapotek
    rapotek committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    6120e73 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2021

  1. Some PHP files are modified to be (hopefully) more compliant with PSR… 

    …-12. With a dedication for deg-pl
    @rapotek
    rapotek committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    f7dc331 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2021

  1. Resolve lib/language/en.php conflict

    @rapotek
    rapotek committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    9a6b179 View commit details
    Browse the repository at this point in the history

  2. Resolve lib/language/en.php conflict, continuation

    @rapotek
    rapotek committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    8b596c6 View commit details
    Browse the repository at this point in the history

  3. Resolve lib/language/en.php conflict, once more

    @rapotek
    rapotek committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    ef0b0c1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into interactive_map_okapi_markers

    @rapotek
    rapotek authored Jan 24, 2021
    Configuration menu
    Copy the full SHA
    2b7f06b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2021

  1. php-cs-fixer compliant changes, excluding GeoCache, GeoCacheCommons a… 

    …nd GeoCacheLogCommons; controller code further reduced; some templates gathered in one to reduce code redundancy
    @rapotek
    rapotek committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    c911b31 View commit details
    Browse the repository at this point in the history

  2. Resolved en.php merge conflict

    @rapotek
    rapotek committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    b0c3db6 View commit details
    Browse the repository at this point in the history

  3. Models Neighbourhood formatted after merge

    @rapotek
    rapotek committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    9b08c3e View commit details
    Browse the repository at this point in the history

  4. Style fixes after php-cs-fixer upgrade to 2.18.5

    @rapotek
    rapotek committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    bbbeaad View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2022

  1. Master merged, conflicts resolved, noticed settings/config inconsiste… 

    …ncy fixed
    @rapotek
    rapotek committed Jan 23, 2022
    Configuration menu
    Copy the full SHA
    ec941ab View commit details
    Browse the repository at this point in the history

  2. GeoCache and MyNbhSets php-cs fixed

    @rapotek
    rapotek committed Jan 23, 2022
    Configuration menu
    Copy the full SHA
    55b24d8 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. Master merged to resolve conflicts

    @rapotek
    rapotek committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    fb20f6d View commit details
    Browse the repository at this point in the history

  2. Style fixes in interactiveMap.tpl.php

    @rapotek
    rapotek committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    16cd0b3 View commit details
    Browse the repository at this point in the history

  3. GeoCacheLogCommons style fixed

    @rapotek
    rapotek committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    20536ad View commit details
    Browse the repository at this point in the history

  4. GeoCacheLogCommons style fixed once more

    @rapotek
    rapotek committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    c7a33e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

  1. php-cs-fixer execution permission revoked

    @rapotek
    rapotek committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    f86debc View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Neighbourhood.php updated to be compliant with last master changes; V… 

    …iew and Api controllers separated
    @rapotek
    rapotek committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8083a06 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into interactive_map_okapi_markers

    @rapotek
    rapotek authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c2b3c4d View commit details
    Browse the repository at this point in the history