merchant: master e3a8b30d

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-01-19 15:39 master 6c2ab7a4
Changeset Merge branch 'master' of git.taler.net:/var/git/merchant
mod - .gitignore Diff File
mod - configure.ac Diff File
rm - contrib/merchant.conf Diff File
add - m4/libcurl.m4 Diff File
mod - src/backend/merchant.conf Diff File
mod - src/backend/taler-merchant-httpd.c Diff File
mod - src/backend/taler-merchant-httpd.h Diff File
mod - src/backend/taler-merchant-httpd_contract.c Diff File
mod - src/backend/taler-merchant-httpd_mints.c Diff File
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/frontend/checkout.php Diff File
add - src/frontend/execute.js Diff File
add - src/frontend/execute.php Diff File
add - src/frontend/execute.tsx Diff File
mod - src/frontend/fulfillment.php Diff File
mod - src/frontend/generate_taler_contract.php Diff File
mod - src/frontend/index.html Diff File
mod - src/frontend/pay.php Diff File
mod - src/frontend/style.css Diff File
mod - src/include/Makefile.am Diff File
add - src/include/taler_merchant_service.h Diff File
mod - src/include/taler_merchantdb_plugin.h Diff File
add - src/lib/Makefile.am Diff File
add - src/lib/merchant_api_context.c Diff File
add - src/lib/merchant_api_context.h Diff File
add - src/lib/merchant_api_json.c Diff File
add - src/lib/merchant_api_json.h Diff File
add - src/lib/merchant_api_pay.c Diff File
add - src/lib/test-mint-home/config/mint-common.conf Diff File
add - src/lib/test-mint-home/config/mint-keyup.conf Diff File
add - src/lib/test-mint-home/master.priv Diff File
add - src/lib/test-mint-home/sepa.json Diff File
add - src/lib/test_merchant.conf Diff File
add - src/lib/test_merchant.priv Diff File
add - src/lib/test_merchant_api.c Diff File
add - src/tsconfig.json Diff File