| Author |
Committer |
Branch |
Timestamp |
Parent |
| Christian Grothoff |
Christian Grothoff |
master |
2016-02-15 18:26 |
master 686dacf4 |
|
|
Changeset |
Merge branch 'master' of ssh://taler.net/var/git/merchant |
| mod - src/backend/merchant.conf |
Diff
File |
| mod - src/backend/taler-merchant-httpd_contract.c |
Diff
File |
| mod - src/backend/taler-merchant-httpd_pay.c |
Diff
File |
| mod - src/frontend/checkout.php |
Diff
File |
| add - src/frontend/config.php |
Diff
File |
| mod - src/frontend/fulfillment.php |
Diff
File |
| mod - src/frontend/generate_taler_contract.php |
Diff
File |
| mod - src/frontend/index.php |
Diff
File |
| mod - src/frontend/pay.php |
Diff
File |
| rm - src/frontend_blog/articles/essay-x.html |
Diff
File |
| add - src/frontend_blog/articles/fs-essay.html |
Diff
File |
| mod - src/frontend_blog/cc_payment.php |
Diff
File |
| add - src/frontend_blog/essay_cc_pay-fulfillment.php |
Diff
File |
| rm - src/frontend_blog/essay_cc_pay.php |
Diff
File |
| mod - src/frontend_blog/essay_contract.php |
Diff
File |
| mod - src/frontend_blog/essay_fulfillment.php |
Diff
File |
| add - src/frontend_blog/essay_offer.php |
Diff
File |
| mod - src/frontend_blog/essay_pay.php |
Diff
File |
| rm - src/frontend_blog/execute.js |
Diff
File |
| rm - src/frontend_blog/execute.php |
Diff
File |
| rm - src/frontend_blog/execute.tsx |
Diff
File |
| mod - src/frontend_blog/index.html |
Diff
File |
| rm - src/frontend_blog/teaser.php |
Diff
File |
| mod - src/frontend_lib/merchants.php |
Diff
File |
