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
