Source Control Integration

master 741b0747 2016-10-24 22:00 Marcello Stanisci Details Diff	indent
	mod - doc/manual.texi	Diff File
master 6d0d2e38 2016-10-24 21:58 Marcello Stanisci Details Diff	doc: how to get contract and show CC paywall as fallback
	mod - doc/manual.texi	Diff File
	mod - doc/version.texi	Diff File
master 0f12281c 2016-10-22 20:26 Marcello Stanisci Details Diff	receiver->instance. test passed
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.c	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/merchant_api_track_transaction.c	Diff File
	mod - src/lib/merchant_api_track_transfer.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/lib/test_merchant_api.conf	Diff File
master 4617cba3 2016-10-22 01:23 Marcello Stanisci Details Diff	polishing docs
	mod - doc/manual.texi	Diff File
master ca8a22aa 2016-10-22 00:49 Marcello Stanisci Details Diff	hello world docs, first steps
	mod - doc/manual.texi	Diff File
master e1129679 2016-10-22 00:11 Marcello Stanisci Details Diff	polishing docs
	mod - doc/manual.texi	Diff File
master 0017dbfa 2016-10-21 19:45 Marcello Stanisci Details Diff	finish with merchant configuration texi
	mod - doc/manual.texi	Diff File
master b8da90b7 2016-10-21 19:17 Marcello Stanisci Details Diff	half-baking merchant configuration documentation
	mod - doc/manual.texi	Diff File
	mod - doc/version.texi	Diff File
master fa277e6a 2016-10-21 16:10 Marcello Stanisci Details Diff	GNUnet configure
	mod - doc/manual.texi	Diff File
master a6cf21a0 2016-10-21 14:58 Marcello Stanisci Details Diff	manual introduction
	mod - doc/manual.texi	Diff File
master b79fdc1a 2016-10-21 12:37 Marcello Stanisci Details Diff	Merge branch 'master' of taler.net:merchant
	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_track-transaction.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.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_history.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/merchant_api_track_transaction.c	Diff File
	mod - src/lib/merchant_api_track_transfer.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 87082a8d 2016-10-20 23:30 Christian Grothoff Details Diff	return missing error code, use existing function where approprite
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_responses.c	Diff File
master 1de87fc2 2016-10-20 23:23 Christian Grothoff Details Diff	have merchant C API also return taler error codes (at least those from the merchant for now)
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_contract.c	Diff File
	mod - src/lib/merchant_api_history.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/merchant_api_track_transaction.c	Diff File
	mod - src/lib/merchant_api_track_transfer.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master b9b230e7 2016-10-20 23:01 Christian Grothoff Details Diff	modify merchant logic to support exchange-APIs returning taler-specific error codes from C API as well, plus fixing a few cases where the merchant HTTP API did not yet return the error codes properly (0004497/4705)
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 5774dbd6 2016-10-20 18:17 Marcello Stanisci Details Diff	Merge branch 'master' of taler.net:merchant
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_history.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
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.c	Diff File
master 217c2d38 2016-10-20 18:16 Marcello Stanisci Details Diff	Configuring/Compiling texinfo documentaion, + manual stub.
	mod - .gitignore	Diff File
	mod - Makefile.am	Diff File
	mod - configure.ac	Diff File
	mod - doc/Makefile.am	Diff File
	add - doc/manual.texi	Diff File
	add - doc/version.texi	Diff File
master ae8bc763 2016-10-20 17:11 Christian Grothoff Details Diff	add 'code' with error code details to merchant backend error responses (0004497)
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 8dbd57d6 2016-10-20 17:09 Christian Grothoff Details Diff	Merge branch 'master' of git+ssh://taler.net/merchant
	mod - src/backend/taler-merchant-httpd_contract.c	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/lib/test_merchant_api.c	Diff File
master f02036b3 2016-10-20 17:09 Christian Grothoff Details Diff	add 'code' with error code details to merchant backend error responses (0004497)
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_history.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
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.c	Diff File
master 28542396 2016-10-20 16:18 Marcello Stanisci Details Diff	finishing with 0004521
	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/lib/test_merchant_api.c	Diff File
master 50959df5 2016-10-20 00:51 Marcello Stanisci Details Diff	fetch and test pay_deadline in /pay
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master d5864970 2016-10-18 23:48 Marcello Stanisci Details Diff	lib testcase passes using a contract with a 'summary' field
	mod - src/lib/test_merchant_api.c	Diff File
master 96447894 2016-10-18 01:22 Marcello Stanisci Details Diff	fix 0004733	Affected Issues 0004733
	mod - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/lib/test_merchant_api.conf	Diff File
master 9499f7eb 2016-10-16 01:22 Marcello Stanisci Details Diff	fix missing receiver in /track/transfer query string (merchant-lib)
	mod - src/backend/taler-merchant-httpd_track-transfer.c	Diff File
	mod - src/lib/merchant_api_track_transfer.c	Diff File
master 9f8b9743 2016-10-15 05:14 Christian Grothoff Details Diff	resolving merge conflict with Marcello, mostly exactly the same changes
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transaction.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

Changesets: merchant