Source Control Integration

master 3b654e61 2015-08-03 20:22 Marcello Stanisci Details Diff	Adding the 'melted' directory. Its purpose is to keep the files that
	add - src/backend/melted/Makefile.am	Diff File
	add - src/backend/melted/README	Diff File
	add - src/backend/melted/copy.sh	Diff File
	add - src/backend/melted/merchant.c	Diff File
	add - src/backend/melted/merchant.h	Diff File
	add - src/backend/melted/merchant_db.c	Diff File
	add - src/backend/melted/merchant_db.h	Diff File
	add - src/backend/melted/taler-merchant-httpd.c	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 4e8112a4 2015-07-31 20:41 Marcello Stanisci Details Diff	merchant DB initializable
	mod - src/backend/Makefile.am	Diff File
	add - src/backend/merchant_db.c	Diff File
	add - src/backend/merchant_db.h	Diff File
	add - src/backend/taler-merchant-dbinit	Diff File
	add - src/backend/taler-merchant-dbinit.c	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 403e50af 2015-07-31 16:53 Marcello Stanisci Details Diff	adding /hello test for merchant MHD
	add - src/backend/Makefile.am	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/merchant/taler_merchant_serve.c	Diff File
master 591113cc 2015-07-31 14:05 Marcello Stanisci Details Diff	readme
	mod - README	Diff File
	mod - configure.ac	Diff File
master db229c86 2015-07-31 13:47 Marcello Stanisci Details Diff	tuning the conf file to suite new taler libraries names
	mod - Makefile.am	Diff File
	mod - configure.ac	Diff File
master 71022180 2015-07-30 20:55 Marcello Stanisci Details Diff	adding hello_world-ish merchant backend
	add - src/backend/taler-merchant-httpd.c	Diff File
master 8ffc458b 2015-07-30 19:52 Marcello Stanisci Details Diff	defining the new directory layout according to the
	add - src/backend/README	Diff File
	mod - src/frontend/README	Diff File
	mod - src/frontend/cert.php	Diff File
	add - src/frontend/checkout.php	Diff File
	mod - src/frontend/create-reserve-form.html	Diff File
	mod - src/frontend/index.html	Diff File
	mod - src/frontend/merchant.js	Diff File
	mod - src/frontend/pay.php	Diff File
	mod - src/frontend/shopping.html	Diff File
	mod - src/frontend/style.css	Diff File
	mod - src/frontend/toys2.jpg	Diff File
	rm - src/website/checkout.php	Diff File
	rm - src/website/index.html	Diff File
	rm - src/website/new/cert.php	Diff File
	rm - src/website/new/checkout.php	Diff File
	rm - src/website/pay.php	Diff File
master 9c2a5666 2015-07-28 19:18 Marcello Stanisci Details Diff	adapting existing merchant routines to the new website
	add - src/website/new/cert.php	Diff File
	add - src/website/new/checkout.php	Diff File
	mod - src/website/new/index.html	Diff File
	add - src/website/new/pay.php	Diff File
	add - src/website/new/shopping.html	Diff File
master 38050d73 2015-07-28 12:18 Marcello Stanisci Details Diff	adding 1000EUR to create reserve form
	mod - src/website/new/create-reserve-form.html	Diff File
master 41f21f0b 2015-07-17 18:43 Marcello Stanisci Details Diff	adding host independent URIs
	mod - src/website/new/create-reserve-form.html	Diff File
	mod - src/website/new/merchant.js	Diff File
master 2c8fa2d9 2015-07-07 19:23 Marcello Stanisci Details Diff	blanking out homepage background image
	mod - src/website/new/style.css	Diff File
master ec147909 2015-07-07 12:08 Marcello Stanisci Details Diff	adding currency selection
	mod - src/website/new/create-reserve-form.html	Diff File
	mod - src/website/new/merchant.js	Diff File
master e915d79e 2015-07-03 19:44 Marcello Stanisci Details Diff	renaming files
	mod - src/website/new/index.html	Diff File
master 9b88afc5 2015-07-03 19:43 Marcello Stanisci Details Diff	adding new faced merchant website
	add - src/website/new/create-reserve-form.html	Diff File
	add - src/website/new/merchant.html	Diff File
	add - src/website/new/merchant.js	Diff File
	add - src/website/new/style.css	Diff File
	add - src/website/new/toys2.jpg	Diff File
master cfb8b5fc 2015-05-26 19:56 Marcello Stanisci Details Diff	minimal merchant website added
	add - src/website/README	Diff File
	add - src/website/cert.php	Diff File
	add - src/website/checkout.php	Diff File
	add - src/website/index.html	Diff File
	add - src/website/pay.php	Diff File
master 8bd435d7 2015-05-01 11:59 Christian Grothoff Details Diff	minor bugfixes
	mod - src/merchant/taler_merchant_serve.c	Diff File
master e4bd4aba 2015-01-30 15:26 Christian Grothoff Details Diff	updating ignores
	add - .gitignore	Diff File
master 5a46d876 2015-01-30 15:25 Christian Grothoff Details Diff	do not track generated files
	rm - src/Makefile	Diff File
	rm - src/Makefile.in	Diff File
	rm - src/include/Makefile	Diff File
	rm - src/include/Makefile.in	Diff File
	rm - src/merchant/Makefile	Diff File
	rm - src/merchant/Makefile.in	Diff File
master 978c90ce 2015-01-30 15:24 Christian Grothoff Details Diff	add missing library to linker flags
	mod - src/Makefile	Diff File
	mod - src/Makefile.in	Diff File
	mod - src/include/Makefile	Diff File
	mod - src/include/Makefile.in	Diff File
	mod - src/merchant/Makefile	Diff File
	mod - src/merchant/Makefile.am	Diff File
	mod - src/merchant/Makefile.in	Diff File
master 27992879 2015-01-30 15:21 Christian Grothoff Details Diff	Merge branch 'master' of git.taler.net:/var/git/merchant
	mod - src/Makefile	Diff File
	mod - src/Makefile.in	Diff File
	mod - src/include/Makefile	Diff File
	mod - src/include/Makefile.in	Diff File
	mod - src/merchant/Makefile	Diff File
	mod - src/merchant/Makefile.am	Diff File
	mod - src/merchant/Makefile.in	Diff File
	mod - src/merchant/merchant_db.c	Diff File
master 9d8dec9a 2015-01-30 15:21 Christian Grothoff Details Diff	fix include to include taler/ prefix
	mod - src/merchant/test_merchant_db.c	Diff File
master 50ae1896 2015-01-30 11:59 Christian Grothoff Details Diff	updates to match current mint
	mod - src/Makefile	Diff File
	mod - src/Makefile.in	Diff File
	mod - src/include/Makefile	Diff File
	mod - src/include/Makefile.in	Diff File
	mod - src/merchant/Makefile	Diff File
	mod - src/merchant/Makefile.am	Diff File
	mod - src/merchant/Makefile.in	Diff File
	mod - src/merchant/merchant_db.c	Diff File
master 1661086a 2015-01-29 22:46 Christian Grothoff Details Diff	-fix ftbfs issues
	mod - configure.ac	Diff File
	mod - src/Makefile	Diff File
	mod - src/include/Makefile	Diff File
	mod - src/merchant/Makefile	Diff File
	mod - src/merchant/Makefile.am	Diff File
	mod - src/merchant/Makefile.in	Diff File
	mod - src/merchant/taler_merchant_serve.c	Diff File
master 08a5ee5e 2015-01-29 22:26 Christian Grothoff Details Diff	sample configuration
	add - contrib/merchant.conf	Diff File
master 18f75db0 2015-01-29 22:20 Christian Grothoff Details Diff	initial import of merchant logic (FTBFS)
	add - AUTHORS	Diff File
	add - COPYING	Diff File
	add - ChangeLog	Diff File
	add - Makefile.am	Diff File
	add - NEWS	Diff File
	add - README	Diff File
	add - bootstrap	Diff File
	add - configure.ac	Diff File
	add - doc/Makefile.am	Diff File
	add - m4/ax_lib_postgresql.m4	Diff File
	add - m4/libgnurl.m4	Diff File
	add - src/.gitignore	Diff File
	add - src/Makefile	Diff File
	add - src/Makefile.am	Diff File
	add - src/Makefile.in	Diff File
	add - src/include/Makefile	Diff File
	add - src/include/Makefile.am	Diff File
	add - src/include/Makefile.in	Diff File
	add - src/include/platform.h	Diff File
	add - src/merchant/.gitignore	Diff File
	add - src/merchant/Makefile	Diff File
	add - src/merchant/Makefile.am	Diff File
	add - src/merchant/Makefile.in	Diff File
	add - src/merchant/merchant.c	Diff File
	add - src/merchant/merchant.h	Diff File
	add - src/merchant/merchant_db.c	Diff File
	add - src/merchant/merchant_db.h	Diff File
	add - src/merchant/taler_merchant_dbinit.c	Diff File
	add - src/merchant/taler_merchant_serve.c	Diff File
	add - src/merchant/test_merchant.c	Diff File
	add - src/merchant/test_merchant.conf	Diff File
	add - src/merchant/test_merchant.ecc	Diff File
	add - src/merchant/test_merchant_db.c	Diff File

Changesets: merchant