Joe Bowser
a2cdcd47be
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
2012-01-20 12:43:06 -08:00
Joe Bowser
a42451969f
Merge branch 'master' of github.com:cordova/cordova-android
2012-01-20 12:41:29 -08:00
Joe Bowser
7955c6dd02
Merge branch 'master' of github.com:callback/callback-android
2012-01-20 12:39:21 -08:00
macdonst
56096ad00e
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
2012-01-20 13:38:06 -05:00
Anis Kadri
faacdd6b02
Merge pull request #1 from pehrlich/master
...
documentation updates
2012-01-17 16:20:31 -08:00
Peter Ehrlich
bdd7449af3
documentation additions
2012-01-17 16:31:08 -05:00
Anis Kadri
64c462c8ad
fixing whitelist handling
2012-01-13 17:29:46 -08:00
Joe Bowser
cb0b054079
Merge pull request #3 from alunny/preferences
...
add support for <preference name="fullscreen"> to res/xml/phonegap.xml
2012-01-10 13:09:04 -08:00
Joe Bowser
41b49df944
Merge pull request #2 from alunny/with-tests
...
adding JUnit dependency
2012-01-10 13:01:11 -08:00
alunny
ffa76246e3
making preference reading code more robust
2012-01-09 17:31:58 -08:00
alunny
3af4d6b139
using preference=fullscreen for fullscreen view
...
involves loading configuration before the layout is set up
2012-01-09 17:31:50 -08:00
alunny
752b1b0e30
reading preferences from phonegap.xml
...
adds PreferenceNode and PreferenceSet classes as wrappers for the W3C
config.xml <preference> nodes
populates a PreferenceSet @preferences member
2012-01-09 17:29:50 -08:00
alunny
d91beb5ad9
adding JUnit dependency
...
* framework/libs/junit-4.10.jar
* `ant test` task for running junit tests on jar
* updates to LICENSE and NOTICE files
2012-01-09 17:14:26 -08:00
Bryce Curtis
8db5e06c62
Fix CB-135 Multithreaded access on CallbackServer javascript object.
2012-01-06 22:23:49 -06:00
Joe Bowser
bc309c9f00
Merge conflicts with something on the official repo, moving old pull request in
2012-01-06 15:52:09 -08:00
Joe Bowser
9078fe17b5
Merge pull request #40 from infil00p/master
...
Clean Merge of Classic Render Mode
2012-01-06 15:48:59 -08:00
macdonst
3172ae4525
Merge branch 'master' of git://github.com/cordova/cordova-android
2012-01-06 16:33:20 -05:00
macdonst
58774addad
CB-145: Android contact.save() crashes for native contacts.
2012-01-07 05:33:02 +08:00
bcurtis
8c191331ae
Merge branch 'master' of github.com:cordova/cordova-android
2012-01-05 15:21:16 -06:00
Bryce Curtis
7f7c211769
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
2012-01-05 15:08:43 -06:00
Bryce Curtis
51bf8c39af
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
2012-01-05 14:42:41 -06:00
Jukka Zitting
4bba9ac5a0
Minor incubation disclaimer fix.
2012-01-05 21:39:18 +01:00
Jukka Zitting
e9eb08486a
README.md: Replace "PhoneGap" with "Cordova" and add incubation disclaimer
...
(This is a test commit to for checking the git push problem by Bryce)
2012-01-05 21:33:26 +01:00
Bryce Curtis
3466ef6dfd
Merge pull request #1 from obrand/basic-auth
...
Added authentication framework
2012-01-05 09:27:02 -08:00
Olivier Brand
36bca7d609
Renamed crdentials/principals to userName/password
2012-01-05 08:26:54 -08:00
Joe Bowser
cc04b54adf
Merge branch 'master' of github.com:callback/callback-android
2012-01-04 16:02:03 -08:00
Olivier Brand
e96ae91800
Added authentication framework
2012-01-04 13:47:44 -08:00
macdonst
1d5af102c7
Camera default destination should be FILE_URI
2012-01-05 03:29:55 +08:00
macdonst
b106d2cae8
Proved generating sqlite database path to open database without permission error
2012-01-05 01:50:56 +08:00
macdonst
c66142d6b8
Fixing issue with FileTransfer.upload when the passed in url contains a ?
2012-01-04 00:48:29 +08:00
macdonst
5fac30ea34
Merge pull request #58 from libbybaldwin/add-compass-demo-android
...
add compass demo for Android
2011-12-22 10:01:55 -08:00
macdonst
fae551f0ce
Fix NullPointerException in DroidGap.onMeasure()
...
It looks like on some devices the onMeasure() method is called before the callbackServer is instantiated. This causes a NullPointerException which kills the application.
2011-12-22 09:51:11 +08:00
Libby Baldwin
65e3a8a453
add compass demo for Android
2011-12-19 18:30:54 -08:00
macdonst
1511183dfd
Tagging 1.3.0
2011-12-16 13:29:15 -05:00
macdonst
a640804897
Tagging to 1.3.0rc2
2011-12-13 09:41:54 -05:00
macdonst
f95fdb5873
Fix for CB-104: Capture not returning an error code on cancel
2011-12-06 06:08:35 +08:00
macdonst
4b9e50146e
Tagging to 1.3.0rc1
2011-12-05 11:27:08 -05:00
macdonst
26408fabe4
Merge pull request #32 from willshen/master
...
A couple cleanup and bug fix in the code base
2011-12-01 10:11:44 -08:00
wshen
1dfc65face
removed FileExistsException that is not needed
2011-12-01 10:04:49 -08:00
wshen
18bf4cd94b
merging from callback
2011-12-01 09:59:42 -08:00
wshen
729d141c3f
removed FileExistsException that is not needed
2011-12-01 09:42:23 -08:00
macdonst
29001eeb3a
Merge pull request #42 from aflx/download
...
added download() to the filetransfer
2011-12-01 08:20:04 -08:00
macdonst
acc9173e6e
Merge pull request #46 from macdonst/reflect
...
Remove WebViewReflect.java from Android
2011-11-30 13:46:48 -08:00
Alexander Keller
f387720e54
FileTransfer returns JSONObject with code, source and target for upload and download
2011-11-30 09:15:01 +01:00
Joe Bowser
2094854588
Merge branch 'master' of github.com:callback/callback-android
2011-11-29 14:04:17 -08:00
Alexander Keller
8dbb8f58b1
made getEntry of FileUtils public in order to avoid duplicate code in FileTransfer
2011-11-29 09:38:39 +01:00
Alexander Keller
75963c88d5
changes after review of macdonst, download returns FileEntry
2011-11-29 08:39:57 +01:00
macdonst
188e3e7d7d
Remove WebViewReflect.java from Android
...
While looking at issue #34 I realized that we don't need the WebViewReflect class anymore. Since we only support 2.1 or better and all the methods that WebViewReflect was protecting us from are available in the API version.
2011-11-28 15:44:36 -05:00
macdonst
e02322b66b
Remove addWhiteList from public API
2011-11-29 03:47:49 +08:00
Alexander Keller
8904c67fb5
added download() to the filetransfer
2011-11-26 18:16:44 +01:00