Source Control Integration

master d7eb23ad 2016-05-05 15:47 Christian Grothoff Details Diff	check for duplicate transaction ID
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/lib/merchant_api_contract.c	Diff File
master b749dcc6 2016-05-05 14:12 Christian Grothoff Details Diff	more work on getting lib test to pass
	mod - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd_auditors.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/lib/test_merchant_api.conf	Diff File
master 20ceb050 2016-05-05 13:53 Christian Grothoff Details Diff	add well-formedness checks for contract
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 404b5861 2016-05-05 12:22 Christian Grothoff Details Diff	fixing issues around testcase
	mod - .gitignore	Diff File
	mod - src/lib/Makefile.am	Diff File
	mod - src/lib/merchant_api_contract.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 7bd9e5fb 2016-05-05 11:16 Christian Grothoff Details Diff	remove unused args from API, towards supporting /contract in testcase
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_contract.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 01f946e7 2016-05-05 10:33 Christian Grothoff Details Diff	parse out /contract response details
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_contract.c	Diff File
master 93b0c3b5 2016-05-05 10:11 Christian Grothoff Details Diff	extending merchant API to have code for doing /contract requests
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	add - src/lib/merchant_api_contract.c	Diff File
master 44388a35 2016-05-04 17:32 Christian Grothoff Details Diff	break on issues
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/lib/test_merchant_api.conf	Diff File
master 0716ec08 2016-05-04 16:18 Christian Grothoff Details Diff	Merge branch 'master' of git.taler.net:/var/git/merchant
	mod - examples/shop/generate_taler_contract.php	Diff File
master 7fe17112 2016-05-04 16:18 Christian Grothoff Details Diff	configure exchange bank details
	mod - src/lib/Makefile.am	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/lib/test_merchant_api.conf	Diff File
	add - src/lib/test_merchant_api_home/.config/taler/test.json	Diff File
master 2abe6e1e 2016-05-04 16:06 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - Makefile.am	Diff File
	mod - src/Makefile.am	Diff File
	mod - src/backend/Makefile.am	Diff File
	mod - src/backenddb/Makefile.am	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/include/Makefile.am	Diff File
	mod - src/lib/Makefile.am	Diff File
	rm - src/lib/merchant_api_context.c	Diff File
	rm - src/lib/merchant_api_context.h	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	rm - src/lib/test-exchange-home/config/exchange-common.conf	Diff File
	rm - src/lib/test-exchange-home/config/exchange-keyup.conf	Diff File
	rm - src/lib/test-exchange-home/master.priv	Diff File
	rm - src/lib/test-exchange-home/sepa.json	Diff File
	rm - src/lib/test_merchant.conf	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	add - src/lib/test_merchant_api.conf	Diff File
	add - src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json	Diff File
	add - src/lib/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv	Diff File
master 09921cbb 2016-05-04 16:06 Marcello Stanisci Details Diff	removing debugging print
	mod - examples/shop/generate_taler_contract.php	Diff File
master a93db26d 2016-05-04 15:47 Christian Grothoff Details Diff	Fixing config setup
	mod - src/lib/Makefile.am	Diff File
	rm - src/lib/test-exchange-home/config/exchange-common.conf	Diff File
	rm - src/lib/test-exchange-home/config/exchange-keyup.conf	Diff File
	rm - src/lib/test-exchange-home/master.priv	Diff File
	rm - src/lib/test-exchange-home/sepa.json	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/lib/test_merchant_api.conf	Diff File
	add - src/lib/test_merchant_api_home/.config/taler/merchant/wire/test.json	Diff File
	add - src/lib/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv	Diff File
master 9edc884e 2016-05-04 15:23 Christian Grothoff Details Diff	fix fmt string issues
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/test_merchant.conf	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master e43b632f 2016-05-04 12:27 Christian Grothoff Details Diff	remove dead code
	rm - src/lib/merchant_api_context.c	Diff File
	rm - src/lib/merchant_api_context.h	Diff File
master 13ef8e95 2016-05-04 12:26 Christian Grothoff Details Diff	fix issues with 'make dist'
	mod - Makefile.am	Diff File
	mod - src/Makefile.am	Diff File
	mod - src/backend/Makefile.am	Diff File
	mod - src/backenddb/Makefile.am	Diff File
	mod - src/include/Makefile.am	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 01568f97 2016-05-04 08:40 Christian Grothoff Details Diff	merge
	mod - copylib/config.php	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/pay.php	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 67165996 2016-05-04 08:39 Christian Grothoff Details Diff	fix 0004486	Affected Issues 0004486
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master e7a7a8a0 2016-05-02 18:40 Marcello Stanisci Details Diff	typo
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master af5c8238 2016-05-02 15:34 Marcello Stanisci Details Diff	removing debug prints
	mod - copylib/config.php	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/pay.php	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 6616d308 2016-05-02 10:31 Christian Grothoff Details Diff	code simplification via new extended libgnunetcurl API
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master b398deb2 2016-05-02 08:35 Christian Grothoff Details Diff	fixing 0004462: avoid temporary schemata altogether
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_auditors.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/backenddb/test_merchantdb.c	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
master 358182c5 2016-05-02 04:22 Christian Grothoff Details Diff	fixing 0004479 for merchant
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master fb7e96e9 2016-04-30 12:58 Christian Grothoff Details Diff	Merge branch 'master' of git+ssh://taler.net/var/git/merchant
	mod - bootstrap	Diff File
	mod - configure.ac	Diff File
	mod - copylib/util.php	Diff File
	add - examples/blog/README	Diff File
	mod - examples/blog/essay_fulfillment.php	Diff File
	mod - examples/blog/essay_pay.php	Diff File
	add - examples/blog/nginx_example.conf	Diff File
	mod - examples/shop/README	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/generate_taler_contract.php	Diff File
	mod - examples/shop/index.php	Diff File
	mod - examples/shop/pay.php	Diff File
	mod - src/backend/merchant.conf	Diff File
	rm - src/backend/myconf.sh	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backenddb/Makefile.am	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	add - src/backenddb/test-merchantdb-postgres.conf	Diff File
	rm - src/backenddb/test_backenddb.c	Diff File
	add - src/backenddb/test_merchantdb.c	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
master 6f5288a2 2016-04-30 12:58 Christian Grothoff Details Diff	update use to match new GNUnet scheduler API
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/tests/test_contract.c	Diff File

Changesets: merchant