Source Control Integration

master f3034b51 2016-09-16 13:10 Christian Grothoff Details Diff	address fixme 2
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
master 4b5703ed 2016-09-16 13:10 Christian Grothoff Details Diff	make code nicer to read
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
master a2b65f04 2016-09-16 12:06 Christian Grothoff Details Diff	run /trace functions twice to check caching works as expected
	mod - src/lib/test_merchant_api.c	Diff File
master 4b4d5d61 2016-09-16 12:04 Christian Grothoff Details Diff	move deployment-specific configuration to deployment
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/merchant.conf	Diff File
master 9d119f89 2016-09-15 22:45 Marcello Stanisci Details Diff	placing FIXMEs in track-transaction
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
master b95af871 2016-09-12 16:55 Florian Dold Details Diff	typo
	mod - src/lib/merchant_api_pay.c	Diff File
master 8101cf96 2016-07-25 20:34 Marcello Stanisci Details Diff	removing old nginx conf example
	rm - examples/blog/nginx_example.conf	Diff File
master ad033e20 2016-07-25 20:33 Marcello Stanisci Details Diff	Adding nginx example file. See sections under
	add - examples/blog/data/nginx.conf	Diff File
master 5eac4e76 2016-07-25 20:30 Marcello Stanisci Details Diff	Closing 0004456 (PHP side). In order to fulfill 0004456, the article
	mod - examples/blog/articles/article_images.php	Diff File
	add - examples/blog/data/giraffe.jpg	Diff File
	mod - examples/blog/essay_cc-form.html	Diff File
	mod - examples/blog/essay_fulfillment.php	Diff File
	mod - examples/blog/essay_pay.php	Diff File
	add - examples/blog/images.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master 07763970 2016-07-25 14:00 Marcello Stanisci Details Diff	calling IMG parser for all articles
	mod - examples/blog/articles/article_images.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master 8aa4fb4c 2016-07-22 20:59 Marcello Stanisci Details Diff	adding initial logic to parse articles and
	add - examples/blog/articles/.gitignore	Diff File
	add - examples/blog/articles/article_images.php	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master cd8cf717 2016-07-07 19:56 Marcello Stanisci Details Diff	fixing 0004594
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd.h	Diff File
	mod - src/backend/taler-merchant-httpd_auditors.c	Diff File
	mod - src/backend/taler-merchant-httpd_auditors.h	Diff File
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_contract.h	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.c	Diff File
	mod - src/backend/taler-merchant-httpd_exchanges.h	Diff File
	mod - src/backend/taler-merchant-httpd_mhd.c	Diff File
	mod - src/backend/taler-merchant-httpd_mhd.h	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_pay.h	Diff File
	mod - src/backend/taler-merchant-httpd_responses.c	Diff File
	mod - src/backend/taler-merchant-httpd_responses.h	Diff File
	mod - src/backend/taler-merchant-httpd_track-transaction.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transaction.h	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.c	Diff File
	mod - src/backend/taler-merchant-httpd_track-transfer.h	Diff File
	mod - src/backenddb/merchantdb_plugin.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.c	Diff File
	mod - src/backenddb/test_merchantdb.c	Diff File
	mod - src/include/platform.h	Diff File
	mod - src/include/taler_merchant_service.h	Diff File
	mod - src/include/taler_merchantdb_lib.h	Diff File
	mod - src/include/taler_merchantdb_plugin.h	Diff File
	mod - src/lib/merchant_api_contract.c	Diff File
	mod - src/lib/merchant_api_pay.c	Diff File
	mod - src/lib/merchant_api_track_transaction.c	Diff File
	mod - src/lib/merchant_api_track_transfer.c	Diff File
	mod - src/lib/test_merchant_api.c	Diff File
	mod - src/tests/test_contract.c	Diff File
master adb9ae3d 2016-07-04 13:54 Marcello Stanisci Details Diff	reverting test-ish error
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 52b8d84d 2016-07-04 13:30 Marcello Stanisci Details Diff	testing 0004366
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 6059b8f6 2016-06-30 13:39 Marcello Stanisci Details Diff	fixing compiler warnings
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 4d287dc4 2016-06-30 13:38 Marcello Stanisci Details Diff	fixing time logging
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master 7e2ae351 2016-06-30 13:36 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/taler-merchant-httpd_pay.c	Diff File
master 72f3306b 2016-06-30 12:16 Marcello Stanisci Details Diff	logging time values
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master a28473a1 2016-06-28 16:08 Marcello Stanisci Details Diff	removing dead configuration file
	rm - merchant.conf	Diff File
master 26867902 2016-06-27 19:33 Marcello Stanisci Details Diff	log receiver bank details
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File
master ff579c5d 2016-06-27 19:27 Marcello Stanisci Details Diff	less logging
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 8f2c075b 2016-06-27 19:26 Marcello Stanisci Details Diff	seeking "receiver" one level deeper when /contract
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master cb9af2c2 2016-06-27 19:20 Marcello Stanisci Details Diff	more on logging
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
master 47257bba 2016-06-27 18:54 Marcello Stanisci Details Diff	receiver case matching the one in donation shop
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backend/merchant.conf	Diff File
master 3de26db3 2016-06-25 16:40 Marcello Stanisci Details Diff	more diagnostics on picked instance
	mod - src/backend/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd_pay.c	Diff File

Changesets: merchant