cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject [50/50] [abbrv] git commit: Merge branch 'master' into cdvtest
Date Mon, 05 May 2014 16:10:37 GMT
Merge branch 'master' into cdvtest

Conflicts:
	plugin.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/fa4717c8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/fa4717c8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/fa4717c8

Branch: refs/heads/cdvtest
Commit: fa4717c8269ac1b12c0c3b9935105a059c41b6e3
Parents: ab0bf04 19445dc
Author: Michal Mocny <mmocny@gmail.com>
Authored: Mon May 5 12:09:35 2014 -0400
Committer: Michal Mocny <mmocny@gmail.com>
Committed: Mon May 5 12:09:35 2014 -0400

----------------------------------------------------------------------
 CONTRIBUTING.md                                 |  16 +
 NOTICE                                          |   5 +
 README.md                                       |  25 +-
 RELEASENOTES.md                                 |  40 ++
 doc/index.md                                    | 687 +++++++++++++++++++
 docs/Contact/contact.md                         | 238 -------
 docs/ContactAddress/contactaddress.md           | 161 -----
 docs/ContactError/contactError.md               |  45 --
 docs/ContactField/contactfield.md               | 148 ----
 docs/ContactFindOptions/contactfindoptions.md   | 118 ----
 docs/ContactName/contactname.md                 | 147 ----
 docs/ContactOrganization/contactorganization.md | 148 ----
 docs/contacts.create.md                         |  78 ---
 docs/contacts.find.md                           | 119 ----
 docs/contacts.md                                | 104 ---
 docs/parameters/contactError.md                 |  27 -
 docs/parameters/contactFields.md                |  25 -
 docs/parameters/contactFindOptions.md           |  35 -
 docs/parameters/contactSuccess.md               |  40 --
 plugin.xml                                      |  63 +-
 src/android/ContactAccessorSdk5.java            |   4 +-
 src/blackberry10/plugin.xml                     |  41 --
 src/firefoxos/ContactsProxy.js                  | 507 ++++++++++++--
 src/ios/CDVContact.m                            |   2 +-
 src/ios/CDVContacts.m                           |  27 +-
 src/ubuntu/contacts.cpp                         | 576 ++++++++++++++++
 src/ubuntu/contacts.h                           |  70 ++
 src/windows8/ContactProxy.js                    | 151 ++++
 src/wp/Contacts.cs                              |  59 +-
 29 files changed, 2112 insertions(+), 1594 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/fa4717c8/plugin.xml
----------------------------------------------------------------------


Mime
View raw message