public/cordova-android
8
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Commit Graph

  • 3ad1ed7dbc Merge pull request #418 from dpogue/splash-compress Joe Bowser 2017-11-28 10:35:04 -08:00
  • ae823e6c4e Merge pull request #385 from dreifachstein/master Joe Bowser 2017-11-28 10:34:19 -08:00
  • 9056e5a2dc CB-13610: Compress the default app assets Darryl Pogue 2017-11-27 22:46:02 -08:00
  • 2b20802dbb Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-11-27 14:10:59 -08:00
  • a972d1ef62 Merge pull request #401 from fabulant/CB-8976 Joe Bowser 2017-11-27 14:02:20 -08:00
  • 30c3713dca Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-11-27 11:42:25 -08:00
  • 6f58d4c474 Merge pull request #352 from Icenium/include-armeabi-dir Joe Bowser 2017-11-27 11:35:47 -08:00
  • 9d9bac397b CB-13602: We were setting the path wrong, this is hacky but it works Joe Bowser 2017-11-22 13:18:38 -08:00
  • d8f10c33dc CB-13601: Fixing lint error and mis-spelling of variable Joe Bowser 2017-11-22 11:47:05 -08:00
  • 5d57eff612 CB-13601: Fixing the standalone run scripts to make sure this works without using the CLI Joe Bowser 2017-11-22 11:39:40 -08:00
  • 43956c1bc8 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-11-20 18:21:49 -08:00
  • 2930900963 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-11-20 13:53:00 -08:00
  • 6404780186 Merge pull request #417 from DavidStrausz/master Joe Bowser 2017-11-16 10:13:50 -08:00
  • 5d99e50c4a CB-13580: (android) fix lint errors David Strauß 2017-11-16 01:54:04 +01:00
  • aaeb630eb1 CB-13580: fix build for multiple apks (different product flavors) David Strauß 2017-11-16 01:27:20 +01:00
  • 3acba59494 CB-13297: This just works once you bump the project structure. Java 1.8 compatibility baked-in Joe Bowser 2017-11-15 11:39:32 -08:00
  • 3760616639 Merge pull request #416 from infil00p/bintray_fix Joe Bowser 2017-11-15 10:42:00 -08:00
  • 026dce563b CB-13558: Upgrading the gradle so we can upload the AAR Joe Bowser 2017-11-09 11:14:47 -08:00
  • b77febc7a7 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-11-07 10:52:37 -08:00
  • 83601dca2f Update JS snapshot to version 6.5.0-dev (via coho) Joe Bowser 2017-11-06 11:44:23 -08:00
  • 7a27ee4f69 Set VERSION to 6.4.0 (via coho) rel/6.4.0 6.4.0 Joe Bowser 2017-11-06 11:44:20 -08:00
  • 05aeaf1bd2 Set VERSION to 6.5.0-dev (via coho) Joe Bowser 2017-11-06 11:44:20 -08:00
  • cc13413007 Update JS snapshot to version 6.4.0 (via coho) Joe Bowser 2017-11-06 11:44:19 -08:00
  • b138867b78 CB-13528 Updated RELEASENOTES and Version for release 6.4.0 Joe Bowser 2017-11-06 11:43:47 -08:00
  • a1195cefd5 Merge pull request #415 from infil00p/CB-13530 Joe Bowser 2017-11-03 16:50:32 -07:00
  • b83c3b3684 CB-13530: Removing debug console.logs Joe Bowser 2017-11-02 14:45:51 -07:00
  • 5502ddaf0d CB-13530: This fixes the basic APK installation Joe Bowser 2017-11-02 14:17:10 -07:00
  • f54336eb61 eslint fix Joe Bowser 2017-11-01 17:18:41 -07:00
  • 18d6884522 CB-11244: Android Studio 3 work, things have changed with how the platform is built Joe Bowser 2017-11-01 17:08:43 -07:00
  • 8ba0109e55 Completing merge which includes the fix for Android Studio 3.0 Joe Bowser 2017-11-01 13:46:23 -07:00
  • f50ca85a95 CB-11244: Found bug where the gradle subproject changes weren't actually getting written to the correct gradle file Joe Bowser 2017-11-01 13:22:22 -07:00
  • 39e6765e64 Merge pull request #413 from infil00p/StudioThreeFix Joe Bowser 2017-11-01 10:26:53 -07:00
  • 47e20da631 CB-13289: Updating Travis and appveyor Joe Bowser 2017-10-31 10:48:19 -07:00
  • bb7b47b063 Merge pull request #414 from audreyso/CB-13501 Audrey 2017-10-30 16:11:50 -07:00
  • a2618dcde5 CB-13289: eslint fix Joe Bowser 2017-10-30 13:17:18 -07:00
  • 9fdb126715 CB-13289: Fixing build problems with Studio Three, but keeping Windows Gradle fix for now, will be deprecated Joe Bowser 2017-10-30 10:39:59 -07:00
  • b2a81c09ec :CB-13501 : update appveyor node versions to support node 8 Audrey So 2017-10-30 10:01:50 -07:00
  • 04fa5d3feb CB-13499: Remove duplicate "setting" in error strings Jan Piotrowski 2017-10-26 22:28:38 +02:00
  • d73108cc13 CB-13289: Fix test to work with new Google Android Gradle DSL Joe Bowser 2017-10-25 11:38:07 -07:00
  • 3ba00f91bb eslint errors Joe Bowser 2017-10-19 13:37:43 -07:00
  • cbee8580d0 CB-13470: Fix Clean so that it cleans the Android Studio structure Joe Bowser 2017-10-19 13:31:16 -07:00
  • 6ccd6b009b Redoing PR #411 over here because the changes were obliterated from earlier Joe Bowser 2017-10-18 11:09:08 -07:00
  • 6cf6e20d2e Merge branch 'master' into StudioProjectCompat, fixing conflicts, need to re-add previous PR fix on the branch Joe Bowser 2017-10-18 11:04:44 -07:00
  • 93efe71080 Merge pull request #411 from Keyclic/master Joe Bowser 2017-10-16 11:23:29 -07:00
  • 697c8f129c Merge pull request #410 from filmaj/emu-fixes Joe Bowser 2017-10-16 10:37:30 -07:00
  • c12f7fef76 Close #379 Joe Bowser 2017-10-13 11:08:01 -07:00
  • cde238de94 Include missing values for task.name when 'cdvBuildMultipleApks' option is true, 'task.name' can have 'validateSigningArmv7Release' or 'validateSigningX86Release' values too. Kevin 2017-10-09 09:17:40 +02:00
  • ec83d481fa CB-13406: Fixed AVD API level comparison when choosing sub-par API level match. Added tests for the best_image method. filmaj 2017-10-05 15:18:42 -05:00
  • 1f12fdbeea CB-13404: add android-versions to bundledDependencies. Ignore best emulator selection when parsed AVD information does not include API level in the target filmaj 2017-10-05 15:17:31 -05:00
  • 8743e88550 CB-11244: Fixing eslint errors Joe Bowser 2017-10-03 15:06:54 -07:00
  • f3c238db1c CB-11244: Adding specs for resource files inside an Android Studio Project Joe Bowser 2017-10-03 14:16:27 -07:00
  • 2534a3c767 CB-11244: Added remapping for drawables Joe Bowser 2017-10-02 19:04:40 -07:00
  • b1f527e682 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-09-28 10:21:49 -07:00
  • 6fa16b615b Merge pull request #408 from audreyso/CB-12895-eslint Audrey 2017-09-28 08:47:50 -07:00
  • e5c90badba CB-12895 : eslint ignoring cordova.js Audrey So 2017-09-26 17:15:30 -07:00
  • 021c9c19e8 CB-12895: Temporarily disabling eslint since cordova-js does not have eslint yet. rel/6.3.0 6.3.0 6.3.x Joe Bowser 2017-09-25 14:00:38 -07:00
  • be6c6ba976 CB-12895: Temporarily disabling eslint since cordova-js does not have eslint yet. Joe Bowser 2017-09-25 14:00:38 -07:00
  • 7f3be98199 Update JS snapshot to version 6.4.0-dev (via coho) Joe Bowser 2017-09-25 11:37:52 -07:00
  • 0e498db735 Set VERSION to 6.4.0-dev (via coho) Joe Bowser 2017-09-25 11:37:51 -07:00
  • 0c475b5ec4 Set VERSION to 6.3.0 (via coho) Joe Bowser 2017-09-25 11:37:50 -07:00
  • 2a2a11a729 Update JS snapshot to version 6.3.0 (via coho) Joe Bowser 2017-09-25 11:37:50 -07:00
  • 7203b740fd CB-13323 Updated RELEASENOTES and Version for release 6.3.0 Joe Bowser 2017-09-25 11:35:59 -07:00
  • 97aab900da CB-13323 Updated checked-in node_modules Joe Bowser 2017-09-25 11:17:24 -07:00
  • dddb2837dd CB-6936: Merge pull request #304 from uareurapid/master Joe Bowser 2017-09-15 13:26:21 -07:00
  • 7d282426c4 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-09-14 11:45:57 -07:00
  • 1637937664 CB-12981: handle SDK 26.0.2 slightly different AVD list output for Android 8+ AVDs. Would cause "cannot read property replace of undefined" errors when trying to deploy an Android 8 emulator. filmaj 2017-09-13 15:17:59 -07:00
  • 03144eb160 Add a node and npm package.json script for running java unit tests. Include them in the top-level npm test script. Run java unit tests in travis. Small refactor in gradlebuilder to support building gradle wrapper more easily. Don't explicitly build gradlew on appveyor CI as now npm test will do it for you. filmaj 2017-09-12 11:21:20 -07:00
  • 53210710ba Merge pull request #404 from mediathand/maven-repo-fix Joe Bowser 2017-09-11 10:04:48 -07:00
  • 0d98e09fb1 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-09-05 11:05:42 -07:00
  • e7a972df77 updated bundled node_modules Steve Gill 2017-09-05 11:04:12 -07:00
  • cb2f396e33 Update maven repo to include most recent lib versions Gil Pedersen 2017-08-29 17:27:02 +02:00
  • 2940d05209 CB-12291: (android) Add x86_64, arm64 and armeabi architecture flavors Martin Bektchiev 2015-12-09 09:30:37 +02:00
  • 2377aa7ac2 Merge pull request #403 from infil00p/api26 Joe Bowser 2017-08-15 14:17:09 -07:00
  • f18086f83a Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-08-15 13:29:44 -07:00
  • dce3b7ed6c Merge pull request #402 from macdonst/master Joe Bowser 2017-08-15 13:22:22 -07:00
  • 5bda4df7fa Revert CB-12015: initial-scale values less than 1.0 are ignored on Android Simon MacDonald 2017-08-14 20:57:44 -04:00
  • 1a8e36ccd3 CB-13177: Updating to API Level 26 Joe Bowser 2017-08-14 11:41:46 -07:00
  • 14816c7c81 Merge pull request #399 from macdonst/CB-12730 Simon MacDonald 2017-08-11 10:38:06 -04:00
  • 8fdb16c555 Fixing cordova-cli related bug Joe Bowser 2017-08-04 12:00:39 -07:00
  • 940439866e CB-8976: Added the cdvVersionCodeForceAbiDigit flag to the template build.gradle that appends 0 to the versionCode when cdvBuildMultipleApks is not set Fabian Eichinger 2017-06-07 18:43:44 +02:00
  • e91b19d006 Fixing error caused by merge commit Joe Bowser 2017-07-31 14:10:14 -07:00
  • 46905ebe99 Merge branch 'master' into StudioProjectCompat. Dealing with latest commits merged into master. Joe Bowser 2017-07-31 13:43:21 -07:00
  • d364f46baa CB-12730: Compat - INTEGRATE Simon MacDonald 2017-07-24 23:40:01 -04:00
  • 2b53c98cf5 CB-12453: Remove unnecessary double quotes from .bat files which are the causes of crash if project path contains spaces Nikita Matrosov 2017-07-28 14:23:53 +03:00
  • 36d07d7a15 CB-13031: Fix bug with case-sensitivity of android-packageName Nikita Matrosov 2017-07-28 14:05:53 +03:00
  • 458e479681 Trying AppVeyor-supplied workaround for current appveyor time out issues. See http://help.appveyor.com/discussions/problems/7159-builds-timing-out-after-an-hour filmaj 2017-07-27 14:33:16 -07:00
  • 5fe95570d2 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-25 15:07:56 -07:00
  • c3ce2f8a07 Closes #398 filmaj 2017-07-24 10:11:21 -07:00
  • d0dab4bb09 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-18 14:25:56 -07:00
  • 893356abcd CB-13034: Fixing eslint error Joe Bowser 2017-07-18 14:13:53 -07:00
  • 00c879e27d It passed then failed. I'll change the test for now, because perfect is the enemy of good. Joe Bowser 2017-07-18 11:52:37 -07:00
  • b65af106ff Make the tests pass Joe Bowser 2017-07-17 13:07:32 -07:00
  • fdd7eb3446 Linting fix Joe Bowser 2017-07-14 16:51:10 -07:00
  • 22645d9158 [CB-10916] Support display name for Android Darryl Pogue 2016-06-07 13:02:18 -07:00
  • 76dd8613ca CB-12423: make explicit JDK 1.8 or greater is needed in the README. filmaj 2017-07-14 11:13:52 -05:00
  • 99f15c507d Updating paths in the unit tests, leaving the failing test and coding against that Joe Bowser 2017-07-12 11:13:20 -07:00
  • 849b887e20 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-12 09:39:55 -07:00
  • 245d9a1e46 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-12 09:33:37 -07:00
  • 5917d4ef0b CB-13006: removed create and update end-to-end tests, and instead added more unit test coverage. tweaked code coverage invocation so that we get coverage details on the create.js module. slight changes to the create.js module so that it is slightly easier to test. filmaj 2017-07-11 12:25:12 -05:00
  • 90053eb9df CB-12950: lots of tweaks for end-to-end test runs, especially on CI: - rename npm tasks to reflect what they do (npm run unit-tests, npm run e2e-tests). main npm test runs linter, unit tests and e2e tests now. - locked jasmine down to ~2.6.0. - consolidate gitignores. - updated travis to run npm test. add android sdk installation to appveyor ci run.align android dpendencies across travis and appveyor. have appveyor install gradle. force gradle to version 3.4.1 in appveyor, as that seems to be the only version choco has. explicitly invoke sdkmanager to move license accepting process along. filmaj 2017-06-27 12:02:38 -05:00