Source Control Integration

master cb319933 2016-01-25 16:04 Florian Dold Details Diff	check fulfillment UUID
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/pay.php	Diff File
	mod - src/frontend/util.php	Diff File
master 0af7437d 2016-01-25 15:57 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
master bdf26f36 2016-01-25 15:54 Marcello Stanisci Details Diff	adapting blog to new specs; still to test
	mod - src/frontend/pay.php	Diff File
	mod - src/frontend_blog/essay_cc_pay.php	Diff File
	mod - src/frontend_blog/essay_pay.php	Diff File
	mod - src/frontend_lib/util.php	Diff File
master a91b81e6 2016-01-25 15:52 Florian Dold Details Diff	add fulfillment URL in the right place (next try)
	mod - src/frontend/generate_taler_contract.php	Diff File
master 7878dac5 2016-01-25 15:36 Florian Dold Details Diff	add fulfillment URL in the right place
	mod - src/frontend/generate_taler_contract.php	Diff File
master dfb27f3b 2016-01-25 14:45 Florian Dold Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - src/frontend_blog/cc_payment.php	Diff File
	add - src/frontend_blog/essay_cc_pay.php	Diff File
	mod - src/frontend_blog/essay_contract.php	Diff File
	mod - src/frontend_blog/essay_fulfillment.php	Diff File
	mod - src/frontend_blog/essay_pay.php	Diff File
	mod - src/frontend_blog/index.html	Diff File
	mod - src/frontend_blog/teaser.php	Diff File
master 6fe7b256 2016-01-25 14:45 Florian Dold Details Diff	New fulfillment URL mechanism.
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
master 81c80fde 2016-01-25 12:04 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
	add - src/frontend/util.php	Diff File
master 29ace180 2016-01-25 12:02 Marcello Stanisci Details Diff	blog: making cc payment by dedicated scripts, + deferring
	mod - src/frontend_blog/cc_payment.php	Diff File
	add - src/frontend_blog/essay_cc_pay.php	Diff File
	mod - src/frontend_blog/essay_contract.php	Diff File
	mod - src/frontend_blog/essay_fulfillment.php	Diff File
	mod - src/frontend_blog/essay_pay.php	Diff File
	mod - src/frontend_blog/index.html	Diff File
	mod - src/frontend_blog/teaser.php	Diff File
master d1afdc9b 2016-01-24 21:26 Florian Dold Details Diff	correctly append contract identifier
	mod - src/frontend/generate_taler_contract.php	Diff File
master ea402fdb 2016-01-24 20:49 Florian Dold Details Diff	send JSON as payment response
	mod - src/frontend/pay.php	Diff File
master e631c051 2016-01-24 20:11 Florian Dold Details Diff	type error
	mod - src/frontend/generate_taler_contract.php	Diff File
master 5bf86b23 2016-01-24 20:09 Florian Dold Details Diff	type error
	mod - src/frontend/generate_taler_contract.php	Diff File
master 0f9b5928 2016-01-24 19:40 Florian Dold Details Diff	php syntax
	mod - src/frontend/generate_taler_contract.php	Diff File
master 6fa02fce 2016-01-24 19:36 Florian Dold Details Diff	fix JSON format string
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 33e60ed8 2016-01-24 19:33 Florian Dold Details Diff	remove URLs from inside contract
	mod - src/frontend/generate_taler_contract.php	Diff File
master 90aa0f82 2016-01-24 19:32 Florian Dold Details Diff	get session values
	mod - src/frontend/generate_taler_contract.php	Diff File
master d2ff9f89 2016-01-24 19:27 Florian Dold Details Diff	exec/pay url
	mod - src/frontend/generate_taler_contract.php	Diff File
master 4053ceef 2016-01-24 19:24 Florian Dold Details Diff	syntax
	mod - src/frontend/generate_taler_contract.php	Diff File
master 1f56da97 2016-01-24 19:22 Florian Dold Details Diff	properly concatenate
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
	add - src/frontend/util.php	Diff File
master 7e2f81ed 2016-01-24 17:57 Florian Dold Details Diff	Remove {exec,pay}_url from backend.
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 62a4d369 2016-01-24 17:44 Florian Dold Details Diff	indentation
	mod - src/frontend/checkout.php	Diff File
master 18994e71 2016-01-24 17:42 Florian Dold Details Diff	checked, not selected
	mod - src/frontend/checkout.php	Diff File
master a6aee501 2016-01-24 17:38 Florian Dold Details Diff	default selection
	mod - src/frontend/checkout.php	Diff File
master 4c1c16ab 2016-01-24 17:37 Florian Dold Details Diff	syntax
	mod - src/frontend/checkout.php	Diff File

Changesets: merchant