You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pv...@apache.org on 2021/06/28 15:21:13 UTC
[cordova-plugin-whitelist] 01/01: Merge branch 'master' into 1.3.x
This is an automated email from the ASF dual-hosted git repository.
pvpoyer pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-whitelist.git
commit c02580b0cf0d09c921b0154192c9431ef41e92d3
Merge: 03bb9cb 2e5db06
Author: PVPoyer <pi...@portofantwerp.com>
AuthorDate: Mon Jun 28 17:20:40 2021 +0200
Merge branch 'master' into 1.3.x
# Conflicts:
# RELEASENOTES.md
# package.json
# plugin.xml
.asf.yaml | 26 ++++
.gitattributes | 1 +
.github/ISSUE_TEMPLATE.md | 42 ++++++
.github/ISSUE_TEMPLATE/BUG_REPORT.md | 50 +++++++
.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 29 ++++
.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md | 27 ++++
.github/PULL_REQUEST_TEMPLATE.md | 27 +++-
.npmignore | 3 +
.travis.yml | 119 ++++++++++++++++
CONTRIBUTING.md | 6 +-
README.md | 166 ++++++++++++----------
RELEASENOTES.md | 29 ++++
doc/de/README.md | 148 --------------------
doc/es/README.md | 148 --------------------
doc/fr/README.md | 148 --------------------
doc/it/README.md | 148 --------------------
doc/ja/README.md | 148 --------------------
doc/ko/README.md | 148 --------------------
doc/pl/README.md | 148 --------------------
doc/zh/README.md | 148 --------------------
package.json | 21 +--
plugin.xml | 8 +-
tests/README.md | 53 +++++++
tests/package.json | 15 ++
plugin.xml => tests/plugin.xml | 40 +++---
tests/scripts/remove-access.js | 19 +++
tests/src/android/WhitelistAPI.java | 90 ++++++++++++
tests/tests.js | 214 +++++++++++++++++++++++++++++
tests/www/whitelist.js | 34 +++++
29 files changed, 905 insertions(+), 1298 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org