rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

WIP: Resolve "Use bing maps" #1069

Draft
korina.cordero wants to merge 16 commits from 221-use-bing-maps into master
pull from: 221-use-bing-maps
merge into: rgutierrez:master
Conversation 15 Commits 16 Files changed 14 +403 -160
korina.cordero commented 2019-06-05 06:31:43 +00:00 (Migrated from gitlab.com)
Copy link

Closes #221

Closes #221
korina.cordero commented 2019-06-05 08:23:27 +00:00 (Migrated from gitlab.com)
Copy link

added 8 commits

  • 470e7ab9 - Add geofence menu to the acl and menu yaml files. #220
  • e574ae96 - Add geofence to menu under Location. Add list of saved coverage areas. #220
  • 9e9c59cd - Display supported areas in google map. #220
  • f2a18042 - Add upload KML feature for geofence. #220
  • 0f622940 - Use getClientOriginalExtension() for the file extensions for file upload. #220
  • eaf77fc6 - Add rows table to geofence page with Delete action. #220
  • b2e394d1 - Add highlighting of area in map and row when selecting an area. #220
  • 00f2bb86 - Use bing maps for geofencing. #221

Compare with previous version

added 8 commits <ul><li>470e7ab9 - Add geofence menu to the acl and menu yaml files. #220</li><li>e574ae96 - Add geofence to menu under Location. Add list of saved coverage areas. #220</li><li>9e9c59cd - Display supported areas in google map. #220</li><li>f2a18042 - Add upload KML feature for geofence. #220</li><li>0f622940 - Use getClientOriginalExtension() for the file extensions for file upload. #220</li><li>eaf77fc6 - Add rows table to geofence page with Delete action. #220</li><li>b2e394d1 - Add highlighting of area in map and row when selecting an area. #220</li><li>00f2bb86 - Use bing maps for geofencing. #221</li></ul> [Compare with previous version](https://gitlab.com/jankstudio/resq/merge_requests/258/diffs?diff_id=44160029&start_sha=782a41b6459f458147a80c9a1f20dea054883f5c)
korina.cordero commented 2019-06-06 07:20:30 +00:00 (Migrated from gitlab.com)
Copy link

added 33 commits

  • 00f2bb86...4359a8a9 - 31 commits from branch master
  • f14f1754 - Merge branch 'master' into 221-use-bing-maps
  • 612c9327 - Add interface and implementing classes for the maps. #221

Compare with previous version

added 33 commits <ul><li>00f2bb86...4359a8a9 - 31 commits from branch <code>master</code></li><li>f14f1754 - Merge branch &#39;master&#39; into 221-use-bing-maps</li><li>612c9327 - Add interface and implementing classes for the maps. #221</li></ul> [Compare with previous version](https://gitlab.com/jankstudio/resq/merge_requests/258/diffs?diff_id=44278780&start_sha=00f2bb86fa9ab3a24858a592cad40105730814cd)
korina.cordero commented 2019-06-07 00:37:01 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>fc75f144 - Add methods to mapmanagers. #221</li></ul> [Compare with previous version](https://gitlab.com/jankstudio/resq/merge_requests/258/diffs?diff_id=44378621&start_sha=612c9327d6569751c475b43ebfcb6efa763eed8c)
korina.cordero commented 2019-06-07 00:40:03 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>c980b30e - Add methods to interface. #221</li></ul> [Compare with previous version](https://gitlab.com/jankstudio/resq/merge_requests/258/diffs?diff_id=44378677&start_sha=fc75f14464a24d66b9e7078696f752198a52151b)
korina.cordero commented 2019-06-10 04:55:02 +00:00 (Migrated from gitlab.com)
Copy link

added 15 commits

  • c980b30e...9a7f5ab8 - 14 commits from branch master
  • 3ed9b1bf - Merge branch 'master' into 221-use-bing-maps

Compare with previous version

added 15 commits <ul><li>c980b30e...9a7f5ab8 - 14 commits from branch <code>master</code></li><li>3ed9b1bf - Merge branch &#39;master&#39; into 221-use-bing-maps</li></ul> [Compare with previous version](https://gitlab.com/jankstudio/resq/merge_requests/258/diffs?diff_id=44670407&start_sha=c980b30e64cc0a5fcc0ad098f062ef7e4034187a)
korina.cordero commented 2019-06-10 07:56:43 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 4c3092ac - Add methods to map managers to display a Bing map or a Google map for geofence. #221

Compare with previous version

added 1 commit <ul><li>4c3092ac - Add methods to map managers to display a Bing map or a Google map for geofence. #221</li></ul> [Compare with previous version](https://gitlab.com/jankstudio/resq/merge_requests/258/diffs?diff_id=44680350&start_sha=3ed9b1bfcde4f35c13092725e46671f87d17f6d8)
korina.cordero commented 2019-06-11 06:18:49 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • bc110c13 - Add twig files containing the javascript to create the maps and polygons....

Compare with previous version

added 1 commit <ul><li>bc110c13 - Add twig files containing the javascript to create the maps and polygons....</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=44829251&start_sha=4c3092ac58603f7a6c58f0037b81b74f600b78bc)
korina.cordero commented 2019-06-11 07:34:22 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 4a608b50 - Add |raw when inserting a map key to make sure special characters are properly read. #221

Compare with previous version

added 1 commit <ul><li>4a608b50 - Add |raw when inserting a map key to make sure special characters are properly read. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=44840299&start_sha=bc110c1353aaa3738463f97d2797b3a565f7b843)
korina.cordero commented 2019-06-11 08:53:46 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>6c8ad89d - Add bing maps support for job orders. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=44851698&start_sha=4a608b50b99bb17fbfe70e9510451cf0b89491d9)
korina.cordero commented 2019-06-13 08:53:43 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>0cffc525 - Add bing maps for the job order maps. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=45100745&start_sha=6c8ad89d6e5039aa233572fbddd8267a5c06b1d2)
korina.cordero commented 2019-06-14 06:17:54 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>6e682889 - Add bing maps support to job order. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=45221590&start_sha=0cffc525c5510c46a348bf111784fc49e09dd95f)
korina.cordero commented 2019-06-17 04:57:05 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • e37406d6 - Use bing maps to load map for incoming job orders. #221

Compare with previous version

added 1 commit <ul><li>e37406d6 - Use bing maps to load map for incoming job orders. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=45384693&start_sha=6e682889c711df859732d38ad10ce57c22d666ee)
korina.cordero commented 2019-06-17 08:50:20 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>86963a29 - Add geocoding to map. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=45405915&start_sha=e37406d6d1483812a22c72541d10cb94f7fd49a1)
korina.cordero commented 2019-06-18 01:57:47 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>3720367a - Use Google&#39;s geocode on Bing Maps. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=45537933&start_sha=86963a291392cf3c9d475868af606f118453f768)
korina.cordero commented 2019-06-18 03:27:05 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 1420493d - Move the handleAction inside the ready function. #221

Compare with previous version

added 1 commit <ul><li>1420493d - Move the handleAction inside the ready function. #221</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/258/diffs?diff_id=45542691&start_sha=3720367ae717e05efa572ab71f81c46bef8c8df3)
This pull request has changes conflicting with the target branch.
  • .env.dist
  • config/packages/twig.yaml
  • config/services.yaml
  • src/Controller/JobOrderController.php
  • templates/geofence/list.html.twig
  • templates/job-order/form.html.twig
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 221-use-bing-maps:221-use-bing-maps
git checkout 221-use-bing-maps

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff 221-use-bing-maps
git checkout 221-use-bing-maps
git rebase master
git checkout master
git merge --ff-only 221-use-bing-maps
git checkout 221-use-bing-maps
git rebase master
git checkout master
git merge --no-ff 221-use-bing-maps
git checkout master
git merge --squash 221-use-bing-maps
git checkout master
git merge --ff-only 221-use-bing-maps
git checkout master
git merge 221-use-bing-maps
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: rgutierrez/resq#1069
No description provided.
Delete branch "221-use-bing-maps"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?