Commit Graph

1425 Commits

Author SHA1 Message Date
Bryce Curtis
0d32115c3f Merging nightmare. 2012-05-14 23:24:08 -05:00
Bryce Curtis
e660768e4b Removed. 2012-05-14 23:19:15 -05:00
Bryce Curtis
01abb32025 Update 2012-05-14 23:18:26 -05:00
Bryce Curtis
d44d9ddca6 Merge branch 'CordovaWebView' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView
Conflicts:
	framework/src/org/apache/cordova/FileUtils.java
	framework/src/org/apache/cordova/GeoListener.java
	framework/src/org/apache/cordova/GpsListener.java
	framework/src/org/apache/cordova/NetworkListener.java
2012-05-14 23:16:32 -05:00
Bryce Curtis
13f92b2b76 Add exit message. 2012-05-14 22:51:36 -05:00
Bryce Curtis
e6aa64760e Updates. 2012-05-14 22:18:01 -05:00
Bryce Curtis
3829df665f Formating and removal of commented code. 2012-05-14 22:06:33 -05:00
Bryce Curtis
c8fafa6bbd Updates. 2012-05-14 21:49:30 -05:00
Joe Bowser
dd0b6b1e30 Adding empty tests. May have to re-think the way we test this method 2012-05-11 15:14:35 -07:00
Joe Bowser
5b324c85b0 Broke the merge, need to add GPSListener.java 2012-05-11 10:38:21 -07:00
Joe Bowser
fc9cff7d26 Merging master into CordovaWebView 2012-05-11 10:36:17 -07:00
Fil Maj
6a628f7f2d [CB-683] updating JS for fix for 683 2012-05-10 16:43:08 -07:00
Joe Bowser
f3e70c79eb A quick stab at CB-510 2012-05-10 16:42:37 -07:00
Fil Maj
08a32272d3 [CB-683] Pause and resume events should route through fireDocumentEvent so we get the event object passed into the handler 2012-05-10 16:40:41 -07:00
Fil Maj
a705b72740 CB-481 refactored prompt() call in JS to exec, moved showing of webview out of chrome client and into app plugin (so we can invoke via exec) 2012-05-10 15:50:02 -07:00
Joe Bowser
de6652dd9d Moving the Callback Server Start/Stop to the onPageStarted fixed timing errors 2012-05-10 15:07:14 -07:00
Joe Bowser
b2f49b15ba Don't commit Eclipse preferences 2012-05-10 12:25:47 -07:00
Joe Bowser
c0dcbecbea Updating the project, removing generated artifacts 2012-05-10 12:18:26 -07:00
Michael Brooks
2625a57fdd Fix README.md formatting to install commons-codec-1.6.jar 2012-05-09 15:32:53 -07:00
Joe Bowser
2142d00bb9 Added loadConfiguration to the standalone WebView 2012-05-08 15:43:42 -07:00
Joe Bowser
4ce585be02 Updating the history configuration. We can switch between histories 2012-05-08 13:58:24 -07:00
macdonst
c2631ee0f7 Properly querying the Andoid content DB when deleteing an image file 2012-05-08 15:23:00 -04:00
Joe Bowser
8ab1733374 Removing the hacked-up jars that I used to get this to work, since I can't distribute them 2012-05-07 16:30:24 -07:00
Fil Maj
bafa438ce3 updating JS to latest for geolocation updates 2012-05-07 16:22:01 -07:00
Fil Maj
18cc90b3d8 adding uppercase java file! 2012-05-07 16:09:20 -07:00
Fil Maj
0fd1e3c57b axing lowercase java file 2012-05-07 16:09:20 -07:00
Fil Maj
1ee484f70d Fixes for new geo stuff 2012-05-07 16:09:20 -07:00
Fil Maj
724ea49f0b restructured geolocation plugin 2012-05-07 16:09:20 -07:00
Fil Maj
6fc2a3b84e adding node_modules to gitignore 2012-05-07 16:09:14 -07:00
Fil Maj
b84d64912b comeat me lawyers 2012-05-07 16:08:28 -07:00
Joe Bowser
e28f09e95b Merge Commit from latest master 2012-05-07 15:57:37 -07:00
Joe Bowser
21f6d9c527 Modifying generated classpath 2012-05-07 15:52:49 -07:00
Joe Bowser
8e0c3c1fa1 Updating README telling people to copy commons-codec 2012-05-07 15:52:34 -07:00
Joe Bowser
9e10160366 Removing the commons-codec 2012-05-07 15:48:59 -07:00
Joe Bowser
d38dd4c131 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android 2012-05-07 15:25:23 -07:00
Joe Bowser
84aaf02b0f Removing Default Android Graphics and replacing them with our own 2012-05-07 15:24:57 -07:00
Joe Bowser
269b90ad6f updating the test plugins 2012-05-07 14:49:21 -07:00
Joe Bowser
c11c4bea94 Adding header to test cordova.xml 2012-05-07 14:46:34 -07:00
Joe Bowser
7de660808c Accidentally committed a vim swp file 2012-05-07 14:36:13 -07:00
Joe Bowser
1fcaf2435f Adding more Apache licence headers 2012-05-07 14:27:33 -07:00
Fil Maj
87fbb5c92f documented running npm install 2012-05-07 12:31:24 -07:00
Fil Maj
3636a18bba added package.json for npm install goodness 2012-05-07 12:29:44 -07:00
Fil Maj
ea8d6b17ec dont check in node_modules peepz! 2012-05-07 12:29:08 -07:00
Joe Bowser
27e511b785 Adding Apache headers to the tests on the branch 2012-05-07 11:41:34 -07:00
Joe Bowser
9dfa503bad Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView 2012-05-07 11:15:38 -07:00
Joe Bowser
a087116915 Working towards Apache compliance 2012-05-07 10:56:37 -07:00
Joe Bowser
216f6a9b32 Adding more Apache Headers. Not sure if this should have headers or not 2012-05-04 16:47:37 -07:00
Joe Bowser
e32503fad7 Forgot to add lifecycle/index2.html's header 2012-05-04 16:40:38 -07:00
Joe Bowser
c33f768570 Adding Apache Header to Test Directory 2012-05-04 15:22:15 -07:00
Joe Bowser
20c7b512f3 We should not be having a compiled version of cordova.jar in the test directory 2012-05-04 13:55:43 -07:00