Ian Clelland
|
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 |
|
Steven Gill
|
91cf78f183
|
Set VERSION to 3.7.0-dev (via coho)
|
2014-08-29 16:34:12 -07:00 |
|
Andrew Grieve
|
5054b714e2
|
Set version to 4.0.0-dev in package.json
|
2014-07-25 20:03:42 -04:00 |
|
Andrew Grieve
|
4ce5123a12
|
Merge branch 'master' into 4.0.x (bindButton changes)
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
package.json
|
2014-06-24 15:22:27 -04:00 |
|
Ian Clelland
|
bb141a70e8
|
CB-5971: Add unit tests to cordova-android
|
2014-06-24 14:05:56 -04:00 |
|
Ian Clelland
|
22b1959333
|
Manually fix Android sdk location to support library projects without local.properties
|
2014-05-22 14:04:00 -04:00 |
|
Steven Gill
|
c349892c5b
|
CB-6552: updated author to apache software foundation in pacakge.json
|
2014-04-30 12:55:28 -07:00 |
|
Steven Gill
|
3d4b8ce99b
|
CB-6552: updated test field
|
2014-04-30 11:59:29 -07:00 |
|
Steven Gill
|
64fd87134f
|
CB-6552: added top level package.json
|
2014-04-30 10:54:58 -07:00 |
|