Author |
Committer |
Branch |
Timestamp |
Parent |
Florian Dold |
Florian Dold |
master |
2015-12-18 11:57 |
master 4b528005 |
Changeset |
Merge branch 'master' of ssh://taler.net/var/git/merchant |
mod - README |
Diff
File |
mod - configure.ac |
Diff
File |
add - m4/libcurl.m4 |
Diff
File |
mod - src/Makefile.am |
Diff
File |
rm - src/backend-lib/Makefile.am |
Diff
File |
rm - src/backend-lib/merchant_api_contract.c |
Diff
File |
rm - src/backend-lib/merchant_api_deposit.c |
Diff
File |
rm - src/backend-lib/merchant_db.c |
Diff
File |
rm - src/backend-lib/merchant_db.h |
Diff
File |
rm - src/backend-lib/taler_merchant_contract_lib.h |
Diff
File |
rm - src/backend-lib/taler_merchant_deposit_lib.h |
Diff
File |
rm - src/backend-lib/taler_merchant_lib.h |
Diff
File |
mod - src/backend/Makefile.am |
Diff
File |
rm - src/backend/QUESTIONS |
Diff
File |
rm - src/backend/README |
Diff
File |
rm - src/backend/merchant.c |
Diff
File |
mod - src/backend/merchant.conf |
Diff
File |
mod - src/backend/taler-merchant-httpd.c |
Diff
File |
mod - src/backend/taler-merchant-httpd.h |
Diff
File |
add - src/backend/taler-merchant-httpd_auditors.c |
Diff
File |
add - 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_mhd.c |
Diff
File |
mod - src/backend/taler-merchant-httpd_mhd.h |
Diff
File |
add - src/backend/taler-merchant-httpd_mints.c |
Diff
File |
add - src/backend/taler-merchant-httpd_mints.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 |
rm - src/backend/taler-mint-httpd.h |
Diff
File |
add - src/backenddb/Makefile.am |
Diff
File |
add - src/backenddb/merchantdb_plugin.c |
Diff
File |
add - src/backenddb/plugin_merchantdb_postgres.c |
Diff
File |
mod - src/frontend/fullfillment.php |
Diff
File |
mod - src/include/Makefile.am |
Diff
File |
rm - src/include/merchant.h |
Diff
File |
mod - src/include/platform.h |
Diff
File |
add - src/include/taler_merchant_service.h |
Diff
File |
add - src/include/taler_merchantdb_lib.h |
Diff
File |
add - src/include/taler_merchantdb_plugin.h |
Diff
File |
add - src/lib/Makefile.am |
Diff
File |
add - src/lib/merchant_api_context.c |
Diff
File |
add - src/lib/merchant_api_context.h |
Diff
File |
add - src/lib/merchant_api_json.c |
Diff
File |
add - src/lib/merchant_api_json.h |
Diff
File |
add - src/lib/merchant_api_pay.c |
Diff
File |
add - src/lib/test_merchant_api.c |
Diff
File |
rm - src/merchant/.gitignore |
Diff
File |
rm - src/merchant/Makefile.am |
Diff
File |
rm - src/merchant/merchant.c |
Diff
File |
rm - src/merchant/merchant.h |
Diff
File |
rm - src/merchant/merchant_db.c |
Diff
File |
rm - src/merchant/merchant_db.h |
Diff
File |
rm - src/merchant/taler_merchant_dbinit.c |
Diff
File |
rm - src/merchant/taler_merchant_serve.c |
Diff
File |
rm - src/merchant/test_merchant.c |
Diff
File |
rm - src/merchant/test_merchant.conf |
Diff
File |
rm - src/merchant/test_merchant.ecc |
Diff
File |
rm - src/merchant/test_merchant_db.c |
Diff
File |
mod - src/tests/test_contract.c |
Diff
File |