[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 02/03: merging
|
From: |
gnunet |
|
Subject: |
[taler-exchange] 02/03: merging |
|
Date: |
Tue, 11 Feb 2020 16:01:50 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 3ad698d01865c9f1b5c5aadc2f4d8b0a3658b81c
Merge: de0d987e cdaf1ce6
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Feb 11 15:40:37 2020 +0100
merging
.gitignore | 1 +
configure.ac | 4 +-
contrib/Makefile.am | 54 +-
contrib/pp/.gitignore | 3 +
contrib/pp/Makefile.am | 11 -
contrib/pp/README | 58 ++
contrib/pp/conf.py | 282 +++++++++
contrib/pp/en/0.docx | Bin 19110 -> 0 bytes
contrib/pp/en/0.epub | Bin 0 -> 13772 bytes
contrib/pp/en/0.html | 387 ++++++------
contrib/pp/en/0.pdf | Bin 0 -> 81244 bytes
contrib/pp/en/0.txt | 190 ++++--
contrib/pp/en/0.xml | 167 +++++
contrib/pp/locale/de/LC_MESSAGES/pp.po | 283 +++++++++
contrib/pp/pp.rst | 176 ++++++
contrib/taler-bank-manage-testing | 6 +
contrib/taler-exchange-revoke | 24 +
contrib/tos/.gitignore | 3 +
contrib/tos/Makefile | 109 ++++
contrib/tos/Makefile.am | 11 -
contrib/tos/README | 58 ++
contrib/tos/conf.py | 282 +++++++++
contrib/tos/en/0.docx | Bin 22460 -> 0 bytes
contrib/tos/en/0.epub | Bin 0 -> 16629 bytes
contrib/tos/en/0.html | 683 ++++++++++-----------
contrib/tos/en/0.pdf | Bin 0 -> 99859 bytes
contrib/tos/en/0.txt | 624 +++++++++++--------
contrib/tos/en/0.xml | 344 +++++++++++
contrib/tos/locale/de/LC_MESSAGES/tos.po | 517 ++++++++++++++++
contrib/tos/{en/0.txt => tos.rst} | 75 ++-
contrib/update-pp.sh | 28 +
contrib/update-tos.sh | 28 +
src/auditor/taler-auditor-httpd.c | 7 +-
.../taler-auditor-httpd_deposit-confirmation.c | 113 +++-
.../taler-auditor-httpd_deposit-confirmation.h | 12 +
src/auditor/taler-auditor.c | 2 +
src/auditor/taler-wire-auditor.c | 18 +-
src/auditor/test-auditor.sh | 43 ++
src/auditordb/Makefile.am | 4 +-
src/auditordb/{0000.sql => auditor-0000.sql} | 0
src/auditordb/{0001.sql => auditor-0001.sql} | 4 +-
src/auditordb/auditordb_plugin.c | 5 +-
src/auditordb/plugin_auditordb_postgres.c | 95 +--
src/bank-lib/Makefile.am | 1 +
src/bank-lib/bank_api_config.c | 255 ++++++++
src/bank-lib/bank_api_credit.c | 23 +-
src/bank-lib/bank_api_debit.c | 30 +-
src/bank-lib/fakebank.c | 63 +-
src/bank-lib/taler-fakebank-run.c | 28 +-
src/benchmark/taler-exchange-benchmark.c | 36 +-
src/exchange-tools/taler-exchange-keyup.c | 2 +
src/exchange-tools/taler-exchange-wire.c | 2 +
src/exchange/Makefile.am | 4 +-
src/exchange/taler-exchange-aggregator.c | 36 +-
src/exchange/taler-exchange-httpd.c | 2 +
src/exchange/taler-exchange-httpd_mhd.c | 9 +-
src/exchange/taler-exchange-httpd_refresh_melt.c | 2 +-
src/exchange/taler-exchange-httpd_refresh_reveal.c | 2 +-
src/exchange/taler-exchange-httpd_refund.c | 57 +-
src/exchange/taler-exchange-httpd_reserve_status.c | 2 +-
.../taler-exchange-httpd_reserve_withdraw.c | 2 +-
src/exchange/taler-exchange-httpd_responses.c | 2 +-
src/exchange/taler-exchange-wirewatch.c | 6 +-
src/exchange/test_taler_exchange_httpd_restart.sh | 114 ++++
src/exchange/test_taler_exchange_unix.conf | 137 +++++
src/exchangedb/Makefile.am | 4 +-
src/exchangedb/{0000.sql => exchange-0000.sql} | 0
src/exchangedb/{0001.sql => exchange-0001.sql} | 54 +-
src/exchangedb/exchangedb_plugin.c | 6 +-
src/exchangedb/plugin_exchangedb_postgres.c | 77 +--
src/include/taler_bank_service.h | 73 ++-
src/include/taler_error_codes.h | 5 +
src/include/taler_fakebank_lib.h | 4 +-
src/include/taler_testing_lib.h | 8 +-
src/json/json.c | 3 +-
src/testing/test_bank_api.c | 36 +-
src/testing/test_taler_exchange_aggregator.c | 78 +--
src/testing/testing_api_cmd_exec_wirewatch.c | 2 +-
src/testing/testing_api_helpers_bank.c | 7 +-
src/testing/testing_api_helpers_exchange.c | 2 +-
src/testing/testing_api_loop.c | 88 ++-
81 files changed, 4641 insertions(+), 1332 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden.