Source Control Integration

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
master 785e5813 2016-02-09 14:26 Marcello Stanisci Details Diff	minor
	mod - src/frontend_blog/essay_cc_pay-fulfillment.php	Diff File
master fcb5528a 2016-02-09 14:25 Marcello Stanisci Details Diff	blog: fulfillment for non taler payments
	mod - src/frontend_blog/essay_cc_pay.php	Diff File
	mod - src/frontend_blog/essay_fulfillment.php	Diff File
master fad37ce9 2016-02-08 20:04 Marcello Stanisci Details Diff	adapting the blog to new payment protocol
	mod - src/frontend/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_lib/merchants.php	Diff File
	mod - src/frontend_lib/util.php	Diff File
master cf011fb8 2016-02-08 17:29 Marcello Stanisci Details Diff	commit needed to look back in the history
	mod - 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_lib/merchants.php	Diff File
	mod - src/frontend_lib/util.php	Diff File
master 6a63d026 2016-02-01 15:33 Florian Dold Details Diff	add offering url
	mod - src/frontend/fulfillment.php	Diff File
master 20052ab2 2016-02-01 15:16 Florian Dold Details Diff	show news correctly
	mod - src/frontend/fulfillment.php	Diff File
master 71bcb3db 2016-02-01 15:12 Florian Dold Details Diff	show donation receiver correctly
	mod - src/frontend/fulfillment.php	Diff File
master 2393fbf6 2016-02-01 15:08 Florian Dold Details Diff	fix wrong JSON parsing
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 10c9c4b2 2016-02-01 12:41 Florian Dold Details Diff	handle re-payment correctly
	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
master 4099ae57 2016-02-01 12:01 Florian Dold Details Diff	syntax
	mod - src/frontend/generate_taler_contract.php	Diff File
master da518381 2016-02-01 12:01 Florian Dold Details Diff	put contract restoration info in URL
	mod - src/frontend/generate_taler_contract.php	Diff File
master 8d43dc4f 2016-01-29 12:53 Florian Dold Details Diff	fix undefined variable
	mod - src/frontend/fulfillment.php	Diff File
master fb86409f 2016-01-29 12:49 Florian Dold Details Diff	alphabetic sorting
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 0663d43e 2016-01-29 12:37 Florian Dold Details Diff	changes due to 0004159
	mod - src/frontend/fulfillment.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/pay.php	Diff File
master 6d7c1abd 2016-01-28 14:39 Florian Dold Details Diff	Consistent naming of merchant signature
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master f8287310 2016-01-27 16:28 Christian Grothoff Details Diff	-doxygen
	mod - src/include/taler_merchantdb_plugin.h	Diff File
master d58ad22c 2016-01-27 16:24 Christian Grothoff Details Diff	implement 0004159: verify signature on /pay
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
master d64edbd2 2016-01-27 16:06 Christian Grothoff Details Diff	implement 0004159
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_parsing.h	Diff File
master 165ed03d 2016-01-25 20:15 Christian Grothoff Details Diff	bump year
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master bd41f66e 2016-01-25 20:15 Christian Grothoff Details Diff	eh, those lines should have been removed...
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File

Changesets: merchant