Source Control Integration

master 66410091 2015-11-20 00:16 Marcello Stanisci Details Diff	Backend: fetching total amount from deposit permission
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master ba15286f 2015-11-19 23:59 Marcello Stanisci Details Diff	Adding 'amount' field in deposit permission sent to backend
	mod - src/frontend/pay.php	Diff File
master 56544e30 2015-11-19 21:43 Marcello Stanisci Details Diff	Showing ffillment page only after a successful payment,
	mod - src/frontend/fullfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
master 03bf6932 2015-11-19 17:50 Marcello Stanisci Details Diff	Fullfillment page detects whether the user comes from a purchase
	rm - src/frontend/fullfillment.html	Diff File
	add - src/frontend/fullfillment.php	Diff File
	mod - src/frontend/pay.php	Diff File
master 2055c46b 2015-11-19 11:44 Marcello Stanisci Details Diff	minor fix ffillment URL
	mod - src/frontend/pay.php	Diff File
master d7ef42b8 2015-11-19 11:29 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	rm - src/frontend/fake_wire_transfer.php	Diff File
	add - src/frontend/fullfillment.html	Diff File
master 0f3e3e1f 2015-11-19 11:28 Marcello Stanisci Details Diff	json fullfillment URL
	mod - src/frontend/pay.php	Diff File
master 2b8250f3 2015-11-18 21:31 Marcello Stanisci Details Diff	adding fullfillment dedicated page
	rm - src/frontend/fake_wire_transfer.php	Diff File
	add - src/frontend/fullfillment.html	Diff File
	mod - src/frontend/pay.php	Diff File
master de326a3a 2015-11-18 18:33 Marcello Stanisci Details Diff	redirecting fullfillment page
	mod - src/frontend/pay.php	Diff File
master e142f344 2015-11-18 12:21 Marcello Stanisci Details Diff	setting a longer fullfillment page (the link inside not shown)
	mod - src/frontend/index.html	Diff File
	mod - src/frontend/pay.php	Diff File
master 20b597e9 2015-11-17 18:33 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	rm - src/frontend/Gala.jpg	Diff File
	mod - src/frontend/README	Diff File
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/index.html	Diff File
master ed9ac718 2015-11-17 18:33 Marcello Stanisci Details Diff	adding fullfillment message
	mod - src/frontend/pay.php	Diff File
master 0112f016 2015-11-17 18:17 Christian Grothoff Details Diff	improving text documenting to the user the various steps of the demo
	rm - src/frontend/Gala.jpg	Diff File
	mod - src/frontend/README	Diff File
	mod - src/frontend/index.html	Diff File
master a1de67c3 2015-11-17 17:52 Christian Grothoff Details Diff	update documentation and logic for checkout page
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	rm - src/backend/taler-merchant-httpd_obsolete.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/pay.php	Diff File
	mod - src/include/merchant.h	Diff File
master f95cfd95 2015-11-17 17:46 Christian Grothoff Details Diff	edits
	mod - src/frontend/checkout.php	Diff File
master 965cefde 2015-11-17 15:38 Marcello Stanisci Details Diff	Fixing the unfree-able MHD response; removing debugg-ish prints
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/frontend/pay.php	Diff File
master 8d8779e9 2015-11-17 12:50 Marcello Stanisci Details Diff	Depositing all the coins. Memory corruption when destroying the
	rm - src/backend/taler-merchant-httpd_obsolete.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/include/merchant.h	Diff File
master 45894549 2015-11-16 23:42 Marcello Stanisci Details Diff	adding TODO in /pay handler
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 661dfa21 2015-11-16 22:33 Marcello Stanisci Details Diff	fixing /deposit local signature verification
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master ba4f27f7 2015-11-16 21:50 Marcello Stanisci Details Diff	cleaning
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/frontend/checkout.php	Diff File
master 98271266 2015-11-16 17:52 Marcello Stanisci Details Diff	fixing segfault
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master e5e73875 2015-11-16 16:05 Christian Grothoff Details Diff	forgot the new header
	add - src/backend/taler-merchant-httpd.h	Diff File
master 43d916cd 2015-11-16 16:03 Christian Grothoff Details Diff	misc fixes, in particular suspend/resume handling and keeping context for requests
	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/include/merchant.h	Diff File
master 89610bad 2015-11-16 15:28 Marcello Stanisci Details Diff	up to returning from /deposit
	mod - src/backend-lib/merchant_db.c	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master ae7a9ee2 2015-11-16 12:04 Marcello Stanisci Details Diff	updating mint entry in conf file
	mod - src/backend/merchant.conf	Diff File

Changesets: merchant