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.

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

Interactive map, including OKAPI-based style markers #2185

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
36efbca
Interactive Map: validation ready
rapotek Jul 10, 2020
7ce34c3
Interactive Map with OKAPI-based style icons: validation ready
rapotek Jul 20, 2020
6120e73
Map config unnecessary entry removed
rapotek Aug 18, 2020
f7dc331
Some PHP files are modified to be (hopefully) more compliant with PSR…
rapotek Jan 19, 2021
9a6b179
Resolve lib/language/en.php conflict
rapotek Jan 24, 2021
8b596c6
Resolve lib/language/en.php conflict, continuation
rapotek Jan 24, 2021
ef0b0c1
Resolve lib/language/en.php conflict, once more
rapotek Jan 24, 2021
2b7f06b
Merge branch 'master' into interactive_map_okapi_markers
rapotek Jan 24, 2021
c911b31
php-cs-fixer compliant changes, excluding GeoCache, GeoCacheCommons a…
rapotek Apr 16, 2021
b0c3db6
Resolved en.php merge conflict
rapotek Apr 16, 2021
9b08c3e
Models Neighbourhood formatted after merge
rapotek Apr 16, 2021
bbbeaad
Style fixes after php-cs-fixer upgrade to 2.18.5
rapotek Apr 16, 2021
ec941ab
Master merged, conflicts resolved, noticed settings/config inconsiste…
rapotek Jan 23, 2022
55b24d8
GeoCache and MyNbhSets php-cs fixed
rapotek Jan 23, 2022
fb20f6d
Master merged to resolve conflicts
rapotek Jul 12, 2022
16cd0b3
Style fixes in interactiveMap.tpl.php
rapotek Jul 12, 2022
20536ad
GeoCacheLogCommons style fixed
rapotek Jul 12, 2022
c7a33e0
GeoCacheLogCommons style fixed once more
rapotek Jul 12, 2022
f86debc
php-cs-fixer execution permission revoked
rapotek Jul 18, 2022
8083a06
Neighbourhood.php updated to be compliant with last master changes; V…
rapotek Oct 16, 2024
c2b3c4d
Merge branch 'master' into interactive_map_okapi_markers
rapotek Oct 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions lib/languages/en.php
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,9 @@
'myn_addarea_info' => 'You can define more neighbourhoods that you watch',
'myn_cacheitems_lbl' => 'The number of caches and logs displayed',
'myn_style_lbl' => 'My Neighbourhood style',
'myn_family_lbl' => 'A style of map icons',
'myn_family_named_simple' => 'Simple',
'myn_family_named_okapi' => 'Okapi',
'myn_log_txt' => 'Log content',
'myn_style_full' => 'Full',
'myn_style_min' => 'Minimalistic',
Expand Down Expand Up @@ -3227,4 +3230,7 @@
'cache_approval_no_caches' => 'No geocaches waiting to be accepted',
'cache_approval_changed_time' => 'status changed',
'cache_approval_cache_invalid' => 'Cache "%s" is not valid for approval actions',

'map_popup_next' => 'Next',
'map_popup_previous' => 'Previous',
];
Binary file added public/images/map_markers/background_layer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/map_markers/okapi/cache/large_other.png
Loading