Source Control Integration

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
master 3051f7f0 2017-02-06 16:12 Marcello Stanisci Details Diff	Renaming /track/transaction handler to the point
	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/include/taler_merchant_service.h	Diff File
	mod - src/lib/merchant_api_proposal.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master dfdaec21 2017-02-06 14:52 Marcello Stanisci Details Diff	Fix backenddb tests after renaming
	mod - RENAMING_NOTES.txt	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 f226b8fc 2017-02-06 11:13 Marcello Stanisci Details Diff	Updating notes.
	mod - RENAMING_NOTES.txt	Diff File
master 5b9a806f 2017-02-06 11:13 Marcello Stanisci Details Diff	Renaming the DB and /history.
	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 6ec38507 2017-02-04 11:48 Marcello Stanisci Details Diff	Typo
	mod - src/backend/taler-merchant-httpd_history.c	Diff File
master dc5b4f7e 2017-02-04 11:43 Marcello Stanisci Details Diff	Garbage removal
	add - RENAMING_NOTES.txt	Diff File
	rm - src/tests/Makefile.am	Diff File
	rm - src/tests/deposit_permission.sample	Diff File
	rm - src/tests/deposit_permission_backend.sample	Diff File
	rm - src/tests/deposit_permission_edate_backend.sample	Diff File
	rm - src/tests/merchant.priv	Diff File
	rm - src/tests/test_contract.c	Diff File
	rm - src/tests/test_contract_README	Diff File
	rm - src/tests/test_pay_README	Diff File
master e05bb675 2017-02-04 11:39 Marcello Stanisci Details Diff	Removing _map.c from repo
	rm - src/backend/taler-merchant-httpd_map.c	Diff File
master 75bca5fa 2017-02-04 11:37 Marcello Stanisci Details Diff	Removing h_contract from /pay handler.
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master d9a1d781 2017-02-03 19:41 Marcello Stanisci Details Diff	renaming: proposal logic ported
	mod - src/backend/Makefile.am	Diff File
	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_proposal.h	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 36d68f9f 2017-02-03 17:29 Marcello Stanisci Details Diff	First run about renaming in lib's testcase.
	mod - src/lib/test_merchant_api.c	Diff File
master 7097ceba 2017-02-03 16:40 Marcello Stanisci Details Diff	Removing obsolete /map requests and renaming
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	rm - src/lib/merchant_api_map.c	Diff File
	mod - src/lib/merchant_api_proposal.c	Diff File
master 6d979591 2017-02-03 15:02 Marcello Stanisci Details Diff	Renaming proposal data db operations
	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