Skip to content

Feat/sync with upstream 15 2#6

Merged
j8seangel merged 26 commits intomasterfrom
feat/sync-with-upstream-15-2
May 26, 2017
Merged

Feat/sync with upstream 15 2#6
j8seangel merged 26 commits intomasterfrom
feat/sync-with-upstream-15-2

Conversation

@sorodrigo
Copy link
Copy Markdown

This PR syncs Vizzuality's fork with the Airbnb master v0.15.2

lelandrichardson and others added 26 commits April 4, 2017 18:19
…esources-crash

Fix getResources() null crash in mapview
I was having trouble compiling the android version but updating the project directory resolved it for me.
Update the paths to the `android` and `ios` folders to match the new structure
the path to project dir is no longer up-to-date
* Prepare for v0.15 release

* Add changelog

* Fix link to PR
…#1311)

* Update AirMapView.java

* Update AirMapManager.java

* Update AirMapView.java
Overlooked this change closing out a few PR's last week.

Follow up for react-native-maps#1200
* upstream/master: (24 commits)
  v0.15.2 (react-native-maps#1352)
  Remove AIRGMSPolyline.h and AIRGMSPolyline.m references from AirMaps.xcodeproj (react-native-maps#1351)
  v0.15.1 (react-native-maps#1347)
  fix compile error in rn version >= 0.40 (react-native-maps#1341)
  Add Marker rotation for Google Maps on iOS (react-native-maps#1326)
  Fixing reference to AirMapsExplorer in installation docs (react-native-maps#1328)
  Update README: Use callback in `ref` attribute (react-native-maps#1345)
  [iOS] Added onPress support for Polyline on Google Maps (react-native-maps#1194)
  [rnpm] Fix sourceDir for Android (react-native-maps#1313)
  Update license date (react-native-maps#1316)
  Fix overlay issues in Android introduced in 0.13.1 (react-native-maps#1311)
  v0.15.0 (react-native-maps#1305)
  fixing code snippet (react-native-maps#1196)
  small typo fixed (react-native-maps#1211)
  Update installation.md (react-native-maps#1226)
  Fixed path in `android/settings.gradle` (react-native-maps#1230)
  Add babelrc to npmignore (react-native-maps#1246)
  Update installation.md (react-native-maps#1179)
  Update docs to specify how to access event data (react-native-maps#1178)
  Update path in android installation (react-native-maps#1249)
  ...
Copy link
Copy Markdown

@j8seangel j8seangel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aweeesooomeee !! it will fix a lot of problems

@j8seangel j8seangel merged commit 86c489a into master May 26, 2017
@j8seangel j8seangel deleted the feat/sync-with-upstream-15-2 branch May 26, 2017 12:05
@j8seangel j8seangel mentioned this pull request May 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.