Skip to content
This repository was archived by the owner on Nov 30, 2018. It is now read-only.

Commit 14e9101

Browse files
nmccreadynmccready
committed
Merge pull request #1430 from nmccready/markerSpiderfier
MarkerSpiderfier in ui-gmap , issue 1021
2 parents 10a4b79 + 05c155b commit 14e9101

File tree

51 files changed

+1939
-3982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1939
-3982
lines changed

‎.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: node_js
22
node_js:
3-
- "0.10.38"
4-
- "0.12.4"
5-
- "iojs"
3+
- "0.12"
64
before_script: PATH="$(npm bin):$PATH" npm install
75
script: grunt
86
branches:
@@ -13,3 +11,6 @@ branches:
1311
- 1.2.X
1412
- 1.0.X
1513
- website
14+
15+
#http://docs.travis-ci.com/user/migrating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade#tl%3Bdr
16+
sudo: false

‎bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"uuid": "http://github.com/LiosK/UUID.js/archive/v3.2.tar.gz",
2929
"angular-route": "~1.3.0",
3030
"bootstrap-without-jquery": "git://github.com/tagawa/bootstrap-without-jquery.git",
31-
"data-structures": "~1.4.2"
31+
"data-structures": "~1.4.2",
32+
"OverlappingMarkerSpiderfier": "git://github.com/nmccready/OverlappingMarkerSpiderfier.git"
3233
}
3334
}

‎dist/angular-google-maps-street-view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.1.5 2015-07-28
1+
/*! angular-google-maps 2.1.5 2015-08-09
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/

‎dist/angular-google-maps-street-view.min.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎dist/angular-google-maps-street-view_dev_mapped.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)