merchant: master c1159ff5

Diff Back to Repository
Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2015-11-05 18:56 master e55860d9
Changeset Merge branch 'fix4013'
mod - configure.ac Diff File
mod - src/Makefile.am Diff File
mod - src/backend-lib/Makefile.am Diff File
add - src/backend-lib/merchant_api_contract.c Diff File
mod - src/backend-lib/merchant_api_deposit.c Diff File
mod - src/backend-lib/merchant_db.c Diff File
mod - src/backend-lib/merchant_db.h Diff File
rm - src/backend-lib/taler-merchant-httpd_contract.c Diff File
mod - src/backend-lib/taler_merchant_contract_lib.h Diff File
mod - src/backend/Makefile.am Diff File
rm - src/backend/melted/Makefile.am Diff File
rm - src/backend/melted/README Diff File
rm - src/backend/melted/copy.sh Diff File
rm - src/backend/melted/merchant.c Diff File
rm - src/backend/melted/merchant.conf Diff File
rm - src/backend/melted/merchant.h Diff File
rm - src/backend/melted/merchant_db.c Diff File
rm - src/backend/melted/merchant_db.h Diff File
rm - src/backend/melted/myconf.sh Diff File
rm - src/backend/melted/taler-merchant-httpd.c Diff File
mod - src/backend/merchant.c Diff File
mod - src/backend/merchant.conf Diff File
mod - src/backend/taler-merchant-httpd.c Diff File
add - src/backend/taler-merchant-httpd_contract.c Diff File
add - src/backend/taler-merchant-httpd_contract.h Diff File
add - src/backend/taler-merchant-httpd_obsolete.c Diff File
add - src/backend/taler-merchant-httpd_pay.c Diff File
add - src/backend/taler-merchant-httpd_pay.h Diff File
add - src/backend/taler-mint-httpd.h Diff File
add - src/backend/taler-mint-httpd_mhd.c Diff File
add - src/backend/taler-mint-httpd_mhd.h Diff File
mod - src/backend/taler-mint-httpd_parsing.c Diff File
mod - src/backend/taler-mint-httpd_parsing.h Diff File
mod - src/backend/taler-mint-httpd_responses.c Diff File
mod - src/backend/taler-mint-httpd_responses.h 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/frontend/pay.php Diff File
mod - src/include/merchant.h Diff File
mod - src/tests/Makefile.am Diff File
add - src/tests/deposit_permission.sample Diff File
add - src/tests/deposit_permission_backend.sample Diff File
add - src/tests/deposit_permission_edate_backend.sample Diff File
rm - src/tests/merchant.c Diff File
mod - src/tests/test_contract.c Diff File
add - src/tests/test_contract_README Diff File
add - src/tests/test_pay_README Diff File