[taler-merchant] 17/31: Merge branch 'master' into tokens

[gnunet]

This is an automated email from the git hooks/post-receive script.

christian-blaettler pushed a commit to branch master
in repository merchant.

commit 4ebac01e89badb29d361b49310cdd1cc6397b563
Merge: 3a8e0b0f 42cca4fd
Author: Christian Blättler <blatc2@bfh.ch>
AuthorDate: Mon Mar 18 20:59:17 2024 +0100

    Merge branch 'master' into tokens

 configure.ac                                       |  30 +-
 contrib/ci/jobs/4-deb-package/version.sh           |   2 +-
 contrib/wallet-core                                |   2 +-
 debian/changelog                                   |  18 +-
 debian/control                                     |   1 +
 doc/Makefile.am                                    |  25 +-
 doc/prebuilt                                       |   2 +-
 src/backend/Makefile.am                            |   2 +
 src/backend/taler-merchant-httpd.c                 |  12 +-
 src/backend/taler-merchant-httpd_config.c          |   2 +-
 src/backend/taler-merchant-httpd_get-orders-ID.c   |  32 +-
 ...D.c => taler-merchant-httpd_get-templates-ID.c} |  42 +-
 ...D.h => taler-merchant-httpd_get-templates-ID.h} |  15 +-
 .../taler-merchant-httpd_post-orders-ID-pay.c      |   4 +-
 ...ler-merchant-httpd_private-get-otp-devices-ID.c |  29 +-
 ...taler-merchant-httpd_private-get-templates-ID.c |  35 +-
 ...taler-merchant-httpd_private-get-templates-ID.h |   7 +-
 src/backenddb/drop.sql                             |  16 +-
 src/backenddb/pg_lookup_transfers.c                | 428 ++++++---------------
 src/include/taler_merchant_service.h               | 110 +++++-
 src/include/taler_merchant_testing_lib.h           |   7 +-
 src/lib/Makefile.am                                |   3 +-
 src/lib/merchant_api_get_config.c                  |   4 +-
 src/lib/merchant_api_get_otp_device.c              |  14 +-
 ...device.c => merchant_api_wallet_get_template.c} |  67 ++--
 src/testing/test_merchant_api.c                    |   2 +-
 src/testing/test_merchant_api_twisted.c            |   4 +-
 src/testing/testing_api_cmd_get_otp_device.c       |  23 +-
 src/testing/testing_api_cmd_get_transfers.c        |   2 +-
 29 files changed, 428 insertions(+), 512 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.