fdef0db87c
Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-11-06 15:37:30 -05:00
e78db000c6
CB-7974 Cancel timeout timer if view is destroyed
2014-11-06 15:33:10 -05:00
032ea8a8d3
CB-7940 Disable exec bridge if bridgeSecret is wrong
2014-11-04 15:57:51 -05:00
fc63f66e89
CB-7758: Allow content-url-hosted pages to access the bridge
...
This allows e.g. jsHybugger to create pages with access to Cordova APIs.
We restrict access to content provider URLs which are at subdomains of the application itself, ie, begin with "content://com.your.package.id."
2014-10-27 15:26:38 -04:00
832e626573
CB-7726 fix typo in gitignore: ant-built -> ant-build
...
github: close #131
2014-10-27 12:33:09 -04:00
cc7d352209
Merge branch 'master' into 4.0.x (gradle signing+SecureRandom)
2014-10-21 13:00:07 -04:00
ce5d9a2ee8
gradle: Allow storeType to be set (allows using .p12 files)
2014-10-21 12:59:34 -04:00
77c51d3ae7
gradle: Allow absolute paths to keystore files
2014-10-21 12:43:30 -04:00
53dae45430
Fixed the SecureRandom so it only returns positive values
2014-10-17 15:30:28 -07:00
16343ffe70
Undoing change to Math.random() for now, this creates a weird bug
2014-10-17 13:52:33 -07:00
b37498d5f6
Replacing Math.random() with something a little more random.
2014-10-14 10:11:09 -07:00
7ad16e5b0c
Merge branch 'master' into 4.0.x (Hardcode activity name)
2014-10-07 15:25:56 -04:00
9f41906895
CB-6511 Fixes build for android when app name contains unicode characters.
...
github: close #124
2014-10-07 15:24:12 -04:00
2af8daff1d
Merge branch 'master' into 4.0.x (multipart PluginResult)
2014-10-07 15:18:07 -04:00
fbeb379f1b
CB-7707 Added multipart PluginResult ( close #125 )
...
Corresponds to cordova-js commit: a1f866606b3
2014-10-07 15:17:56 -04:00
9577735ff7
Merge branch 'master' into 4.0.x (check_reqs for brew)
2014-10-06 10:34:19 -04:00
2dcd50c11b
CB-7714 Teach check_reqs about brew's install location for android SDK
2014-10-06 10:33:31 -04:00
862c223e11
Merge branch 'master' into 4.0.x (.gitignore, create --shared)
2014-10-04 15:30:30 -04:00
7f4d5aeb0e
Merge branch 'master' into 4.0.x (move preference activation, alert dialog leak)
...
Conflicts:
framework/src/org/apache/cordova/AndroidChromeClient.java
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/menus.java
closes #123
2014-10-04 15:30:25 -04:00
30681eb772
Fix --shared flag of create script (broke in recent gradle changes)
2014-10-04 15:14:51 -04:00
52e575e1e7
Update .gitignore to ignore /framework/build and /node_modules
2014-10-04 15:14:45 -04:00
890e12c306
CB-6837 Fix leaked window when hitting back button while alert being rendered
...
Keep track of the last AlertDialog showed.
The last dialog showed that is rendered while hitting back button it
causes a leaked window.
Instead of perform a full track of all dialogs created, only destroy the
last one showed, this fixes the problem.
close #122
2014-10-04 14:44:06 -04:00
6cbf6b7875
CB-7674: Added sleep to avoid null error after most recent change to not break API
2014-09-30 17:57:42 -07:00
c255a84941
CB-7674 move preference activation back into onCreate()
...
The preference creation actually needs to be before
super.onCreate(savedInstance) in order to avoid the exception
"requestFeature() must be called before adding content". Also ran into an
issue in the native tests "Whitelist" and "User WebView/Client/Chrome" where
it would throw an exception that the CordovaWebView appView already had
a parent and needed to be removed from that parent before the invocation
to root.addView(appView). So I conditionally remove the wrong parent.
Also made a change to the native tests so the menus test would work.
I also put super.init() back into the template, though invoking it is optional
as loadUrl will call it automatically if needed.
2014-09-30 19:38:34 -04:00
ce7d6d69d9
updated release notes
2014-09-30 13:10:16 -07:00
d5538b7076
updated .gitignore to include npm-debug.log
2014-09-29 23:49:12 -07:00
cdfa13b265
Update JS snapshot to version 3.7.0-dev (via coho)
2014-09-29 14:59:07 -07:00
e5efc91ef4
Merge branch 'master' into 4.0.x (JAVA_HOME on Ubuntu)
2014-09-29 10:16:33 -04:00
e31c911c30
CB-7634 Detect JAVA_HOME properly on Ubuntu
2014-09-29 10:16:22 -04:00
a658ea1573
CB-7410 update the docs to match the actual title
2014-09-25 11:25:09 -04:00
6d5b88d7b9
Merge branch 'master' into 4.0.x (per-arch gradle builds)
2014-09-24 16:18:51 -04:00
a986e72338
Added gradle distribution URL updating. (commit fix-up)
2014-09-24 16:18:18 -04:00
162d9b6c2e
gradle: Build only the active architecture when applicable
2014-09-24 16:16:59 -04:00
f7f49d27c5
Merge branch 'master' into 4.0.x (gradle Android Studio)
2014-09-23 21:04:55 -04:00
9e3ccf4b3e
gradle: Fix warning about dynamic properties being deprecated
2014-09-23 21:04:04 -04:00
6b71c2f392
gradle: Have project's build.gradle look for a build-extras.gradle
2014-09-23 21:03:17 -04:00
0d313a3964
gradle: Write sub-project list explicitly to make Android Studio happy
2014-09-23 21:03:00 -04:00
75a0a6752a
Improved a regex.
2014-09-23 14:27:54 -04:00
363fc8deb5
Merge branch 'master' into 4.0.x (gradle plugin template)
...
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
2014-09-22 22:28:59 -04:00
ddac192c4a
Added gradle distribution URL updating.
...
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
2014-09-22 22:27:43 -04:00
69a03c2e16
CB-7512 Use a standard build.gradle for all plugins
...
Plugins can extend it by providing a "build-extras.gradle"
2014-09-22 22:27:43 -04:00
2b128b85f7
CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)
2014-09-22 20:54:28 -04:00
b09f973231
Added gradle distribution URL updating.
2014-09-22 16:47:01 -04:00
95815a558c
Merge branch 'master' into 4.0.x (fix ant run command)
2014-09-22 15:38:59 -04:00
879da03438
CB-7579 Fix run script's ability to use non-arch-specific APKs
2014-09-22 14:23:30 -04:00
d022be547b
Merge branch 'master' into 4.0.x (gradle)
2014-09-17 21:27:55 -04:00
3f83fdbfc1
CB-7512 Fix gradle asking for release password when building for debug
2014-09-17 21:27:06 -04:00
949152532c
Merge branch 'CB-7493' of https://github.com/MSOpenTech/cordova-android
2014-09-17 14:58:08 -07:00
215adab1f9
Merge branch 'master' into 4.0.x (Gradle env vars)
2014-09-17 15:58:46 -04:00
7ce46ed60c
CB-3445: Make minSdkVersion and base versionCode settable through env vars
2014-09-17 15:58:22 -04:00
Andrew Grieve