Andrew Grieve
6abb9da88a
Merge branch 'master' into 4.0.x
...
Conflicts:
bin/templates/project/custom_rules.xml
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/junit/MessageTest.java
2014-06-08 22:54:21 -04:00
Ian Clelland
7e9fdb3555
Remove Ant custom build directories
2014-06-05 13:11:14 -04:00
Andrew Grieve
743541218f
CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
2014-06-03 16:08:35 -04:00
Andrew Grieve
94de0a7ce2
Add a comment to custom_rules.xml saying why we move AndroidManifest.xml
2014-06-03 15:29:06 -04:00
Ningxin Hu
4a67dd2e28
Crosswalk runtime needs the two permissions to auto detect connection status.
...
See more details at: https://crosswalk-project.org/jira/browse/XWALK-1324
2014-04-29 22:50:11 -04:00
Michal Mocny
298cd9e065
Fix CB-6048: Set launchMode=singleTop so tapping app icon does not always restart app
2014-04-01 11:33:40 -04:00
Marcel Kinard
87285d94f7
CB-5908: add splascreen images to template
...
This will enable the default splashscreens to reside in the correct place
after creating a new project. Before only the default icons were present.
I copied these from cordova-app-hello-world.
2014-02-10 16:56:45 -05:00
Andrew Grieve
5b2a73e3eb
CB-5715 For CLI, hide assets/www and res/xml/config.xml by default
...
Add a helper file under assets to say how to re-show the hidden files.
Move the config.xml, www, merges entries to the root to be more discoverable.
2014-01-28 00:28:42 -05:00
Andrew Grieve
6f163a6ba5
CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ as a project when importing
2014-01-25 21:58:28 -05:00
Andrew Grieve
1fe7bbbbc4
CB-5793 Make ant work-around work on windows.
2014-01-21 21:14:32 -05:00
Andrew Grieve
f83d7a7cd1
CB-5793 Add work-around for library references not working with custom output directory (ugh).
2014-01-21 15:09:15 -05:00
Andrew Grieve
fcae58d355
CB-4910 Fix CLI's eclipse project template not working on windows due to "*" in the virtual folder name.
2014-01-17 12:00:29 -05:00
Andrew Grieve
51abf5b0a6
CB-4910 Update CLI project template to point to config.xml at the root now that it's not in www/ by default.
2014-01-14 12:29:53 -05:00
Andrew Grieve
5e0479e414
CB-5715 Add Eclipse .project file to create template.
...
Adds resource filter to hide CordovaLib/, platform_www/, and cordova/.
Adds linked resources to root www/, merges/, config.xml
2014-01-02 16:40:48 -05:00
Andrew Grieve
942c77816d
CB-5447 Removed android:debuggable=“true” from project template.
2013-12-30 11:27:17 -05:00
charles bourasseau
e646a0840d
Add missing semicolon
2013-12-05 12:41:28 -05:00
Josh Soref
74ea6bf00a
Spelling fixes
2013-12-05 12:20:58 -05:00
Andrew Grieve
34bdef9c45
[CB-4817] Remove unused assets in project template.
2013-09-13 23:07:41 -04:00
Andrew Grieve
cad673f8cd
[CB-4817] Avoid generating unused files in create script
...
by using "android update project" instead of "android create project"
2013-09-13 22:49:15 -04:00
Joe Bowser
39d32bcb5b
CB-4620: Throwing this over the fence, since there is a problem actually in the wild here
2013-09-11 15:02:00 -07:00
Fil Maj
5ee178789f
Axed all permissions from template manifest except for INTERNET. Bumped minSDkVersion to 10.
2013-06-17 11:23:17 -07:00
Andrew Grieve
8a95ed8ee6
[CB-3307] Rename cordova-VERSION.js -> cordova.js
2013-05-08 09:52:56 -04:00
Joe Bowser
b42c918973
Prep for 2.6.0 final
2013-04-01 14:54:51 -07:00
Joe Bowser
31bc015cdd
Pre-2.6 prep
2013-03-21 10:35:09 -07:00
Joe Bowser
fb1455a17b
Preparing to tag 2.5.0
2013-02-26 13:49:47 -08:00
Joe Bowser
5cd17730b1
Tagging 2.5.0rc1. Updating files
2013-02-19 11:53:36 -08:00
Joe Bowser
db099e7722
Preparing for 2.4.0
2013-02-04 11:12:52 -08:00
Andrew Grieve
d29eb84010
Tagging 2.4.0rc2
2013-01-30 09:51:40 -05:00
Fil Maj
09035eb4c4
Setting template AndroidManifest values for version to 1.0 and code to 1.
2013-01-23 12:13:07 -08:00
Joe Bowser
dbfe12a993
Partial fix for CB-2269, we probably shoudln't call Config.init twice
2013-01-18 16:41:10 -08:00
Joe Bowser
679de40780
2.4.0rc1 updating
2013-01-18 15:33:38 -08:00
Braden Shepherdson
55074b925f
Added a comment to explain where the start page is getting set.
2013-01-11 10:24:03 -08:00
Braden Shepherdson
958424ce59
Add configurable start location to config.xml and template
...
Still possible to hardcode, there's a comment in the template showing
how that can be done.
2013-01-11 10:24:02 -08:00
Braden Shepherdson
d04fc289ac
Move config.xml parsing into its own Config class
...
Now the parsing happens very early in the bootstrap process, before
loadUrl() is called. This enables a future change to put the start page
in config.xml instead of hardcoding it.
2013-01-11 10:24:02 -08:00
Joe Bowser
7c069f14f8
Incrementing version to 2.3.0 final
2013-01-02 17:07:21 -08:00
Joe Bowser
6efeb1471c
Incremeting version to 2.3.0rc2
2012-12-10 14:26:38 -08:00
Simon MacDonald
7b3724972b
Tagging to 2.3.0rc1
2012-11-26 16:09:52 -05:00
Joe Bowser
e55327b064
Tagging the 2.2.0 release after this commit
2012-10-31 10:57:57 -07:00
Joe Bowser
bef0d47924
Starting incrementing the tag to RC2
2012-10-24 12:06:00 -07:00
Joe Bowser
d3ee322d7c
Updating Hello World
2012-10-15 14:19:46 -07:00
Joe Bowser
08dfb13dbf
Updating Android to 2.2.0rc1
2012-10-15 13:52:19 -07:00
Simon MacDonald
451688a12e
CB-1126: Splashscreen
2012-09-18 11:49:11 -04:00
Simon MacDonald
37b3e980dc
CB-1362: We should add android:hardwareAccelerated=true to the template manifest.xml
2012-09-17 22:09:51 -04:00
Josh Soref
1bc49fe450
Spelling: explicitly
2012-09-17 22:09:51 -04:00
Joe Bowser
5c60b09bf4
Updating the manifest so that it is correct
2012-09-13 11:46:31 -07:00
Simon MacDonald
59a3cf93e6
Tagging 2.1.0
2012-09-12 11:44:53 -04:00
Simon MacDonald
dc40d8afac
CB-1335: Update www/ Application
2012-09-03 13:42:15 -04:00
Simon MacDonald
774d21747a
Tagging 2.1.0rc2
2012-08-31 16:44:53 -04:00
macdonst
f111c245c1
Tagging 2.1.0rc1
2012-08-24 16:44:18 -04:00
macdonst
a219feaa60
Downgrade min sdk version of sample app
2012-08-13 13:30:27 -04:00
Joe Bowser
f2afa4dd50
Tweaking the Android Manfest to cope with new target changes: CB-1147
2012-07-27 13:31:25 -07:00
Joe Bowser
b9b2c6a013
Updating sample project
2012-07-23 10:43:23 -07:00
Joe Bowser
93ec092eaf
Forgot to add the example app. Works with the script
2012-07-20 09:57:26 -07:00
Joe Bowser
29ae492983
Upping the version to 2.0.0
2012-07-18 16:58:03 -07:00
Joe Bowser
9d5fb0b201
Tagging 2.0.0rc1
2012-07-13 15:46:09 -07:00
macdonst
2a8b9ab75e
Tagging to 1.9.0
2012-06-29 15:55:03 -04:00
Joe Bowser
adf4166caa
Incrementing version to 1.9.0rc1 and doing some variable cleanup
2012-06-18 16:00:42 -07:00
Anis Kadri
bf6864bce0
updating cordova.js version
2012-06-08 17:42:06 -07:00
Anis Kadri
3fd158ad6e
renaming create2 and templates2
2012-06-07 20:10:14 -07:00
Anis Kadri
447af8da6a
removing old create and templates
2012-06-07 20:08:22 -07:00
Joe Bowser
58c3f9a187
Updating the JS and the version for tagging
2012-06-06 10:45:44 -04:00
macdonst
d7b79f5042
Upping version to 1.8.0rc1
2012-05-24 21:39:45 -04:00
macdonst
fae0c3dcfd
Fix problem in Android template example getPicture
2012-05-22 14:48:02 -04:00
Fil Maj
0850229c9f
[CB-804] ADded proper cordova icon sizes for the create script
2012-05-17 11:14:23 -07:00
filmaj
1f45503e2f
[CB-659] create script for android on windows now works fully. also pulls down commons-codec jar appropriately
2012-05-17 10:59:38 -07:00
filmaj
7eb3e5d139
[CB-659] create script should work on android
2012-05-16 19:38:11 -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
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
634a9c0f4c
Updating the version to 1.7.0
2012-04-30 13:42:38 -07:00
Joe Bowser
39f261c6e2
Incrementing project to 1.7.0rc1
2012-04-25 11:49:55 -04:00
Fil Maj
3835144b93
[CB-473] run ant clean before ant debug install
2012-04-19 17:25:19 -07:00
Joe Bowser
0772a315c4
CB-489 - Adding .js to the example, thought it was removed for a reason
2012-04-13 13:08:13 -07:00
macdonst
08d7a9c87a
Remove duplicate files from repository
...
We should only have these files in one place in the repo. Changes have been made to the scripts to pick up the xml files from their proper location.
2012-04-13 15:35:49 -04:00
Joe Bowser
eb48055acd
Getting setup to tag 1.6.1
2012-04-12 16:37:27 -07:00
Joe Bowser
e4a52de0a5
Copying new XML into the templates for 1.6.1. Turns out tags are broken
2012-04-12 14:33:29 -07:00
Bryce Curtis
36e6b572b7
Update to version 1.6.0.
2012-04-10 09:01:37 -05:00
Joe Bowser
b532cf8545
Fixing the template, since this doesn't have to be unit tested. :)
2012-04-09 13:43:36 -07:00
Bryce Curtis
8b05ce41dd
Update project template cordova.js reference and title.
2012-04-05 15:39:33 -05:00
macdonst
aa4f2cc4d9
Tagging 1.5.0
2012-03-01 21:29:18 -05:00
macdonst
664a061d10
Rename to Cordova
2012-02-03 10:38:40 -05:00
macdonst
3bff8aec88
Tagging 1.4.1
2012-02-01 15:35:57 -05:00
macdonst
44edcbb3cf
Updating version to 1.4.0
2012-01-30 16:07:20 -05:00
macdonst
3fd2f590fd
Updating version to 1.4.0rc1
2012-01-27 12:06:26 -05: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
4b9e50146e
Tagging to 1.3.0rc1
2011-12-05 11:27:08 -05:00
Fil Maj
538cdb03fc
No -e caused the bash script to fail
2011-11-02 12:01:36 -07:00
nisc
546b33c936
Fixes to make example project build and compile
...
On Ubuntu 11.04, that is.
2011-11-01 22:04:28 +01:00
Bryce Curtis
798d502083
Update for 1.2.0.
2011-10-31 20:46:22 -05:00
macdonst
9eb02a4882
Fix bad tel: link in example/index.html
2011-09-06 14:15:45 -07:00
brianleroux
d34dcf8ee5
cli moving to a phonegap folder, local to the proj and tests
2011-09-01 14:34:11 -07:00
Dave Johnson
75233711e3
Moved around the scripts so that you can create a self contained project that you can run debug, emulate and log from
2011-08-26 10:54:37 -07:00
Dave Johnson
ef8e8a3ab4
Fix up a few things for the ant create to work on mac
2011-08-21 00:29:07 -07:00
davejohnson
8cf00fc788
Moved default plugins.xml, www, and manifest.xml into a folder structure that can be straight copied over a new android project. change the bash script to update the target of the phonegap framework dir before building
2011-08-20 13:27:53 -07:00
