You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/04/23 20:57:29 UTC
[1/9] git commit: CB-6114 Incremented plugin version on dev branch.
Repository: cordova-plugin-media
Updated Branches:
refs/heads/master ea7b96bcc -> 19dd42984
CB-6114 Incremented plugin version on dev branch.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/115307a5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/115307a5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/115307a5
Branch: refs/heads/master
Commit: 115307a5babf1ce7626d3220ec264d1f92d6bb26
Parents: 9b7c460
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 27 12:29:15 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 27 12:29:15 2014 -0500
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/115307a5/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 762c652..d91bf18 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.media"
- version="0.2.9">
+ version="0.2.10-dev">
<name>Media</name>
<description>Cordova Media Plugin</description>
[7/9] git commit: CB-6460: Update license headers
Posted by ia...@apache.org.
CB-6460: Update license headers
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/1dec789f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/1dec789f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/1dec789f
Branch: refs/heads/master
Commit: 1dec789fe20cda9e38e7595aee741d22af881bf1
Parents: c4aea36
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Apr 16 16:19:21 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed Apr 16 16:19:21 2014 -0400
----------------------------------------------------------------------
plugin.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/1dec789f/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 8827753..cfcfac0 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
[4/9] git commit: CB-6225 - Media plugin does not specify a
dependency on File plugin 1.0.1
Posted by ia...@apache.org.
CB-6225 - Media plugin does not specify a dependency on File plugin 1.0.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/e504d669
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/e504d669
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/e504d669
Branch: refs/heads/master
Commit: e504d6696cf5727e5df42b43fa0933ecf10f527a
Parents: 1da3f34
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Mar 11 13:13:41 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Mar 11 13:16:31 2014 -0700
----------------------------------------------------------------------
plugin.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/e504d669/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index d91bf18..8827753 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -11,6 +11,8 @@ id="org.apache.cordova.media"
<keywords>cordova,media</keywords>
<repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git</repo>
<issue>https://issues.apache.org/jira/browse/CB/component/12320647</issue>
+
+ <dependency id="org.apache.cordova.file" version="1.0.1" />
<js-module src="www/MediaError.js" name="MediaError">
<clobbers target="window.MediaError" />
[8/9] git commit: CB-6465: Add license headers to Tizen code
Posted by ia...@apache.org.
CB-6465: Add license headers to Tizen code
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/8ff44500
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/8ff44500
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/8ff44500
Branch: refs/heads/master
Commit: 8ff445000b377ab0f08425a05f491438a5038fca
Parents: 1dec789
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Apr 17 09:50:30 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Apr 17 09:50:30 2014 -0400
----------------------------------------------------------------------
src/tizen/MediaProxy.js | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/8ff44500/src/tizen/MediaProxy.js
----------------------------------------------------------------------
diff --git a/src/tizen/MediaProxy.js b/src/tizen/MediaProxy.js
index c035dd5..c2ee4b0 100644
--- a/src/tizen/MediaProxy.js
+++ b/src/tizen/MediaProxy.js
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
var cordova = require('cordova'),
Media = require('org.apache.cordova.media.Media');
[2/9] git commit: Add NOTICE file
Posted by ia...@apache.org.
Add NOTICE file
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/25fb4922
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/25fb4922
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/25fb4922
Branch: refs/heads/master
Commit: 25fb4922fb72365a02538a223c43d31814b533d1
Parents: 115307a
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 27 15:36:31 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 27 15:36:31 2014 -0500
----------------------------------------------------------------------
NOTICE | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/25fb4922/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..8ec56a5
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache Cordova
+Copyright 2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
[9/9] git commit: CB-6452 Updated version and RELEASENOTES.md for
release 0.2.10
Posted by ia...@apache.org.
CB-6452 Updated version and RELEASENOTES.md for release 0.2.10
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/19dd4298
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/19dd4298
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/19dd4298
Branch: refs/heads/master
Commit: 19dd42984eb5232888c213182cdd2bede4a10bd7
Parents: 8ff4450
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Apr 17 10:53:20 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Apr 17 10:53:20 2014 -0400
----------------------------------------------------------------------
RELEASENOTES.md | 8 ++++++++
plugin.xml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/19dd4298/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5da9faf..bed7849 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -61,3 +61,11 @@
### 0.2.9 (Feb 26, 2014)
* CB-6051 Update media plugin to work with new cdvfile:// urls
* CB-5748 Make sure that Media.onStatus is called when recording is started.
+
+### 0.2.10 (Apr 17, 2014)
+* CB-6422: [windows8] use cordova/exec/proxy
+* CB-6212: [iOS] fix warnings compiled under arm64 64-bit
+* CB-6225: Specify plugin dependency on File plugin 1.0.1
+* CB-6460: Update license headers
+* CB-6465: Add license headers to Tizen code
+* Add NOTICE file
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/19dd4298/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index cfcfac0..729fb18 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,7 +21,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.media"
- version="0.2.10-dev">
+ version="0.2.10">
<name>Media</name>
<description>Cordova Media Plugin</description>
[6/9] git commit: CB-6422 [windows8] use cordova/exec/proxy
Posted by ia...@apache.org.
CB-6422 [windows8] use cordova/exec/proxy
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/c4aea36a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/c4aea36a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/c4aea36a
Branch: refs/heads/master
Commit: c4aea36a1ce1befbecc35df873e24497874f4d45
Parents: 29fa80b
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Apr 8 16:31:27 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Apr 8 16:31:27 2014 -0700
----------------------------------------------------------------------
src/windows8/MediaProxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/c4aea36a/src/windows8/MediaProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/MediaProxy.js b/src/windows8/MediaProxy.js
index bf380b4..ba8ee88 100644
--- a/src/windows8/MediaProxy.js
+++ b/src/windows8/MediaProxy.js
@@ -180,4 +180,4 @@ module.exports = {
}
};
-require("cordova/windows8/commandProxy").add("Media",module.exports);
+require("cordova/exec/proxy").add("Media",module.exports);
[5/9] git commit: CB-6212 iOS: fix warnings compiled under arm64
64-bit
Posted by ia...@apache.org.
CB-6212 iOS: fix warnings compiled under arm64 64-bit
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/29fa80ba
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/29fa80ba
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/29fa80ba
Branch: refs/heads/master
Commit: 29fa80ba5dfa27f5be4e254442d72037cf3ff71e
Parents: e504d66
Author: James Jong <wj...@gmail.com>
Authored: Wed Mar 12 13:41:36 2014 -0400
Committer: James Jong <wj...@gmail.com>
Committed: Wed Mar 12 13:41:36 2014 -0400
----------------------------------------------------------------------
src/ios/CDVSound.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/29fa80ba/src/ios/CDVSound.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVSound.m b/src/ios/CDVSound.m
index 5364fcb..0dad4a6 100644
--- a/src/ios/CDVSound.m
+++ b/src/ios/CDVSound.m
@@ -253,7 +253,7 @@
{
NSMutableDictionary* errorDict = [NSMutableDictionary dictionaryWithCapacity:2];
- [errorDict setObject:[NSNumber numberWithUnsignedInt:code] forKey:@"code"];
+ [errorDict setObject:[NSNumber numberWithUnsignedInteger:code] forKey:@"code"];
[errorDict setObject:message ? message:@"" forKey:@"message"];
return [errorDict JSONString];
}
[3/9] git commit: Merge branch 'master' into dev
Posted by ia...@apache.org.
Merge branch 'master' into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/1da3f34f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/1da3f34f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/1da3f34f
Branch: refs/heads/master
Commit: 1da3f34f8a7e40549c49a236d294268a9bc35b32
Parents: 25fb492 ea7b96b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 27 16:04:40 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 27 16:04:40 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------