Source Control Integration

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
master ff8fdfa0 2016-10-15 05:03 Christian Grothoff Details Diff	fixing 0004577, as well as a few other cases where we need to index by merchant_pub as well as transaction ID; changes APIs in a few places
	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/backend/taler-merchant-httpd_track-transaction.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.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
	mod - src/lib/merchant_api_track_transfer.c	Diff File
master 521aa89e 2016-10-13 20:06 Marcello Stanisci Details Diff	Fix select payments from DB. Namely, a merchant_pub query parameter was needed
	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/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 419ae31e 2016-10-13 16:47 Marcello Stanisci Details Diff	indentation
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 500b6456 2016-10-13 03:37 Marcello Stanisci Details Diff	making (transaction_id, merchant_pub) the primary key
	mod - src/backend/taler-merchant-httpd_pay.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
	mod - src/lib/test_merchant_api.c	Diff File
master 9e279508 2016-10-13 02:27 Marcello Stanisci Details Diff	adapting callback for 'find_transaction' DB functions family
	mod - src/backend/taler-merchant-httpd_history.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/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 fe973b29 2016-10-13 01:11 Marcello Stanisci Details Diff	merchant's key in transactions table
	mod - src/backend/taler-merchant-httpd_pay.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 52e82c8e 2016-10-11 16:17 Marcello Stanisci Details Diff	removing assert
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
master 28be36f0 2016-10-10 19:53 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - configure.ac	Diff File
master 02dc4f85 2016-10-10 19:53 Marcello Stanisci Details Diff	compiler warning
	mod - src/backend/taler-merchant-httpd_history.c	Diff File
master 6363e37c 2016-10-10 19:29 Florian Dold Details Diff	version 0.1.0
	mod - configure.ac	Diff File
master 2a1fee61 2016-10-10 18:31 Marcello Stanisci Details Diff	changelog
	mod - ChangeLog	Diff File
master 73b7d234 2016-10-07 17:55 Marcello Stanisci Details Diff	re-closing 0004702
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 61cc8f9d 2016-10-06 01:32 Marcello Stanisci Details Diff	resolve 0004689	Affected Issues 0004689
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/lib/merchant_api_history.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master d9953edb 2016-10-05 00:59 Marcello Stanisci Details Diff	calling /history API from testcase. Loops ..
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_history.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 4a01b89b 2016-10-04 19:49 Marcello Stanisci Details Diff	still on /history merchant-lib
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_history.c	Diff File
master abe9d0dc 2016-10-04 19:22 Marcello Stanisci Details Diff	adding stub for /history callback
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	add - src/lib/merchant_api_history.c	Diff File
master 0bf1860d 2016-10-04 18:44 Marcello Stanisci Details Diff	header definitions for /history
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_track_transfer.c	Diff File
master 9d6fba17 2016-10-04 18:10 Marcello Stanisci Details Diff	stub for /history testing
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 862cb42e 2016-10-04 17:39 Marcello Stanisci Details Diff	correctly parsing timestamp given as /history parameter
	mod - src/backend/taler-merchant-httpd_history.c	Diff File
master db6732f6 2016-10-04 16:39 Marcello Stanisci Details Diff	populating array as response to /history
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_history.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
master 2ea70ac9 2016-10-04 12:30 Marcello Stanisci Details Diff	adding /history stubs
	add - src/backend/taler-merchant-httpd_history.c	Diff File
	add - src/backend/taler-merchant-httpd_history.h	Diff File
master e6416af0 2016-10-03 20:28 Marcello Stanisci Details Diff	calling /history handler upong request
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 0ef44fd2 2016-10-03 20:10 Marcello Stanisci Details Diff	stub for /history handler
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_contract.h	Diff File

Changesets: merchant