Source Control Integration

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
master a5a752d3 2016-03-19 20:30 Christian Grothoff Details Diff	de-duplicate JSON parsing code of main backend logic (0004150)
	mod - src/backend/taler-merchant-httpd_contract.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
master 64111272 2016-03-19 17:30 Christian Grothoff Details Diff	add license header
	mod - Makefile.am	Diff File
master 95ab500e 2016-03-19 17:29 Christian Grothoff Details Diff	adding 'app' target
	mod - Makefile.am	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
master c3326987 2016-03-19 17:23 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
master 6f2f6b3e 2016-03-19 17:21 Christian Grothoff Details Diff	use new JSON APIs (0004237/0004150)
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	add - src/backend/taler-merchant-httpd_parsing.c	Diff File
	add - src/backend/taler-merchant-httpd_parsing.h	Diff File
master 5a4c5594 2016-03-19 17:21 Christian Grothoff Details Diff	use new JSON APIs (0004237/0004150)
	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
	rm - src/backend/taler-merchant-httpd_parsing.c	Diff File
	rm - 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 727cf7f7 2016-03-17 18:40 Marcello Stanisci Details Diff	removing garbage
	mod - COPYING	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	rm - src/tests/test.debug	Diff File
master 0b3566a9 2016-03-17 18:40 Marcello Stanisci Committer: Christian Grothoff Details Diff	removing garbage
	mod - COPYING	Diff File
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	rm - src/tests/test.debug	Diff File
master 4f1d6803 2016-03-16 16:16 Christian Grothoff Details Diff	rst files only in API
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	rm - licensing.rst	Diff File
master 8ee74376 2016-03-16 14:25 Marcello Stanisci Details Diff	making,
	mod - examples/blog/web-common	Diff File
	mod - examples/shop/web-common	Diff File
	mod - licensing.rst	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_auditors.h	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
	mod - src/backend/taler-merchant-httpd_util.c	Diff File
	mod - src/backenddb/merchantdb_plugin.c	Diff File
	mod - src/backenddb/plugin_merchantdb_postgres.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
master 4c45a00a 2016-03-15 21:11 Christian Grothoff Details Diff	include AUTHORS
	mod - Makefile.am	Diff File
master e7c27f05 2016-03-15 19:28 Christian Grothoff Details Diff	include xgpl licenses
	mod - Makefile.am	Diff File
	mod - examples/shop/web-common	Diff File
master 68f9a48d 2016-03-15 19:27 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - examples/blog/articles/scrap1_1.html	Diff File
	mod - examples/blog/articles/scrap1_10.html	Diff File
	mod - examples/blog/articles/scrap1_11.html	Diff File
	mod - examples/blog/articles/scrap1_12.html	Diff File
	mod - examples/blog/articles/scrap1_13.html	Diff File
	mod - examples/blog/articles/scrap1_14.html	Diff File
	mod - examples/blog/articles/scrap1_15.html	Diff File
	mod - examples/blog/articles/scrap1_16.html	Diff File
	mod - examples/blog/articles/scrap1_17.html	Diff File
	mod - examples/blog/articles/scrap1_18.html	Diff File
	mod - examples/blog/articles/scrap1_19.html	Diff File
	mod - examples/blog/articles/scrap1_2.html	Diff File
	mod - examples/blog/articles/scrap1_20.html	Diff File
	mod - examples/blog/articles/scrap1_21.html	Diff File
	mod - examples/blog/articles/scrap1_22.html	Diff File
	mod - examples/blog/articles/scrap1_23.html	Diff File
	mod - examples/blog/articles/scrap1_24.html	Diff File
	mod - examples/blog/articles/scrap1_25.html	Diff File
	mod - examples/blog/articles/scrap1_26.html	Diff File
	mod - examples/blog/articles/scrap1_27.html	Diff File
	mod - examples/blog/articles/scrap1_28.html	Diff File
	mod - examples/blog/articles/scrap1_29.html	Diff File
	mod - examples/blog/articles/scrap1_3.html	Diff File
	mod - examples/blog/articles/scrap1_30.html	Diff File
	mod - examples/blog/articles/scrap1_31.html	Diff File
	mod - examples/blog/articles/scrap1_32.html	Diff File
	mod - examples/blog/articles/scrap1_33.html	Diff File
	mod - examples/blog/articles/scrap1_34.html	Diff File
	mod - examples/blog/articles/scrap1_35.html	Diff File
	mod - examples/blog/articles/scrap1_36.html	Diff File
	mod - examples/blog/articles/scrap1_37.html	Diff File
	mod - examples/blog/articles/scrap1_38.html	Diff File
	mod - examples/blog/articles/scrap1_39.html	Diff File
	mod - examples/blog/articles/scrap1_4.html	Diff File
	mod - examples/blog/articles/scrap1_40.html	Diff File
	mod - examples/blog/articles/scrap1_41.html	Diff File
	mod - examples/blog/articles/scrap1_42.html	Diff File
	mod - examples/blog/articles/scrap1_43.html	Diff File
	mod - examples/blog/articles/scrap1_46.html	Diff File
	mod - examples/blog/articles/scrap1_47.html	Diff File
	mod - examples/blog/articles/scrap1_5.html	Diff File
	mod - examples/blog/articles/scrap1_6.html	Diff File
	mod - examples/blog/articles/scrap1_7.html	Diff File
	mod - examples/blog/articles/scrap1_8.html	Diff File
	mod - examples/blog/articles/scrap1_9.html	Diff File
	mod - examples/blog/articles/scrap1_U.0.html	Diff File
	mod - examples/blog/articles/scrap1_U.1.html	Diff File
	mod - examples/shop/web-common	Diff File
	mod - src/backenddb/merchantdb_plugin.c	Diff File
	add - src/backenddb/test_backenddb.c	Diff File
master f43c3d2b 2016-03-15 19:27 Christian Grothoff Details Diff	missingfiles
	add - examples/blog/Makefile.am	Diff File
	mod - examples/blog/web-common	Diff File
	add - examples/shop/Makefile.am	Diff File
master cdf0f87f 2016-03-15 18:27 Marcello Stanisci Details Diff	adding stubs for backenddb testcases
	mod - src/backenddb/merchantdb_plugin.c	Diff File
	add - src/backenddb/test_backenddb.c	Diff File
master 7ac81ca8 2016-03-15 16:22 Marcello Stanisci Details Diff	Merge branch 'master' of ssh://taler.net/var/git/merchant
	mod - COPYING	Diff File
	add - COPYING.AGPL	Diff File
	add - COPYING.GPL	Diff File
	add - COPYING.LGPL	Diff File
	mod - Makefile.am	Diff File
	mod - configure.ac	Diff File
	add - examples/Makefile.am	Diff File
	add - examples/blog/articles/COPYING	Diff File
	add - examples/blog/articles/Makefile.am	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_context.c	Diff File
	mod - src/lib/merchant_api_context.h	Diff File
	mod - src/lib/merchant_api_json.c	Diff File
	mod - 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
	mod - src/tests/test_contract.c	Diff File
master 9d76bbc9 2016-03-15 14:56 Christian Grothoff Details Diff	fixing build system to include examples
	mod - Makefile.am	Diff File
	mod - configure.ac	Diff File
	add - examples/Makefile.am	Diff File
	add - examples/blog/articles/Makefile.am	Diff File

Changesets: merchant