f221441877
Update JS snapshot to version 3.7.0-dev (via coho)
2014-09-12 16:34:06 -04:00
dd5a337a49
Merge branch 'master' into 4.0.x
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
51e634ccb4
Merge branch 'master' into 4.0.x (up to 3.7.0-dev)
...
Conflicts:
VERSION
bin/templates/cordova/version
framework/src/org/apache/cordova/CordovaWebView.java
package.json
test/src/org/apache/cordova/test/basicauth.java
test/src/org/apache/cordova/test/menus.java
2014-09-11 10:16:46 -04:00
31b1a821ca
Merge branch 'master' into 4.0.x (External whitelist changes)
2014-09-11 10:08:45 -04:00
c8bbdb23de
CB-7512: Determine SDK and build tools version dynamcally at build time
2014-09-10 10:57:43 -04:00
8354651059
CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments
2014-09-04 10:49:43 -07:00
4dc32e194b
CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application
2014-09-03 15:42:39 -07:00
f20708a5e7
Update JS snapshot to version 3.7.0-dev (via coho)
2014-08-29 16:34:17 -07:00
91cf78f183
Set VERSION to 3.7.0-dev (via coho)
2014-08-29 16:34:12 -07:00
c6ccde0558
CB-7385 update cordova.js for testing prior to branch/tag
2014-08-27 09:04:32 -04:00
2e3e4ec3b2
Merge branch 'CB-7291'
2014-08-26 15:25:41 -04:00
6e222c3938
CB-7291: Restrict meaning of "*" in internal whitelist to just http and https
2014-08-26 15:23:24 -04:00
3b3bd9b6c9
CB-7291: Only add file, content and data URLs to internal whitelist
2014-08-21 16:27:48 -04:00
4e3331ba66
CB-7291: Add defaults to external whitelist
2014-08-21 16:27:48 -04:00
8aa813b862
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-08-18 09:48:31 -04:00
a7ccb9243d
Merging latest master, including new tests
2014-08-14 14:20:49 -07:00
8b55a16986
CB-7291: Add external-launch-whitelist and use it for filtering intent launches
2014-08-12 11:26:47 -04:00
f9b8f9a45f
CB-7159: Fix setBackgroundColor() call to support 4.0.x view classes
2014-08-11 13:25:21 -04:00
41125ea1e2
CB-7261 Fix setNativeToJsBridgeMode sometimes crashing when switching to ONLINE_EVENT
2014-08-07 16:18:56 -04:00
73219bf2d2
CB-7265 Fix crash when navigating to custom protocol (introduced in 3.5.1)
...
Conflicts:
framework/src/org/apache/cordova/CordovaUriHelper.java
Github: close #111
2014-08-07 09:58:40 -04:00
d6eb723b7f
Filter out non-launchable intents
2014-08-06 09:55:03 -04:00
993d73762c
Handle unsupported protocol errors in webview better
2014-08-06 09:55:03 -04:00
955133f173
Extend whitelist to handle URLs without // chars
2014-07-31 08:11:40 -07:00
c2cafb4b45
CB-7172 Force window to have focus after resume
...
Workaround for some devices (Samsung Galaxy Note 3 at least)
github: close #108
2014-07-22 22:33:53 -04:00
05868b541b
Merge branch 'master' into 4.0.x (background color)
2014-07-21 15:47:03 -04:00
67f474ef42
CB-7159 Set background color of webView as well as its parent
...
github: close #109 , close #110
2014-07-21 15:46:23 -04:00
a40424e75c
Merge branch 'master' into 4.0.x (setButtonPlumbedToJs)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-18 13:49:04 -04:00
cd6c0e1de9
CB-7018 Fix setButtonPlumbedToJs never un-listening
2014-07-18 13:46:29 -04:00
a99c8219bd
Make private PluginManager.clearPluginObjects, .startupPlugins
2014-07-14 14:30:10 -04:00
a03fdaba39
Merge branch 'master' into 4.0.x (undeprecate)
2014-07-14 14:28:56 -04:00
92be0033a8
Undeprecate some just-deprecated symbols in PluginManager.
...
Forgot about custom engines again :(
2014-07-14 14:28:27 -04:00
6f301576eb
Mark PluginEntry fields as final
...
Makes the intention of the class more clear, and the public fields less
bad.
2014-07-14 14:26:21 -04:00
e2b3f76a10
Merge branch 'master' into 4.0.x (PluginEntry refactor)
...
Conflicts:
framework/src/org/apache/cordova/PluginEntry.java
framework/src/org/apache/cordova/PluginManager.java
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
2014-07-14 14:18:10 -04:00
b934c1be6a
@Deprecate methods of PluginManager that were never meant to be public
2014-07-14 14:10:19 -04:00
145b50a320
Move plugin instantiation and instance storing logic PluginEntry->PluginManager
...
Instantiation and storing of the instance should be owned privately by
PluginManager, not exposed via an unprotected public API. That said,
this refactoring does not make any breaking changes to the public API,
except for removing the createPlugin call in PluginEntry, which should
not be called by anyone other than PluginManager anyway.
2014-07-14 14:08:27 -04:00
b277202838
Add PluginManager.setPluginEntries, delete setPluginWhitelist
2014-07-10 16:39:46 -04:00
a4f6d9f6e7
Merge branch 'master' into 4.0.x (unbreak compile)
2014-07-10 15:14:57 -04:00
9300e97d2b
Fix broken compile due to previous commit :(
2014-07-10 15:14:39 -04:00
1d4aa44d3d
Merge branch 'master' into 4.0.x (CordovaPlugin.pluginInitialize tweak)
...
Conflicts:
framework/src/org/apache/cordova/CordovaPlugin.java
2014-07-10 15:05:40 -04:00
3792f75281
Tweak CordovaPlugin.initialize method to be less deprecated.
...
Thinking here is that we need a while for both initialize and
pluginInitialize to exist before plugin authors would bother not using
the deprecated one anyways. Really, no harm in keeping both for some
time.
2014-07-10 15:03:53 -04:00
b52fcb8aa9
Merge branch 'master' into 4.0.x (CordovaBridge tweaks)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-07-10 11:36:58 -04:00
a14c794255
Un-deprecate CordovaActivity.init() - it's needed to tweak prefs in onCreate
2014-07-10 11:36:20 -04:00
aef96e95e8
Tweak log messages in CordovaBridge with bridgeSecret is wrong
2014-07-10 11:36:20 -04:00
cc860804f6
Backport CordovaBridge from 4.0.x -> master
2014-07-10 10:43:37 -04:00
f38c460588
Merge branch 'master' into 4.0.x (Unbreak unit tests)
...
Conflicts:
test/src/org/apache/cordova/test/junit/GapClientTest.java
test/src/org/apache/cordova/test/userwebview.java
test/src/org/apache/cordova/test/whitelist.java
2014-07-10 10:30:05 -04:00
1c5b5e2ce6
Add non-String overloades for CordovaPreferences.set()
2014-07-10 10:23:26 -04:00
9b9c59766f
Add back CordovaWebView.getUrl() - needed by tests & does make sense to have
2014-07-10 10:15:34 -04:00
fc2a202afa
Log friendlier messages when bridge calls are recieved from previous page
2014-07-10 10:14:47 -04:00
4b4b71ff32
CordovaActivity: don't create WebView until loadUrl() so that apps can tweak preferences after super.onCreate()
2014-07-10 10:10:38 -04:00
9358838dab
Merge branch 'master' into 4.0.x (unit test tweaks)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-09 21:12:45 -04:00
Marcel Kinard