Source Control Integration

master 54b6af78 2015-09-17 15:57 Marcello Stanisci Details Diff	adding JSON fields 'max fee' and 'mints' (to indicate the accepted mints)
	mod - src/backend-lib/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/tests/merchant-contract-test.c	Diff File
master 836fedcb 2015-09-16 20:22 Marcello Stanisci Details Diff	adding which mints & maximum fee are accepted, in the contract.
	mod - src/backend-lib/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/tests/merchant-contract-test.c	Diff File
master ff8c5abc 2015-09-16 18:44 Marcello Stanisci Details Diff	fixing 3966 and refactoring the way
	mod - src/backend-lib/taler-merchant-httpd_contract.c	Diff File
	mod - src/backend-lib/taler_merchant_contract_lib.h	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	rm - src/tests/merchant-contract-test	Diff File
	mod - src/tests/merchant-contract-test.c	Diff File
master 9f969c1b 2015-09-16 12:57 Marcello Stanisci Details Diff	testsuite able to generate the new contract format,
	mod - src/backend-lib/taler-merchant-httpd_contract.c	Diff File
	mod - src/tests/merchant-contract-test	Diff File
	mod - src/tests/merchant-contract-test.c	Diff File
master f9e4086d 2015-09-15 20:02 Marcello Stanisci Details Diff	adding merchant library +
	mod - configure.ac	Diff File
	mod - src/Makefile.am	Diff File
	add - src/backend-lib/Makefile.am	Diff File
	add - src/backend-lib/merchant_db.c	Diff File
	add - src/backend-lib/merchant_db.h	Diff File
	add - src/backend-lib/taler-merchant-httpd_contract.c	Diff File
	add - src/backend-lib/taler_merchant_contract_lib.h	Diff File
	add - src/backend-lib/taler_merchant_lib.h	Diff File
	mod - src/backend/Makefile.am	Diff File
	add - src/backend/QUESTIONS	Diff File
	add - src/backend/merchant.priv	Diff File
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.html	Diff File
	mod - src/include/merchant.h	Diff File
	add - src/tests/Makefile.am	Diff File
	add - src/tests/merchant-contract-test	Diff File
	add - src/tests/merchant-contract-test.c	Diff File
	add - src/tests/merchant.c	Diff File
	add - src/tests/merchant.conf	Diff File
	add - src/tests/merchant.priv	Diff File
	add - src/tests/merchant_db.c	Diff File
	add - src/tests/merchant_db.h	Diff File
	add - src/tests/test.debug	Diff File
	add - src/tests/test.valgrind	Diff File
master a25a8015 2015-09-10 19:35 Marcello Stanisci Details Diff	minor fixes
	mod - src/backend/taler-merchant-httpd.c	Diff File
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
master 675ad590 2015-09-09 18:56 Marcello Stanisci Details Diff	code cleaning
	mod - src/backend/taler-merchant-httpd.c	Diff File
master 152f8969 2015-09-09 18:36 Marcello Stanisci Details Diff	specifying the whole URL when doing
	mod - src/frontend/generate_taler_contract.php	Diff File
master 01fafa8a 2015-09-09 17:52 Marcello Stanisci Details Diff	dummy
	mod - src/frontend/generate_taler_contract.php	Diff File
master f96edcf6 2015-09-04 20:28 Marcello Stanisci Details Diff	a variable renaming
	mod - src/frontend/checkout.php	Diff File
master 92eb03da 2015-09-03 19:55 Marcello Stanisci Details Diff	fixing signaling to let the extension hide and show parts of
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/index.html	Diff File
master f62583df 2015-08-22 02:37 psyc://psyced.org/~lynX Details Diff	fix indenting
	mod - src/frontend/index.html	Diff File
master 951edfed 2015-08-22 02:31 psyc://psyced.org/~lynX Details Diff	Merge remote-tracking branch 'origin/master'
	rm - src/frontend/cert.php	Diff File
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/fake_wire_transfer.php	Diff File
	add - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.html	Diff File
	mod - src/frontend/pay.php	Diff File
master da828fa6 2015-08-22 02:30 psyc://psyced.org/~lynX Details Diff	acceptable form display
	mod - src/frontend/style.css	Diff File
master bb897931 2015-08-19 01:15 Christian Grothoff Details Diff	newline
	mod - src/frontend/index.html	Diff File
master 783169d8 2015-08-19 01:05 Christian Grothoff Details Diff	clarify license as LGPL
	mod - src/frontend/fake_wire_transfer.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.html	Diff File
	mod - src/frontend/pay.php	Diff File
master ef5e9452 2015-08-19 01:03 Christian Grothoff Details Diff	clarify license as LGPL
	mod - src/frontend/checkout.php	Diff File
	mod - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.html	Diff File
	mod - src/frontend/pay.php	Diff File
master 69bbbd9a 2015-08-19 00:56 Christian Grothoff Details Diff	clean up logic, more comments, etc.
	rm - src/frontend/cert.php	Diff File
	mod - src/frontend/checkout.php	Diff File
	add - src/frontend/generate_taler_contract.php	Diff File
	mod - src/frontend/index.html	Diff File
master 7e253f1d 2015-08-19 00:11 Christian Grothoff Details Diff	fix escaping
	mod - src/frontend/fake_wire_transfer.php	Diff File
master 948482fa 2015-08-19 00:03 Christian Grothoff Details Diff	Merge branch 'master' of ssh://taler.net:/var/git/merchant
	mod - src/frontend/style.css	Diff File
master d731e110 2015-08-19 00:03 Christian Grothoff Details Diff	fix date()-format
	mod - src/frontend/fake_wire_transfer.php	Diff File
master 6d169319 2015-08-19 00:01 psyc://psyced.org/~lynX Details Diff	Merge remote-tracking branch 'origin/master'
	mod - src/frontend/fake_wire_transfer.php	Diff File
master 73b884f0 2015-08-19 00:01 psyc://psyced.org/~lynX Details Diff	give the form some space...
	mod - src/frontend/style.css	Diff File
master 8500ba42 2015-08-18 23:58 Christian Grothoff Details Diff	convert to integer
	mod - src/frontend/fake_wire_transfer.php	Diff File
master 372e3806 2015-08-18 23:56 psyc://psyced.org/~lynX Details Diff	we only do first-letter in fairy tales
	mod - src/frontend/style.css	Diff File

Changesets: merchant