Source Control Integration

master bd6275a3 2016-06-03 16:32 Christian Grothoff Details Diff	Merge branch 'master' of git.taler.net:/var/git/merchant
master 0ee871ed 2016-06-03 16:32 Christian Grothoff Details Diff	merge MHD_start_daemon calls
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 3ed42689 2016-06-02 18:05 Marcello Stanisci Details Diff	triggering buildbot
master 6ac0e0f5 2016-06-02 11:33 Christian Grothoff Details Diff	add support for -C option
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd.h	Diff File
	mod - src/backend/taler-merchant-httpd_responses.c	Diff File
master 3daed452 2016-06-02 11:27 Christian Grothoff Details Diff	remove dead code
	mod - src/lib/test_merchant_api.c	Diff File
master 28d9627c 2016-06-02 11:26 Christian Grothoff Details Diff	check return value
	mod - src/lib/test_merchant_api.c	Diff File
master 7c99bc50 2016-06-02 11:25 Christian Grothoff Details Diff	fix check
	mod - src/lib/merchant_api_pay.c	Diff File
master b95ef4ef 2016-06-01 19:30 Christian Grothoff Details Diff	release notes
	mod - ChangeLog	Diff File
master 6f74dcac 2016-05-31 22:48 Christian Grothoff Details Diff	bump submodule
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master bd9eed9d 2016-05-31 22:45 Christian Grothoff Details Diff	comment out /track/deposit test from marcello, as code is incomplete
	mod - src/lib/merchant_api_track.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 552e5882 2016-05-31 19:31 Christian Grothoff Details Diff	Merge branch 'master' of git+ssh://taler.net/var/git/merchant
	mod - src/backend/Makefile.am	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_exchanges.c	Diff File
	mod - src/backend/taler-merchant-httpd_mhd.c	Diff File
	mod - src/backend/taler-merchant-httpd_parsing.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_responses.c	Diff File
	mod - src/backend/taler-merchant-httpd_responses.h	Diff File
	add - src/backend/taler-merchant-httpd_track.c	Diff File
	mod - src/backend/taler-merchant-httpd_track.h	Diff File
	rm - src/backend/taler-merchant-httpd_util.c	Diff File
	mod - src/include/taler_merchant_service.h	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
	add - src/lib/merchant_api_track.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/tests/test_contract.c	Diff File
master 29976e05 2016-05-31 19:31 Christian Grothoff Details Diff	build system modifications for 0004133
	mod - configure.ac	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master e76a7e19 2016-05-31 17:55 Florian Dold Details Diff	newlines
	mod - src/lib/test_merchant_api.c	Diff File
master ce2f6a8f 2016-05-31 17:46 Christian Grothoff Details Diff	fail gracefully if binaries are not found
	mod - src/lib/test_merchant_api.c	Diff File
master 2ba8d5fa 2016-05-31 17:19 Christian Grothoff Details Diff	reset db for test
	mod - src/lib/test_merchant_api.c	Diff File
master bc413f88 2016-05-31 17:12 Christian Grothoff Details Diff	handle wire transfer deadline conflict with execution time
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 70c58304 2016-05-31 16:33 Christian Grothoff Details Diff	add support for /keys cache control (0004036)
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master abd41c1d 2016-05-29 00:47 Marcello Stanisci Details Diff	making "make check" under src/lib compile; test still not passed. Also showing a problem in getting /keys
	mod - src/backend/taler-merchant-httpd_track.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master b7459d4b 2016-05-26 19:12 Florian Dold Details Diff	actually store timeout task handle
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master b7f75095 2016-05-26 17:23 Christian Grothoff Details Diff	change edate to wire_transfer_deadline/delay (0004521)
	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_pay.c	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/tests/test_contract.c	Diff File
master d2393606 2016-05-26 17:11 Christian Grothoff Details Diff	fix FTBFS from recent RSA blinding API change
	mod - src/lib/test_merchant_api.c	Diff File
master c3db97ac 2016-05-26 17:05 Christian Grothoff Details Diff	remove dead /hash-contract API logic
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	rm - src/backend/taler-merchant-httpd_util.c	Diff File
	rm - src/backend/taler-merchant-httpd_util.h	Diff File
master 5c2403c8 2016-05-25 02:13 Marcello Stanisci Details Diff	Merge branch 'master' of git://taler.net/merchant
	mod - src/backend/taler-merchant-httpd_auditors.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_parsing.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
	mod - src/lib/merchant_api_contract.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
master a1ecc4a8 2016-05-25 02:13 Marcello Stanisci Details Diff	adding scaffold for integrating /track/{deposit,wtid} API calls
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_mhd.c	Diff File
	mod - src/backend/taler-merchant-httpd_parsing.c	Diff File
	mod - src/backend/taler-merchant-httpd_responses.c	Diff File
	mod - src/backend/taler-merchant-httpd_responses.h	Diff File
	add - src/backend/taler-merchant-httpd_track.c	Diff File
	add - src/backend/taler-merchant-httpd_track.h	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	add - src/lib/merchant_api_track.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 8d7fe0a7 2016-05-24 18:22 Florian Dold Details Diff	oops, timeout was way too small
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File

Changesets: merchant