Source Control Integration

master 5344133d 2016-01-01 23:12 Christian Grothoff Details Diff	more logging
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 1e43a2db 2016-01-01 23:04 Christian Grothoff Details Diff	fix initialization, fix timestamp rounding (in testcase)
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master b7bdeb38 2016-01-01 22:48 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net:/var/git/merchant
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/frontend/execute.js	Diff File
	mod - src/frontend/execute.tsx	Diff File
	mod - src/frontend/pay.php	Diff File
master 30f6e2db 2016-01-01 22:48 Christian Grothoff Details Diff	add logic to initialize coin data for /pay test
	mod - src/lib/test_merchant_api.c	Diff File
master 76223a7a 2016-01-01 22:27 Christian Grothoff Details Diff	use init value from coin, not uninit and wrong pc array
	mod - src/lib/merchant_api_pay.c	Diff File
master bcd8706b 2016-01-01 22:19 Christian Grothoff Details Diff	fix JSON syntax of contract in testcase
	mod - src/lib/test_merchant_api.c	Diff File
master fae18993 2016-01-01 22:16 Christian Grothoff Details Diff	improve logging
	mod - src/lib/test_merchant_api.c	Diff File
master fd71cc18 2016-01-01 22:14 Christian Grothoff Details Diff	add logging, initialize max_fee field
	mod - src/lib/test_merchant_api.c	Diff File
master 59a87aa0 2016-01-01 22:13 Christian Grothoff Details Diff	add logging, initialize max_fee field
	mod - src/lib/test_merchant_api.c	Diff File
master 1b9cb320 2016-01-01 21:44 Christian Grothoff Details Diff	update max_fd to new max, never lower it
	mod - src/lib/merchant_api_context.c	Diff File
master b2192b1f 2015-12-27 10:26 Christian Grothoff Details Diff	initialize refund_deadline
	mod - src/lib/test_merchant_api.c	Diff File
master 469c9784 2015-12-27 10:23 Christian Grothoff Details Diff	initialize merchant_pub
	mod - src/lib/test_merchant_api.c	Diff File
master 1b610a05 2015-12-25 22:44 Florian Dold Details Diff	Fix fulfillment URL.
	mod - src/frontend/pay.php	Diff File
master 6d4c9ea2 2015-12-25 19:52 Florian Dold Details Diff	Add lots of logging.
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master b25d59dc 2015-12-25 17:07 Florian Dold Details Diff	Fix reference counting bug and contract signature
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 723f096d 2015-12-25 13:33 Florian Dold Details Diff	also add javascript
	mod - src/frontend/execute.js	Diff File
master 135be04f 2015-12-25 01:45 Florian Dold Details Diff	Do not show payent success HTML on error
	mod - src/frontend/execute.tsx	Diff File
master 29dec4cf 2015-12-24 22:30 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net:/var/git/merchant
	mod - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_mints.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/frontend/checkout.php	Diff File
	add - src/frontend/execute.js	Diff File
	mod - src/frontend/execute.php	Diff File
	add - src/frontend/execute.tsx	Diff File
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.html	Diff File
	mod - src/frontend/pay.php	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
	add - src/tsconfig.json	Diff File
master e83e69a2 2015-12-24 22:29 Christian Grothoff Details Diff	krista suggests to put store in double quotes to make it more clear this is fake
	mod - src/frontend/index.html	Diff File
master 33f69ee1 2015-12-24 18:17 Marcello Stanisci Details Diff	comments in frontend
	mod - src/frontend/pay.php	Diff File
master 6c308b68 2015-12-24 18:08 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - src/backend/taler-merchant-httpd_mints.c	Diff File
	mod - src/frontend/checkout.php	Diff File
	add - src/frontend/execute.js	Diff File
	mod - src/frontend/execute.php	Diff File
	add - src/frontend/execute.tsx	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
	add - src/tsconfig.json	Diff File
master ea2d3ec0 2015-12-24 18:08 Marcello Stanisci Details Diff	Fixing 0004102
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
master 21e8a43b 2015-12-24 04:19 Florian Dold Details Diff	TypeScript config
	add - src/tsconfig.json	Diff File
master 69589654 2015-12-24 03:19 Florian Dold Details Diff	Fix HTML.
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/execute.php	Diff File
master 020efb6d 2015-12-24 02:58 Florian Dold Details Diff	Fulfillment link.
	add - src/frontend/execute.js	Diff File
	mod - src/frontend/execute.php	Diff File
	add - src/frontend/execute.tsx	Diff File

Changesets: merchant