Source Control Integration

master fff2f0e3 2017-02-22 17:53 Marcello Stanisci Details Diff	Fix json formatting.
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_history.c	Diff File
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master 8096da90 2017-02-16 11:34 Marcello Stanisci Details Diff	Triggering Buildbot.
master 01466e6a 2017-02-14 21:50 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_proposal.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_merchant_service.h	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/merchant_api_proposal.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master bdbe3907 2017-02-14 21:50 Marcello Stanisci Details Diff	Triggering buildbot.
master 405b696e 2017-02-13 16:15 Marcello Stanisci Details Diff	Testing replayed payment.
	mod - src/lib/test_merchant_api.c	Diff File
master d60d537d 2017-02-13 01:21 Florian Dold Details Diff	fix 0004893	Affected Issues 0004893
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 30467b16 2017-02-12 19:22 Florian Dold Details Diff	no newline
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master bdad018f 2017-02-12 19:21 Florian Dold Details Diff	prettier automatic order_id
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master 8476ecfc 2017-02-12 19:17 Florian Dold Details Diff	set pay deadline if not in frontent order
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master f6aca4dc 2017-02-12 19:13 Florian Dold Details Diff	set refund deadline if not in frontend offer
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master 88f323a7 2017-02-12 19:09 Florian Dold Details Diff	round time before converting to JSON, otherwise GNUnet lib crashes
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master bf7fe735 2017-02-12 19:04 Florian Dold Details Diff	add timestamp if missing
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
master c078ae58 2017-02-12 18:59 Florian Dold Details Diff	add order_id if missing, break up function for readability
	mod - src/backend/taler-merchant-httpd_proposal.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 63386427 2017-02-12 05:23 Florian Dold Details Diff	fix reference counting issue
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 053798e5 2017-02-12 03:55 Florian Dold Details Diff	Change '/pay' API according to 0004891
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_proposal.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 5b1d9c51 2017-02-11 23:08 Florian Dold Details Diff	whitespace
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master dfdca4e9 2017-02-11 17:46 Florian Dold Details Diff	Back out early if we can't connect to postgres db
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
master c892b808 2017-02-10 18:51 Marcello Stanisci Details Diff	Adding a second call to /track/transaction in
	mod - src/lib/test_merchant_api.c	Diff File
master 3e4ae933 2017-02-10 18:33 Marcello Stanisci Details Diff	Fix track API tests.
	mod - src/backend/taler-merchant-httpd_proposal.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_merchant_service.h	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
	mod - src/lib/merchant_api_proposal.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 60c5ee76 2017-02-08 17:13 Marcello Stanisci Details Diff	Fixing testcases according to the renaming occurred
	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_proposal.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_merchant_service.h	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/merchant_api_proposal.c	Diff File
	mod - src/lib/merchant_api_track_transaction.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 9e8f9c9d 2017-02-08 12:46 Marcello Stanisci Details Diff	Fix backenddb
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
master 5bc8e40c 2017-02-07 22:31 Marcello Stanisci Details Diff	More fixes on renaming, mostly in db.
	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 1dc680a1 2017-02-07 20:08 Marcello Stanisci Details Diff	Huge renaming about removing transaction_id use
	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/backend/taler-merchant-httpd_track-transfer.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/merchant_api_track_transfer.c	Diff File
master 17e344a8 2017-02-06 17:42 Marcello Stanisci Details Diff	Renaming in /track/transaction handler.
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
master 7216095a 2017-02-06 16:47 Marcello Stanisci Details Diff	renaming (a little part of) /track/transfer handler
	mod - RENAMING_NOTES.txt	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.c	Diff File

Changesets: merchant