Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6B18510914 for ; Mon, 28 Oct 2013 22:13:17 +0000 (UTC) Received: (qmail 95744 invoked by uid 500); 28 Oct 2013 22:13:17 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 95707 invoked by uid 500); 28 Oct 2013 22:13:17 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 95638 invoked by uid 99); 28 Oct 2013 22:13:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Oct 2013 22:13:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0A5B388A00E; Mon, 28 Oct 2013 22:13:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Mon, 28 Oct 2013 22:13:20 -0000 Message-Id: <370238e3669745b19ba4db2602dc2028@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/9] git commit: Merge branch 'dev' Merge branch 'dev' Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/badaf74b Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/badaf74b Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/badaf74b Branch: refs/heads/dev Commit: badaf74ba8cc1de97e8c834dd6c1fcf062346477 Parents: 0774b94 feaf9f3 Author: Steven Gill Authored: Wed Sep 25 18:19:07 2013 -0700 Committer: Steven Gill Committed: Wed Sep 25 18:19:07 2013 -0700 ---------------------------------------------------------------------- CHANGELOG.md | 23 ------ RELEASENOTES.md | 36 +++++++++ plugin.xml | 7 +- src/android/Capture.java | 40 +++++++--- src/android/FileHelper.java | 60 +++++++++++++++ src/ios/CDVCapture.m | 71 +++++++++++++----- src/windows8/CaptureProxy.js | 14 ++-- src/windows8/MediaFile.js | 4 +- test/capture/index.html | 150 ++++++++++++++++++++++++++++++++++++++ test/index.html | 1 + www/MediaFile.js | 2 +- 11 files changed, 342 insertions(+), 66 deletions(-) ----------------------------------------------------------------------