Source Control Integration

master 4e4adad7 2017-12-10 21:51 Christian Grothoff Details Diff	update .gitignore
	mod - .gitignore	Diff File
master d19fdbc8 2017-12-10 21:36 Christian Grothoff Details Diff	fix double free
	mod - src/lib/merchant_api_track_transaction.c	Diff File
master 5be5ce5b 2017-12-10 19:58 Christian Grothoff Details Diff	extend test_merchant_api interpreter with command to run wirewatch (not yet in use)
	mod - src/lib/test_merchant_api.c	Diff File
master dbd20b2b 2017-12-10 15:50 Florian Dold Details Diff	use another port for the test, since it's already used on taler.net (see 0005209)
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/lib/test_merchant_api.conf	Diff File
master 7d4b310a 2017-12-10 01:16 Christian Grothoff Details Diff	simplify logic
	mod - src/lib/merchant_api_track_transaction.c	Diff File
master f9ff0790 2017-12-10 01:02 Christian Grothoff Details Diff	check return values
	mod - src/merchant-tools/taler-merchant-generate-payments.c	Diff File
master 74608a02 2017-12-10 00:59 Christian Grothoff Details Diff	handle localtime() failure
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master ee8199bb 2017-12-10 00:53 Christian Grothoff Details Diff	assert on the right value
	mod - src/merchant-tools/taler-merchant-generate-payments.c	Diff File
master 1a59edad 2017-12-10 00:47 Christian Grothoff Details Diff	fix enum confusion
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
master 9be3e281 2017-12-09 21:19 Christian Grothoff Details Diff	fix typo
	mod - src/backenddb/test_merchantdb.c	Diff File
master b5222ad8 2017-12-09 20:57 Christian Grothoff Details Diff	fix issues related to unrounded times
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/backend/taler-merchant-httpd_history.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/backenddb/test_merchantdb.c	Diff File
master cea6fc54 2017-12-09 20:49 Christian Grothoff Details Diff	add a bit more diagnostics for Florian's assertion on line 370, plus likely a related fix as some error cases did not properly return and instead continued execution
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master e8c65b96 2017-12-09 16:40 Florian Dold Details Diff	also expand filename for tipping reserve in backend
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 3aa4e09b 2017-12-09 12:31 Marcello Stanisci Details Diff	make "tip enable" tool pick tip-reserve priv from filename
	mod - src/merchant-tools/taler-merchant-tip-enable.c	Diff File
master a8f3c5ff 2017-12-07 08:42 Christian Grothoff Details Diff	fix config
	mod - src/lib/test_merchant_api.conf	Diff File
master 9f1ca178 2017-12-07 08:28 Christian Grothoff Details Diff	changing tip_reserve_priv to tip_reserve_priv_filename (0005188)
	mod - doc/manual.texi	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 78f0bae5 2017-11-30 12:22 Christian Grothoff Details Diff	fix 0005187	Affected Issues 0005187
	mod - src/backend/taler-merchant-httpd_refund.c	Diff File
master d5cde483 2017-11-30 04:45 Florian Dold Details Diff	add amount to tip-token
	mod - src/backend/taler-merchant-httpd_tip-authorize.c	Diff File
master 280aecd3 2017-11-30 04:02 Florian Dold Details Diff	add critical missing comma
	mod - src/backend/taler-merchant-httpd_tip-authorize.c	Diff File
master 8f0a7aec 2017-11-30 03:17 Florian Dold Details Diff	also add pickup_url in lib
	mod - src/lib/merchant_api_tip_authorize.c	Diff File
master 62b3113b 2017-11-30 03:08 Florian Dold Details Diff	also use exchange_url in test
	mod - src/lib/merchant_api_tip_authorize.c	Diff File
master eaaebef0 2017-11-30 02:51 Florian Dold Details Diff	uri->url, add tip_token with pickup_url in /tip-authorize
	mod - src/backend/taler-merchant-httpd_tip-authorize.c	Diff File
master 1d3ce16e 2017-11-29 03:36 Florian Dold Details Diff	add mising files
	add - src/backend/taler-merchant-httpd_tip-query.c	Diff File
	add - src/backend/taler-merchant-httpd_tip-query.h	Diff File
master d2db3ad7 2017-11-27 16:39 Florian Dold Details Diff	implement /tip-query
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_tip-pickup.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 e364bc36 2017-11-21 14:10 Marcello Stanisci Details Diff	manual
	mod - doc/manual.texi	Diff File

Changesets: merchant