From 32abb68881155c65e4b0189412131ea2ad9aae3b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 10 Dec 2019 20:42:02 +0100 Subject: bump submodules --- build-system/taler-build-scripts | 2 +- help | 2 +- web-common | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts index 25368019..d725a0cd 160000 --- a/build-system/taler-build-scripts +++ b/build-system/taler-build-scripts @@ -1 +1 @@ -Subproject commit 2536801927781ea38fefc3de924934e1c6a74d88 +Subproject commit d725a0cd1b4aa3ff54452a702b8c19db3f3c3393 diff --git a/help b/help index 1ca9f1b3..183cb78c 160000 --- a/help +++ b/help @@ -1 +1 @@ -Subproject commit 1ca9f1b35b286625b05672feea1c16a4de368ed5 +Subproject commit 183cb78c3aa2415b038f6030ca353c3d592301ac diff --git a/web-common b/web-common index caf5a981..0968eb3d 160000 --- a/web-common +++ b/web-common @@ -1 +1 @@ -Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c +Subproject commit 0968eb3d4023a8a0a37f7069f162eb786a6e04d2 -- cgit v1.2.3 From d870b94c0cf62272e61d804d8485f21f3350ba4f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 10 Dec 2019 20:58:39 +0100 Subject: configure should not be versioned, as it is created by bootstrap --- .gitignore | 2 ++ configure | 53 ----------------------------------------------------- 2 files changed, 2 insertions(+), 53 deletions(-) delete mode 100755 configure diff --git a/.gitignore b/.gitignore index e9eb5cfa..ced8cef8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/configure + ./*.html common/*.inc diff --git a/configure b/configure deleted file mode 100755 index 4ffb738b..00000000 --- a/configure +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# This file is part of TALER -# (C) 2019 GNUnet e.V. -# -# This is very simple POSIX sh script which -# identifies the first matching -# python3 identifier in $PATH and produces -# configure.py from configure.py.in, and then -# calls the new executable configure.py. -# -# It should be portable on Unices. Report bugs on -# the bugtracker if you discover that it isn't -# working as intended. -# -# Authors: -# Author: ng0 -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE -# LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF -# THIS SOFTWARE. -# -# SPDX-License-Identifier: 0BSD - -# we invoke configure not as a symlink but as a copy, -# so we have to use a fixed location for the repository! -dir=$(dirname "$(readlink -f -- "$0")")/build-system/taler-build-scripts -. $dir/sh/lib.sh/existence.sh -. $dir/sh/lib.sh/existence_python.sh - -scriptpath=build-system/taler-build-scripts - -if ! test -d "$scriptpath"; then - echo "fatal error: taler-build-scripts not found at $scriptpath" >&2 - exit 1 -fi - -export PYTHONPATH="$scriptpath:${PYTHONPATH:-}" - -# Call configure.py, assuming all went well. -# $1 is read by configure.py as the prefix. -# If $1 is empty, the python script checks the -# environment for PREFIX. We might need more -# variables and switches, such as DESTDIR. -exec "$PYTHON" ./configure.py $@ -- cgit v1.2.3 From 6bfcf1874ec5341adf936cafbef0feb5bf542297 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 10 Dec 2019 20:59:23 +0100 Subject: generate relative URLs --- common/navigation.j2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index c8a645bd..278a70c2 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc @@ -1,6 +1,6 @@ {% macro navlink(site, text) -%} + href="{{ site }}"> {{ text }} {%- endmacro %} -- cgit v1.2.3 From 7e19fdcf49f237840cf79a75cfb6bc43fb3c3656 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 10 Dec 2019 21:45:01 +0100 Subject: wallet privacy policy draft --- template/wallet-privacy-policy.html.j2 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 template/wallet-privacy-policy.html.j2 diff --git a/template/wallet-privacy-policy.html.j2 b/template/wallet-privacy-policy.html.j2 new file mode 100644 index 00000000..87f74c33 --- /dev/null +++ b/template/wallet-privacy-policy.html.j2 @@ -0,0 +1,25 @@ +{% extends "common/base.j2" %} +{% block body_content %} + +
+ +

GNU Taler Android Wallet Privacy Policy

+ +

The GNU Taler Android Wallet allows its users to interact with third-party +service providers (such as exchanges, banks and merchants) through the GNU +Taler protocol. When using the GNU Taler Android Wallet to interact with such +service providers, these interactions are subject to the Privacy Policy of the +respective service provider.

+ + +

The GNU Taler Android Wallet does not automatically collect and send data to +the developers of the app or any third party.

+ +

Why are camera permissions required?

+ +

The camera permissions are required to scan QR codes. The images taken are +processed locally on your devices and never sent to a third party.

+ +
+ +{% endblock body_content %} -- cgit v1.2.3 From 704b735b91fbd78fe67a5f922aff4c20c6888ab0 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 10 Dec 2019 21:59:22 +0100 Subject: rename privacy policy to be android specific --- template/wallet-android-privacy-policy.html.j2 | 25 +++++++++++++++++++++++++ template/wallet-privacy-policy.html.j2 | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 template/wallet-android-privacy-policy.html.j2 delete mode 100644 template/wallet-privacy-policy.html.j2 diff --git a/template/wallet-android-privacy-policy.html.j2 b/template/wallet-android-privacy-policy.html.j2 new file mode 100644 index 00000000..87f74c33 --- /dev/null +++ b/template/wallet-android-privacy-policy.html.j2 @@ -0,0 +1,25 @@ +{% extends "common/base.j2" %} +{% block body_content %} + +
+ +

GNU Taler Android Wallet Privacy Policy

+ +

The GNU Taler Android Wallet allows its users to interact with third-party +service providers (such as exchanges, banks and merchants) through the GNU +Taler protocol. When using the GNU Taler Android Wallet to interact with such +service providers, these interactions are subject to the Privacy Policy of the +respective service provider.

+ + +

The GNU Taler Android Wallet does not automatically collect and send data to +the developers of the app or any third party.

+ +

Why are camera permissions required?

+ +

The camera permissions are required to scan QR codes. The images taken are +processed locally on your devices and never sent to a third party.

+ +
+ +{% endblock body_content %} diff --git a/template/wallet-privacy-policy.html.j2 b/template/wallet-privacy-policy.html.j2 deleted file mode 100644 index 87f74c33..00000000 --- a/template/wallet-privacy-policy.html.j2 +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "common/base.j2" %} -{% block body_content %} - -
- -

GNU Taler Android Wallet Privacy Policy

- -

The GNU Taler Android Wallet allows its users to interact with third-party -service providers (such as exchanges, banks and merchants) through the GNU -Taler protocol. When using the GNU Taler Android Wallet to interact with such -service providers, these interactions are subject to the Privacy Policy of the -respective service provider.

- - -

The GNU Taler Android Wallet does not automatically collect and send data to -the developers of the app or any third party.

- -

Why are camera permissions required?

- -

The camera permissions are required to scan QR codes. The images taken are -processed locally on your devices and never sent to a third party.

- -
- -{% endblock body_content %} -- cgit v1.2.3