Fabian Guerra 187b6dc31c Merge branch 'release-agua' into master ...

# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp

2018-01-04 12:55:19 -06:00

..

ar.lproj

Update iOS, macOS SDK translations (#10738)

2017-12-20 02:26:05 -08:00

Assets.xcassets

[ios] Add 1024px app icon for iosapp

2017-12-15 19:21:44 -05:00

Base.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

bg.lproj

[android, ios, macos] Added Bulgarian localization

2017-10-27 22:23:02 -07:00

ca.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

de.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

es.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

fi.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

fr.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

hu.lproj

[ios] Added Hungarian localization from Transifex

2017-06-22 12:24:42 -07:00

ja.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

lt.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

nl.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

pl.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

pt-BR.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

ru.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

sv.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

uk.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

vi.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

zh-Hans.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

zh-Hant.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

fill_filter_style.json

[ios, android] add visual tests for fill, line, & numeric filter styling (#6433)

2016-09-23 10:13:11 -07:00

Info.plist

[all] - update licenses to 2018

2018-01-03 18:41:25 +01:00

LaunchScreen.storyboard

[ios] Clean-up iosapp project

2017-08-02 18:48:11 -04:00

line_filter_style.json

[ios, android] add visual tests for fill, line, & numeric filter styling (#6433)

2016-09-23 10:13:11 -07:00

main.m

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

Main.storyboard

Merge branch 'release-ios-v3.6.0-android-v5.1.0' into master.

2017-09-27 12:08:24 -04:00

MBXAnnotationView.h

[ios] Simplified MBXAnnotationView

2016-07-02 21:00:48 -07:00

MBXAnnotationView.m

[ios] added check for annotation view animation (#8565)

2017-04-12 11:30:28 -07:00

MBXAppDelegate.h

[core] code style cleanups

2016-07-01 12:38:33 +02:00

MBXAppDelegate.m

[ios] Add iosapp Settings.app force touch quick action shortcut

2017-08-02 18:46:13 -04:00

MBXCustomCalloutView.h

[ios] Optional positioning and stickiness for callout view

2017-01-11 15:48:08 -08:00

MBXCustomCalloutView.m

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

MBXEmbeddedMapViewController.h

[ios] Match gesture recognizer with map view user interaction state

2017-04-11 07:33:22 -07:00

MBXEmbeddedMapViewController.m

[ios] Match gesture recognizer with map view user interaction state

2017-04-11 07:33:22 -07:00

MBXOfflinePacksTableViewController.h

[ios] Renamed downloads to offline packs in iosapp

2016-03-10 17:14:14 -08:00

MBXOfflinePacksTableViewController.m

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

MBXSnapshotsViewController.h

[ios] snapshotter

2017-09-05 16:29:33 +03:00

MBXSnapshotsViewController.m

[darwin][ios][macos] map snapshotter - add MGLMapSnapshot wrapper

2017-11-01 09:23:53 -04:00

MBXUserLocationAnnotationView.h

[ios] Refactored user location annotation into a customizable class (#5882)

2016-08-16 15:16:59 -04:00

MBXUserLocationAnnotationView.m

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

MBXViewController.h

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

MBXViewController.m

[ios,macos] Add MGLComputedShapeSource example to demo apps

2017-11-22 13:56:38 -08:00

numeric_filter_style.json

[ios, android] add visual tests for fill, line, & numeric filter styling (#6433)

2016-09-23 10:13:11 -07:00

points.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

polyline.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

threestates.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00