Source Control Integration

master f4f8f026 2016-02-17 19:40 Marcello Stanisci Details Diff	cleaning up the blog to match http://api.taler.net/example-essay-store.html
	mod - src/frontend_blog/blog_lib.php	Diff File
	mod - src/frontend_blog/essay_cc-fulfillment.php	Diff File
	mod - src/frontend_blog/essay_cc-payment.html	Diff File
	rm - src/frontend_blog/essay_checkout.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_offer.php	Diff File
	mod - src/frontend_blog/essay_pay.php	Diff File
	mod - src/frontend_lib/config.php	Diff File
	mod - src/frontend_lib/merchants.php	Diff File
	mod - src/frontend_lib/util.php	Diff File
master ba7df21d 2016-02-17 15:11 Florian Dold Details Diff	simplify contract, use nicer name
	mod - src/frontend/generate_taler_contract.php	Diff File
master 0d500cb4 2016-02-17 04:20 Florian Dold Details Diff	better error handling for hash-contract, again
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
master 47993fae 2016-02-17 04:18 Florian Dold Details Diff	better error handling for hash-contract
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
master 75a01337 2016-02-17 04:05 Florian Dold Details Diff	fix 0004174	Affected Issues 0004174
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd.h	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
master 496f3dab 2016-02-16 23:27 Marcello Stanisci Details Diff	fixing the offering URL in blog
	mod - src/frontend_blog/essay_fulfillment.php	Diff File
master 568d83e1 2016-02-16 22:57 Marcello Stanisci Details Diff	minor
	mod - src/frontend_blog/essay_contract.php	Diff File
	mod - src/frontend_blog/essay_pay.php	Diff File
master b798cbda 2016-02-16 22:24 Marcello Stanisci Details Diff	changing 'let' to 'var' in frontends JS
	mod - src/backend/merchant.conf	Diff File
	mod - src/frontend/index.php	Diff File
	mod - src/frontend_blog/essay_contract.php	Diff File
	mod - src/frontend_lib/config.php	Diff File
master aee31d8c 2016-02-16 21:33 Marcello Stanisci Details Diff	adding /hash-contract feature
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	add - src/backend/taler-merchant-httpd_util.c	Diff File
	add - src/backend/taler-merchant-httpd_util.h	Diff File
master 1c069591 2016-02-15 20:27 Florian Dold Details Diff	missing reference to taler pq lib
	mod - src/backend/Makefile.am	Diff File
	mod - src/backenddb/Makefile.am	Diff File
master 3348fa73 2016-02-15 20:10 Florian Dold Details Diff	rename variable
	mod - src/frontend/index.php	Diff File
master 85d09249 2016-02-15 20:08 Florian Dold Details Diff	fix botched up merge
	mod - src/frontend/index.php	Diff File
master 6120e636 2016-02-15 20:06 Florian Dold Details Diff	use GNUNET_PQ instead of removed TALER_PQ
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/frontend/index.php	Diff File
master a32f8bbd 2016-02-15 19:40 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - configure.ac	Diff File
	mod - src/backenddb/Makefile.am	Diff File
	add - src/frontend/config.php	Diff File
	mod - src/frontend/index.php	Diff File
master 2d62433b 2016-02-15 19:38 Marcello Stanisci Details Diff	minor fix to get demo-shop use the "discover currency" library
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.php	Diff File
	mod - src/frontend_lib/config.php	Diff File
master bbe743a3 2016-02-15 19:29 Marcello Stanisci Details Diff	unification of offering URL for cc and Taler style payments
	mod - src/backend/merchant.conf	Diff File
	mod - src/frontend/index.php	Diff File
	mod - src/frontend_blog/essay_contract.php	Diff File
	mod - src/frontend_blog/essay_offer.php	Diff File
	mod - src/frontend_blog/index.html	Diff File
	add - src/frontend_lib/config.php	Diff File
master 57e59c69 2016-02-15 18:27 Christian Grothoff Details Diff	test for libgnunetpq
	mod - src/backenddb/Makefile.am	Diff File
master 095639e4 2016-02-15 18:26 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_pay.c	Diff File
	mod - src/frontend/checkout.php	Diff File
	add - src/frontend/config.php	Diff File
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.php	Diff File
	mod - src/frontend/pay.php	Diff File
	rm - src/frontend_blog/articles/essay-x.html	Diff File
	add - src/frontend_blog/articles/fs-essay.html	Diff File
	mod - src/frontend_blog/cc_payment.php	Diff File
	add - src/frontend_blog/essay_cc_pay-fulfillment.php	Diff File
	rm - 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
	add - src/frontend_blog/essay_offer.php	Diff File
	mod - src/frontend_blog/essay_pay.php	Diff File
	rm - src/frontend_blog/execute.js	Diff File
	rm - src/frontend_blog/execute.php	Diff File
	rm - src/frontend_blog/execute.tsx	Diff File
	mod - src/frontend_blog/index.html	Diff File
	rm - src/frontend_blog/teaser.php	Diff File
	mod - src/frontend_lib/merchants.php	Diff File
master 19f94aa3 2016-02-15 18:26 Christian Grothoff Details Diff	test for libgnunetpq
	mod - configure.ac	Diff File
master 686dacf4 2016-02-15 16:03 Florian Dold Details Diff	syntax
	mod - src/frontend/index.php	Diff File
master 4f90069d 2016-02-15 16:02 Florian Dold Details Diff	add missing config file
	add - src/frontend/config.php	Diff File
master 6f6b2ec6 2016-02-15 15:58 Florian Dold Details Diff	merchant support for other currencies
	mod - src/frontend/index.php	Diff File
master ac2d14ef 2016-02-15 12:07 Marcello Stanisci Details Diff	Adding non-dummy article
	rm - src/frontend_blog/articles/essay-x.html	Diff File
	add - src/frontend_blog/articles/fs-essay.html	Diff File
	mod - src/frontend_blog/essay_contract.php	Diff File
	mod - src/frontend_blog/index.html	Diff File
master 30554a39 2016-02-12 21:14 Marcello Stanisci Details Diff	fixing the blog up to the point of forwarding the payment to
	mod - src/backend/merchant.conf	Diff File
	mod - src/frontend_blog/essay_contract.php	Diff File
	mod - src/frontend_blog/essay_fulfillment.php	Diff File
	add - src/frontend_blog/essay_offer.php	Diff File
	mod - src/frontend_blog/essay_pay.php	Diff File
	mod - src/frontend_blog/index.html	Diff File
master 3cd79964 2016-02-09 14:32 Marcello Stanisci Details Diff	blog: cleaning
	mod - src/frontend_blog/cc_payment.php	Diff File
	mod - src/frontend_blog/essay_contract.php	Diff File
	rm - src/frontend_blog/execute.js	Diff File
	rm - src/frontend_blog/execute.php	Diff File
	rm - src/frontend_blog/execute.tsx	Diff File
	rm - src/frontend_blog/teaser.php	Diff File

Changesets: merchant