Source Control Integration

master 33f15c0e 2016-04-25 23:25 Florian Dold Details Diff	typo
	mod - src/backend/taler-merchant-httpd.c	Diff File
master f724e03a 2016-04-25 23:23 Florian Dold Details Diff	octal
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
master e8bffc0e 2016-04-25 23:02 Florian Dold Details Diff	unix-domain socket support
	mod - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 8a7f3119 2016-04-25 01:33 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net:/var/git/merchant
	mod - bootstrap	Diff File
	mod - configure.ac	Diff File
	mod - copylib/util.php	Diff File
	add - examples/blog/README	Diff File
	mod - examples/blog/essay_fulfillment.php	Diff File
	mod - examples/blog/essay_pay.php	Diff File
	add - examples/blog/nginx_example.conf	Diff File
	mod - examples/shop/README	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/generate_taler_contract.php	Diff File
	mod - examples/shop/index.php	Diff File
	mod - examples/shop/pay.php	Diff File
	mod - src/backend/merchant.conf	Diff File
	rm - src/backend/myconf.sh	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_exchanges.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 2cf860f0 2016-04-24 05:26 Christian Grothoff Details Diff	fix const causing ftbfs
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	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 04dcab34 2016-04-22 22:52 Marcello Stanisci Details Diff	wallet-less testing 0004452
	mod - copylib/util.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/generate_taler_contract.php	Diff File
	mod - examples/shop/index.php	Diff File
	rm - examples/shop/nginx_example.conf	Diff File
	mod - examples/shop/pay.php	Diff File
	mod - examples/shop/web-common	Diff File
master d0b8cc5a 2016-04-22 21:14 Florian Dold Details Diff	default location for response file
	mod - src/backend/merchant.conf	Diff File
master 8546828b 2016-04-22 20:54 Florian Dold Details Diff	newline
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 2b54be2a 2016-04-22 20:50 Florian Dold Details Diff	excessive logging
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master fb984735 2016-04-22 20:47 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master f4bcc802 2016-04-22 20:42 Marcello Stanisci Details Diff	reconstructing the contract in PHP donation shop (not tested)
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/generate_taler_contract.php	Diff File
	mod - examples/shop/pay.php	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 06091b0a 2016-04-22 20:42 Florian Dold Details Diff	logging
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 9d780317 2016-04-22 20:37 Florian Dold Details Diff	logging
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 3e89e5a7 2016-04-22 20:32 Florian Dold Details Diff	logging
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 07d575ef 2016-04-22 20:14 Marcello Stanisci Details Diff	renaming trusted exchanges config token
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 94b85f9a 2016-04-22 19:26 Marcello Stanisci Details Diff	using util.php from donation shop
	mod - examples/blog/essay_fulfillment.php	Diff File
	mod - examples/blog/essay_pay.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/generate_taler_contract.php	Diff File
	mod - examples/shop/pay.php	Diff File
	mod - examples/shop/web-common	Diff File
master e7d57b52 2016-04-22 16:26 Florian Dold Details Diff	read key from XDG dir
	mod - src/backend/merchant.conf	Diff File
master 4829e77b 2016-04-20 03:42 Florian Dold Details Diff	fix abort due to proof that is NULL
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master ec59784c 2016-04-20 01:13 Florian Dold Details Diff	move currency to taler section
	mod - src/backend/taler-merchant-httpd.c	Diff File
master c3b39103 2016-04-19 17:16 Florian Dold Details Diff	fix curl header detection
	mod - configure.ac	Diff File
master 422fe6e4 2016-04-19 04:47 Florian Dold Details Diff	don't cancel task there
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 00539cd7 2016-04-19 04:39 Florian Dold Details Diff	always retry trusted exchanges in background
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 89882d0c 2016-04-19 04:13 Florian Dold Details Diff	refactor curl select handling
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 23d94a0d 2016-04-19 03:42 Florian Dold Details Diff	Decrease exchange retry timeout, notify clients correctly.
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 0d58876d 2016-04-19 03:01 Florian Dold Details Diff	move logging
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File

Changesets: merchant