Source Control Integration

master db9a06b1 2016-04-07 15:14 Christian Grothoff Details Diff	syncsub
	mod - examples/blog/web-common	Diff File
master 041c0faf 2016-04-07 15:13 Christian Grothoff Details Diff	sync
	mod - examples/shop/web-common	Diff File
master 562483eb 2016-04-07 14:00 Florian Dold Details Diff	update submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master e61803d1 2016-04-07 13:08 Christian Grothoff Details Diff	fixing 0004374
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/tests/merchant.conf	Diff File
master 28feb29d 2016-04-07 12:54 Christian Grothoff Details Diff	fxi 0004381
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 5f1e6aa0 2016-04-07 12:32 Christian Grothoff Details Diff	Merge branch 'master' of git.taler.net:/var/git/merchant
	mod - examples/blog/essay_cc-form.html	Diff File
	mod - examples/blog/essay_fulfillment.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/web-common	Diff File
master ab2268f1 2016-04-07 12:32 Christian Grothoff Details Diff	add timeout of 5s for requests
	mod - src/backend/taler-merchant-httpd.c	Diff File
master d3d5f0ff 2016-04-06 20:40 Marcello Stanisci Details Diff	removing old merchant.conf
	rm - src/tests/merchant.conf	Diff File
master ff70861f 2016-04-06 20:39 Marcello Stanisci Details Diff	tracking merchant.conf
	add - merchant.conf	Diff File
master 5c3623dc 2016-04-06 19:50 Florian Dold Details Diff	update submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master 78524c0b 2016-04-06 19:43 Florian Dold Details Diff	update submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master 46e74818 2016-04-06 19:37 Florian Dold Details Diff	update submodules
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master 20916e99 2016-04-06 19:35 Florian Dold Details Diff	fix wrong HTML tag
	mod - examples/blog/essay_cc-form.html	Diff File
master 4116280b 2016-04-06 04:29 Florian Dold Details Diff	use executePayment from web-common
	mod - examples/blog/essay_cc-form.html	Diff File
	mod - examples/blog/essay_fulfillment.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/fulfillment.php	Diff File
	mod - examples/shop/web-common	Diff File
master 89c5d1fc 2016-04-06 01:56 Christian Grothoff Details Diff	split frontend/backend APP repos
	mod - Makefile.am	Diff File
master fb7cd6de 2016-04-06 01:55 Christian Grothoff Details Diff	fix 0004367	Affected Issues 0004367
	mod - src/backenddb/merchantdb_plugin.c	Diff File
master 00697da0 2016-04-06 01:00 Florian Dold Details Diff	remove file that doesn't belong here
	rm - push_test	Diff File
master 7c8ae2c2 2016-04-06 00:59 Florian Dold Details Diff	submodule version
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master b0b3687a 2016-04-05 00:53 Florian Dold Details Diff	Relative gitmodules
	mod - .gitmodules	Diff File
master 1dd38390 2016-03-22 21:26 Marcello Stanisci Details Diff	deleting obsolete comment
	mod - examples/blog/essay_pay.php	Diff File
master 0024a11e 2016-03-21 16:18 Marcello Stanisci Details Diff	removing inline extension installation
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/index.php	Diff File
	mod - examples/shop/web-common	Diff File
master fd1d4674 2016-03-21 16:16 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - Makefile.am	Diff File
	add - copylib/Makefile.am	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_auditors.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_parsing.c	Diff File
	mod - src/backend/taler-merchant-httpd_parsing.h	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
	mod - src/lib/Makefile.am	Diff File
	rm - src/lib/merchant_api_json.c	Diff File
	rm - src/lib/merchant_api_json.h	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
master e147c8e5 2016-03-21 16:16 Marcello Stanisci Details Diff	remving hardcoded link to demo.taler.net in favor of /landing
	mod - examples/blog/index.html	Diff File
master 9f90e10a 2016-03-21 16:06 Christian Grothoff Details Diff	fix #includes
	mod - src/backend/taler-merchant-httpd_parsing.h	Diff File
master f7b56919 2016-03-21 16:04 Christian Grothoff Details Diff	add missing Makefile.am
	add - copylib/Makefile.am	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File

Changesets: merchant