summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bumped to npm version 2.0.0-pre.7node-v2.0.0-pre.7Lucas Wojciechowski2015-09-181-1/+1
* Add node_modules to .gitignoreLucas Wojciechowski2015-09-171-0/+1
* Renderbuffer create should be paired with renderbuffer delete.Adam Hunter2015-09-171-1/+1
* Fully delete test/suite submoduleJohn Firebaugh2015-09-171-0/+0
* [core] Annotation cleanupHenry Dooley2015-09-162-136/+101
* Revert "moved styles to v1.1.0"John Firebaugh2015-09-161-0/+0
* Revert "[node] Enable npm to build mapbox-gl-native package from source"Lucas Wojciechowski2015-09-1616-90/+31
* Change MapView.MapChange visibility to public since OnMapChangedListener.onMa...Bastien Mayard2015-09-161-1/+1
* fix Makefile clean to clean ./android/java/MapboxGLAndroidSDK/build tooBastien Mayard2015-09-161-1/+1
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeBrad Leege2015-09-165-12/+20
|\
| * Prefix user defaults in iosappMinh Nguyễn2015-09-161-11/+11
| * [Android] add instructions to install Android Support RepositoryAnsis Brammanis2015-09-161-0/+4
| * [core] Update test-suiteJohn Firebaugh2015-09-161-1/+1
| * fix circle clipping bugAnsis Brammanis2015-09-161-0/+4
| * moved styles to v1.1.0Nicki Dlugash2015-09-161-0/+0
* | Merge branch '2317-espresso' of git://github.com/zugaldia/mapbox-gl-native in...Brad Leege2015-09-1615-0/+912
|\ \ | |/ |/|
| * back to right submodules versionsAntonio Zugaldia2015-09-163-0/+0
| * import JUnit tests instructionsAntonio Zugaldia2015-09-161-2/+9
| * placeholders for the remaining objectsAntonio Zugaldia2015-09-163-0/+45
| * two classes at once on awsAntonio Zugaldia2015-09-161-0/+2
| * Merge remote-tracking branch 'mapbox/master' into 2317-espressoAntonio Zugaldia2015-09-162-0/+12
| |\
| * | unit tests + mockitoAntonio Zugaldia2015-09-164-0/+186
| * | zoom inAntonio Zugaldia2015-09-161-2/+7
| * | screenshots should be taken on ui threadAntonio Zugaldia2015-09-161-2/+10
| * | fixed the screenshot class to include the surface viewAntonio Zugaldia2015-09-161-8/+45
| * | using the new version way of instanstiating the activity classAntonio Zugaldia2015-09-162-65/+34
| * | moved screenshot tests to its own classAntonio Zugaldia2015-09-161-0/+61
| * | second activity test classAntonio Zugaldia2015-09-161-0/+41
| * | merge with masterAntonio Zugaldia2015-09-163-1/+32
| * | docs for junit testsAntonio Zugaldia2015-09-162-0/+14
| |\ \
| * | | Merge remote-tracking branch 'mapbox/master' into 2317-espressoAntonio Zugaldia2015-09-1526-42/+238
| * | | pure junit testsAntonio Zugaldia2015-09-152-0/+16
| * | | fixed teardownAntonio Zugaldia2015-09-151-14/+13
| * | | added LargeTest annotationAntonio Zugaldia2015-09-151-0/+3
| * | | bumped versions to todays releaseAntonio Zugaldia2015-09-153-4/+3
| * | | Merge remote-tracking branch 'mapbox/master' into 2317-espressoAntonio Zugaldia2015-09-152-1/+5
| |\ \ \
| * | | | merge from masterAntonio Zugaldia2015-09-151-0/+0
| * | | | Merge remote-tracking branch 'mapbox/master' into 2317-espressoAntonio Zugaldia2015-09-1510-59/+42
| |\ \ \ \
| * | | | | ready for aws screenshotsAntonio Zugaldia2015-09-151-1/+15
| * | | | | flag to enable automatic screenshots on teardownAntonio Zugaldia2015-09-151-1/+20
| * | | | | manually add a screenshot nameAntonio Zugaldia2015-09-151-4/+9
| * | | | | added permission to save tests screenshotsAntonio Zugaldia2015-09-151-0/+1
| * | | | | we now have 26 UI tests that cover all main elements and core interactions, i...Antonio Zugaldia2015-09-152-2/+245
| * | | | | added espresso-contrib to have access to contrib.DrawerMatchers.*Antonio Zugaldia2015-09-151-0/+1
| * | | | | Take a screenshot after every testAntonio Zugaldia2015-09-152-0/+115
| * | | | | Merge remote-tracking branch 'mapbox/master' into 2317-espressoAntonio Zugaldia2015-09-1542-236/+263
| |\ \ \ \ \
| * | | | | | switch id to new layout mainMapViewAntonio Zugaldia2015-09-141-1/+1
| * | | | | | match the new annotations versionAntonio Zugaldia2015-09-141-0/+1
| * | | | | | Merge remote-tracking branch 'mapbox/master' into 2317-espressoAntonio Zugaldia2015-09-14517-6957/+16575
| |\ \ \ \ \ \
| * | | | | | | added info about MonkeyAntonio Zugaldia2015-09-141-2/+16