Source Control Integration

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
master 842fd298 2015-12-24 01:54 Florian Dold Details Diff	logging
	mod - src/backend/taler-merchant-httpd_mints.c	Diff File
master 4448e104 2015-12-23 23:40 Florian Dold Details Diff	Add missing newline.
	mod - src/backend/taler-merchant-httpd_mints.c	Diff File
master 9bf08a8b 2015-12-23 23:35 Florian Dold Details Diff	Logging.
	mod - src/backend/taler-merchant-httpd_mints.c	Diff File
master 86b26a1e 2015-12-23 23:13 Florian Dold Details Diff	Fix URLs
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
master 8cd1502e 2015-12-23 16:42 Marcello Stanisci Details Diff	Fixing in response to the moving of pay_url outside the contract.
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
master 96c3b85c 2015-12-23 01:00 Florian Dold Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - .gitignore	Diff File
	rm - contrib/merchant.conf	Diff File
	mod - src/backend/merchant.conf	Diff File
	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/checkout.php	Diff File
	add - src/frontend/execute.php	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/frontend/style.css	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	mod - src/lib/merchant_api_context.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	add - src/lib/test-mint-home/config/mint-common.conf	Diff File
	add - src/lib/test-mint-home/config/mint-keyup.conf	Diff File
	add - src/lib/test-mint-home/master.priv	Diff File
	add - src/lib/test-mint-home/sepa.json	Diff File
	add - src/lib/test_merchant.conf	Diff File
	add - src/lib/test_merchant.priv	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master cae3b821 2015-12-22 12:29 Florian Dold Details Diff	Move payment URL out of signed contract.
	mod - src/frontend/generate_taler_contract.php	Diff File
master 65cef9a1 2015-12-21 14:41 Marcello Stanisci Details Diff	fixing string concatentation when building pay URL addressed
	mod - src/frontend/pay.php	Diff File
master 2bd0fa0b 2015-12-21 12:59 Marcello Stanisci Details Diff	adding schemata to mint base URL in in-tree conf file
	mod - src/backend/merchant.conf	Diff File
master a850ad35 2015-12-21 00:27 tg Details Diff	colours
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/execute.php	Diff File
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/index.html	Diff File
master e1171348 2015-12-21 00:17 tg Details Diff	Merge branch 'master' of taler.net:/var/git/merchant
	mod - .gitignore	Diff File
	rm - contrib/merchant.conf	Diff File
	mod - src/backend/merchant.conf	Diff File
	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/checkout.php	Diff File
	add - src/frontend/execute.php	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/frontend/style.css	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	mod - src/lib/merchant_api_context.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	add - src/lib/test-mint-home/config/mint-common.conf	Diff File
	add - src/lib/test-mint-home/config/mint-keyup.conf	Diff File
	add - src/lib/test-mint-home/master.priv	Diff File
	add - src/lib/test-mint-home/sepa.json	Diff File
	add - src/lib/test_merchant.conf	Diff File
	add - src/lib/test_merchant.priv	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master a3d2c0ba 2015-12-21 00:16 tg Details Diff	extension link
	mod - src/frontend/index.html	Diff File
master 81441752 2015-12-20 21:32 Florian Dold Details Diff	Execute page.
	mod - src/frontend/execute.php	Diff File
master 044c5f0a 2015-12-20 19:47 Florian Dold Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - .gitignore	Diff File
	mod - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	mod - src/lib/merchant_api_context.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	add - src/lib/test-mint-home/config/mint-common.conf	Diff File
	add - src/lib/test-mint-home/config/mint-keyup.conf	Diff File
	add - src/lib/test-mint-home/master.priv	Diff File
	add - src/lib/test-mint-home/sepa.json	Diff File
	add - src/lib/test_merchant.conf	Diff File
	add - src/lib/test_merchant.priv	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master dfbd51b6 2015-12-20 19:46 Florian Dold Details Diff	Fulfillment URL.
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/pay.php	Diff File
	mod - src/frontend/style.css	Diff File
master 5e2a9c3f 2015-12-20 14:30 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net:/var/git/merchant
	rm - contrib/merchant.conf	Diff File
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/fullfillment.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/frontend/style.css	Diff File
master 0d945e74 2015-12-20 14:29 Florian Dold Details Diff	Relative URLs.
	mod - src/frontend/pay.php	Diff File
master d50b423a 2015-12-20 14:28 Florian Dold Details Diff	Lift URLs outside signed contract.
	mod - src/frontend/generate_taler_contract.php	Diff File
master afb5ccc6 2015-12-20 14:28 Florian Dold Details Diff	Send clearer error, avoid use-after-free.
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master b7e13a3a 2015-12-20 14:26 Florian Dold Details Diff	Add URLs outside of contract.
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File

Changesets: merchant