Source Control Integration

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
master 99eabe39 2016-05-24 17:40 Florian Dold Details Diff	cancel timeout task
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 5d4bc8b4 2016-05-24 04:32 Florian Dold Details Diff	include last /keys response when denomination not found
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 3e8a86de 2016-05-24 03:20 Florian Dold Details Diff	Revert "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 b5c7e1fe 2016-05-23 20:53 Florian Dold Details Diff	reload exchange keys every hour
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 8d654545 2016-05-23 20:15 Florian Dold Details Diff	better error response
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 20071952 2016-05-23 20:02 Florian Dold Details Diff	better error response
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 8b13f276 2016-05-23 19:55 Florian Dold Details Diff	authors
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 466604d8 2016-05-23 19:35 Florian Dold Details Diff	time out /pay after 30 seconds
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master dc46162e 2016-05-23 19:19 Florian Dold Details Diff	handle growing empty buffer
	mod - src/backend/taler-merchant-httpd_parsing.c	Diff File
master 9fd5433a 2016-05-23 19:09 Florian Dold Details Diff	bogus comment
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 3de790c4 2016-05-23 18:54 Florian Dold Details Diff	Fix retry logic
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 6f2e1130 2016-05-23 17:33 Florian Dold Details Diff	parse->accept, since it doesn't just parse
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 0eaacf9a 2016-05-23 17:27 Florian Dold Details Diff	comment
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master f4cb35c1 2016-05-23 17:22 Florian Dold Details Diff	comment
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 71a79868 2016-05-23 17:19 Florian Dold Details Diff	typo in comment
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 97b09e79 2016-05-23 17:18 Florian Dold Details Diff	double buffer size, don't add two
	mod - src/backend/taler-merchant-httpd_parsing.c	Diff File
master 0a7ba32d 2016-05-23 17:17 Florian Dold Details Diff	remove unnecessary extern declaration
	mod - src/backend/taler-merchant-httpd_parsing.c	Diff File
master 0d27e60b 2016-05-21 20:35 Christian Grothoff Details Diff	make use of GNUNET_JSON_from_data_auto where possible
	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_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File

Changesets: merchant