You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2016/08/09 23:27:50 UTC
[18/19] cordova-lib git commit: fixed merge conflict
fixed merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3e57e4c3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3e57e4c3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3e57e4c3
Branch: refs/heads/common-1.4.x
Commit: 3e57e4c33bc7d644b8c2de0928d60e196da21d55
Parents: 09ab5bb 46051b8
Author: Steve Gill <st...@gmail.com>
Authored: Tue Aug 9 16:25:43 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Aug 9 16:25:43 2016 -0700
----------------------------------------------------------------------
cordova-common/RELEASENOTES.md | 7 ++
cordova-common/cordova-common.js | 1 +
cordova-common/package.json | 2 +-
cordova-common/spec/CordovaCheck.spec.js | 104 +++++++++++++++++++
cordova-common/spec/util/xml-helpers.spec.js | 10 ++
.../src/ConfigChanges/ConfigChanges.js | 12 ++-
cordova-common/src/ConfigParser/ConfigParser.js | 20 ++--
cordova-common/src/CordovaCheck.js | 76 ++++++++++++++
cordova-common/src/PluginInfo/PluginInfo.js | 1 +
cordova-common/src/util/xml-helpers.js | 84 +++++++--------
cordova-fetch/package.json | 2 +-
cordova-lib/package.json | 2 +-
cordova-lib/spec-cordova/emulate.spec.js | 24 +++++
cordova-lib/spec-cordova/run.spec.js | 25 +++++
cordova-lib/spec-cordova/save.spec.js | 46 ++++++--
cordova-lib/src/cordova/emulate.js | 35 ++++---
cordova-lib/src/cordova/platform.js | 24 +++--
cordova-lib/src/cordova/plugin.js | 6 ++
cordova-lib/src/cordova/prepare.js | 2 +-
cordova-lib/src/cordova/run.js | 29 +++---
cordova-lib/src/cordova/util.js | 15 ++-
21 files changed, 421 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e57e4c3/cordova-common/RELEASENOTES.md
----------------------------------------------------------------------
diff --cc cordova-common/RELEASENOTES.md
index 71ad1ea,01037d4..d09d42e
--- a/cordova-common/RELEASENOTES.md
+++ b/cordova-common/RELEASENOTES.md
@@@ -20,9 -20,13 +20,16 @@@
-->
# Cordova-common Release Notes
+ ### 1.4.1 (Aug 09, 2016)
+ * Add general purpose `ConfigParser.getAttribute` API
+ * [CB-11653](https://issues.apache.org/jira/browse/CB-11653) moved `findProjectRoot` from `cordova-lib` to `cordova-common`
+ * [CB-11636](https://issues.apache.org/jira/browse/CB-11636) Handle attributes with quotes correctly
+ * [CB-11645](https://issues.apache.org/jira/browse/CB-11645) added check to see if `getEditConfig` exists before trying to use it
+ * [CB-9825](https://issues.apache.org/jira/browse/CB-9825) framework tag spec parsing
+
+### 1.4.0 (Jul 12, 2016)
+* [CB-11023](https://issues.apache.org/jira/browse/CB-11023) Add edit-config functionality
+
### 1.3.0 (May 12, 2016)
* [CB-11259](https://issues.apache.org/jira/browse/CB-11259): Improving prepare and build logging
* [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Improve cordova load time
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org