Joe Bowser
|
d5d95ad489
|
Merging changes
|
2011-11-04 13:46:44 -07:00 |
|
Anis Kadri
|
ac509369e9
|
forgot to resolve conflict
|
2011-10-14 15:49:16 -07:00 |
|
Anis Kadri
|
5faed8378c
|
Merge branch 'master' of github.com:phonegap/phonegap-android
Conflicts:
framework/res/xml/phonegap.xml
framework/src/com/phonegap/DroidGap.java
|
2011-10-14 15:43:13 -07:00 |
|
Bryce Curtis
|
6a9253e928
|
Formalize logging with printf-type optimization. Wrap Android log facilities instead of using System.out.println().
|
2011-09-28 22:19:23 -05:00 |
|
Bryce Curtis
|
80df4a8fb2
|
White list support. Pull request https://github.com/phonegap/phonegap-android/pull/211 from imhotep would not merge, so combined it with enhancements for this commit.
|
2011-09-26 10:58:41 -05:00 |
|
Anis Kadri
|
f111ea56ed
|
whitelist support
|
2011-08-29 16:13:02 -07:00 |
|
Bryce Curtis
|
4ecfbac586
|
Include plugin reference and permissions for battery events.
|
2011-08-11 15:37:11 -05:00 |
|
Dave Johnson
|
8c807315e9
|
there was a "Location" and a "Geolocation" plugin defined. We use "Geolocation" in the JavaScript
|
2011-07-21 16:42:59 -07:00 |
|
Don Coleman
|
701717fd55
|
remove comment from xml declaration
|
2011-07-15 23:47:08 -04:00 |
|
Bryce Curtis
|
9d5aa9406c
|
Loading plugins from res/xml/plugins.xml
|
2011-07-05 23:21:32 -05:00 |
|