cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [5/5] cordova-wp8 git commit: fixed merge conflicts
Date Thu, 26 Mar 2015 22:25:46 GMT
fixed merge conflicts


Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/6e319c98
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/6e319c98
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/6e319c98

Branch: refs/heads/3.8.x
Commit: 6e319c9828db2f03c9fda72028bb5b935973c5cb
Parents: 6ebc6e6 23033c4
Author: Steve Gill <stevengill97@gmail.com>
Authored: Thu Mar 26 15:25:37 2015 -0700
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Thu Mar 26 15:25:37 2015 -0700

----------------------------------------------------------------------
 RELEASENOTES.md         | 42 +++++++++++++++++++++++++-----------------
 template/www/cordova.js | 20 ++++++++++++--------
 2 files changed, 37 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/6e319c98/RELEASENOTES.md
----------------------------------------------------------------------
diff --cc RELEASENOTES.md
index fc7b21e,44050b9..7bd0c15
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@@ -21,14 -21,30 +21,28 @@@
  
  Release Notes for Cordova (WP8)
  
 -Update these notes using: git log --pretty=format:'* %s' --topo-order --no-merges origin/2.7.x...HEAD
 -
  Cordova is a static library that enables developers to include the Cordova API in their
WP8 application projects easily, and also create new Cordova-based WP8 application projects
through the command-line.
  
- ### 3.8.0 (December 17, 2014) ###
- 
- * Set VERSION to 3.8.0 (via coho)
- * Update JS snapshot to version 3.8.0 (via coho)
- * remove node_version which is breaking appveyor
- * CB-8139 WP8. Fix callback for plugins with native ui
+ ### 3.8.0 (March 26, 2015)
+ * added ecosystem:cordova keyword
+ * CB-8325 minor test improvements with e2e tests
+ * CB-8412 Fix all jshint issues for WP8 platform
+ * CB-8412 Enable jshint for wp8 platform
+ * CB-8417 moved platform specific js into platform
+ * Catch possible errors with JSON.stringify()
+ * Improved console logging Previously, when using console.log facilities, only the first
argument was respected by ConsoleHelper, resulting in information not being logged when cons
+ * Add comment block to explain the intent of this code.
+ * Use WP8 thread pool for each command, instead of starting new thread
+ * CB-8060 AppDeployCmd lookup: prefer original WP8.0 tools
+ * CB-8310: Fix to cordova run wp8 to attempt to deploy to device before it tries to deploy
to emulator
+ * CB-8325 Implemented end-to-end and unit tests using Jasmine
+ * CB-8060 Updated AppDeployCmd lookup code
+ * Use the newer AppDeployCmd when available The old XapDeployCmd could raise "Error: The
parameter is incorrect." with project files that were opened with more recent versions of
Vi
+ * appveyor: show master branch status instead of latest build
+ * CB-8179 Removed CB-7028 from release notes
+ * remove destructor trace
+ * remove debug trace
+ * CB-8139 WP8. Fix callback for plugins with native ui (capture, contactPicker, BarcodeScanner,
other)
  * CB-7892 XHR to local files poly should only load/run once
  * Fix AutoloadPlugins
  * updated description in package.json
@@@ -50,8 -64,8 +62,7 @@@
  * CB-7493 Adds `space-in-path` and `unicode in name` tests for `CI`
  * cleanup ignores and add missing windows cmd files, if you want to add a `bundledDependency`
`node_module` use `-f`
  
--### 3.6.4 (September 30, 2014) ###
--
++### 3.6.4 (September 30, 2014)
  * Updated JS snapshot + set version to 3.6.4
  * CB-7616 partial match support for --target
  * CB-7616 Deploy on WP8 fails to run specific target
@@@ -62,8 -76,8 +73,7 @@@
  * Moves node_modules from package root to bin/ folder
  * CB-7444 Fixes XHR callback failure when requested file doesn't exists
  
--### 3.6.0 (September 2, 2014) ###
--
++### 3.6.0 (September 2, 2014)
  * updated package.json
  * Update 3.6.x branch
  * update package to 3.6.0-dev
@@@ -127,8 -141,8 +137,7 @@@
  * Apply app-hello-world update
  
  
--### 3.5.0 (201405XX) ###
--
++### 3.5.0 (201405XX)
  * Apply app-hello-world update
  * CB-6558: added package.json files for wp7 & wp8
  * CB-6491 add CONTRIBUTING.md
@@@ -156,8 -170,8 +165,7 @@@
  * Update to 3.4.0-rc1
  
  
--### 3.4.0 (201402XX) ###
--
++### 3.4.0 (201402XX)
  * Update to 3.4.0 proper
  * CB-6041 createTemplates should install them for VS-2013 as well
  * CB-5951 Added namespace to config.xml

http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/6e319c98/template/www/cordova.js
----------------------------------------------------------------------
diff --cc template/www/cordova.js
index 0d1c344,54032be..bb0d061
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@@ -19,7 -19,7 +19,7 @@@
   under the License.
  */
  ;(function() {
--var PLATFORM_VERSION_BUILD_LABEL = '3.8.0';
++var PLATFORM_VERSION_BUILD_LABEL = '3.9.0-dev';
  // file: src/scripts/require.js
  
  /*jshint -W079 */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message