Source Control Integration

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
master 7f330912 2016-04-19 02:55 Florian Dold Details Diff	remove outdated sample section in config
	mod - src/backend/merchant.conf	Diff File
master 6749769a 2016-04-19 02:47 Florian Dold Details Diff	more excessive logging
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 15c17c49 2016-04-19 02:30 Florian Dold Details Diff	this script does not belong here
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	rm - src/backend/myconf.sh	Diff File
master a8e41386 2016-04-18 20:02 Florian Dold Details Diff	Init submodules in bootstrap
	mod - bootstrap	Diff File
master 844f47bc 2016-04-18 11:53 Marcello Stanisci Details Diff	moving frontend instructions in respective directory
	mod - examples/blog/README	Diff File
	add - examples/blog/nginx_example.conf	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/README	Diff File
	mod - examples/shop/nginx_example.conf	Diff File
	mod - examples/shop/web-common	Diff File
master bb8c3111 2016-04-18 11:41 Marcello Stanisci Details Diff	instructions for running the frontend
	add - examples/INSTALL	Diff File
	add - examples/nginx_example.conf	Diff File
master f9441ca8 2016-04-18 00:04 Christian Grothoff Details Diff	finish FTBFS caused by refactoring
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master 92134423 2016-04-17 18:22 Christian Grothoff Details Diff	adding logging to aid diagnosis of 0004433
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd.h	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 87f85795 2016-04-17 14:30 Christian Grothoff Details Diff	fix assert on exit if there are no auditors
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd_auditors.c	Diff File
master cdd1091b 2016-04-17 14:22 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net:/var/git/merchant
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master 135a9a2f 2016-04-17 14:22 Christian Grothoff Details Diff	fix linker flag
	mod - copylib/config.php	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/backenddb/Makefile.am	Diff File
master 38c85d80 2016-04-17 00:54 Christian Grothoff Details Diff	better error reporting on config trouble
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master c6bf4574 2016-04-10 03:13 Christian Grothoff Details Diff	Merge branch 'master' of git+ssh://taler.net/var/git/merchant
	mod - Makefile.am	Diff File
	mod - README	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master c0a8da8c 2016-04-10 02:58 Christian Grothoff Details Diff	changing code to meet latest change in GNUNET_SCHEDULER API
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
master ce507d6e 2016-04-08 16:13 Christian Grothoff Details Diff	fix app target
	mod - Makefile.am	Diff File
master 6adc80f4 2016-04-08 12:48 Marcello Stanisci Details Diff	updating README as wanted by Laure
	mod - README	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master ddc5a9c6 2016-04-07 16:23 Florian Dold Details Diff	sync submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master e2ecc9cd 2016-04-07 16:13 Marcello Stanisci Details Diff	adapting merchant.conf to what the wire-plugin likes
	mod - merchant.conf	Diff File
master 7f885d15 2016-04-07 15:50 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 0f273e00 2016-04-07 15:48 Florian Dold Details Diff	assertion
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master f0e4549b 2016-04-07 15:42 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/Makefile.am	Diff File
	add - src/backend/merchant.conf	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
master e326c548 2016-04-07 15:15 Christian Grothoff Details Diff	add config file
	add - src/backend/merchant.conf	Diff File

Changesets: merchant