Changesets: merchant
|
master 81c80fde 2016-01-25 12:04 Details Diff |
Merge branch 'master' of ssh://taler.net/var/git/merchant | ||
| mod - src/backend/taler-merchant-httpd_contract.c | Diff File | ||
| mod - src/frontend/checkout.php | Diff File | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
| mod - src/frontend/pay.php | Diff File | ||
| add - src/frontend/util.php | Diff File | ||
|
master 29ace180 2016-01-25 12:02 Details Diff |
blog: making cc payment by dedicated scripts, + deferring | ||
| mod - src/frontend_blog/cc_payment.php | Diff File | ||
| add - 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 | ||
| mod - src/frontend_blog/essay_pay.php | Diff File | ||
| mod - src/frontend_blog/index.html | Diff File | ||
| mod - src/frontend_blog/teaser.php | Diff File | ||
|
master d1afdc9b 2016-01-24 21:26 Details Diff |
correctly append contract identifier | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master ea402fdb 2016-01-24 20:49 Details Diff |
send JSON as payment response | ||
| mod - src/frontend/pay.php | Diff File | ||
|
master e631c051 2016-01-24 20:11 Details Diff |
type error | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 5bf86b23 2016-01-24 20:09 Details Diff |
type error | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 0f9b5928 2016-01-24 19:40 Details Diff |
php syntax | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 6fa02fce 2016-01-24 19:36 Details Diff |
fix JSON format string | ||
| mod - src/backend/taler-merchant-httpd_contract.c | Diff File | ||
|
master 33e60ed8 2016-01-24 19:33 Details Diff |
remove URLs from inside contract | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 90aa0f82 2016-01-24 19:32 Details Diff |
get session values | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master d2ff9f89 2016-01-24 19:27 Details Diff |
exec/pay url | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 4053ceef 2016-01-24 19:24 Details Diff |
syntax | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
|
master 1f56da97 2016-01-24 19:22 Details Diff |
properly concatenate | ||
| mod - src/frontend/fulfillment.php | Diff File | ||
| mod - src/frontend/generate_taler_contract.php | Diff File | ||
| mod - src/frontend/pay.php | Diff File | ||
| add - src/frontend/util.php | Diff File | ||
|
master 7e2f81ed 2016-01-24 17:57 Details Diff |
Remove {exec,pay}_url from backend. | ||
| mod - src/backend/taler-merchant-httpd_contract.c | Diff File | ||
|
master 62a4d369 2016-01-24 17:44 Details Diff |
indentation | ||
| mod - src/frontend/checkout.php | Diff File | ||
|
master 18994e71 2016-01-24 17:42 Details Diff |
checked, not selected | ||
| mod - src/frontend/checkout.php | Diff File | ||
|
master a6aee501 2016-01-24 17:38 Details Diff |
default selection | ||
| mod - src/frontend/checkout.php | Diff File | ||
|
master 4c1c16ab 2016-01-24 17:37 Details Diff |
syntax | ||
| mod - src/frontend/checkout.php | Diff File | ||
|
master cdbd5fa4 2016-01-24 17:36 Details Diff |
syntax | ||
| mod - src/frontend/checkout.php | Diff File | ||
|
master f7c3af7b 2016-01-24 17:32 Details Diff |
Simplify checkout code. | ||
| mod - src/frontend/checkout.php | Diff File | ||
|
master 3504d1e5 2016-01-22 12:47 Details Diff |
blog: adding the page for non-Taler readers, plus | ||
| add - src/frontend_blog/cc_payment.html | Diff File | ||
| mod - src/frontend_blog/teaser.php | Diff File | ||
|
master 7c1b3b65 2016-01-21 18:29 Details Diff |
Completing article purchase | ||
| mod - src/frontend/checkout.php | Diff File | ||
| rm - src/frontend_blog/README | Diff File | ||
| mod - src/frontend_blog/essay_checkout.php | Diff File | ||
| mod - src/frontend_blog/essay_fulfillment.php | Diff File | ||
| mod - src/frontend_blog/essay_pay.php | Diff File | ||
|
master 009b1314 2016-01-21 15:47 Details Diff |
Merge branch 'master' of ssh://taler.net/var/git/merchant | ||
| mod - src/frontend/index.html | Diff File | ||
|
master 9dfc7482 2016-01-21 15:46 Details Diff |
Removing payment method choice from article purchase, | ||
| mod - src/frontend_blog/essay_checkout.php | Diff File | ||
| mod - src/frontend_blog/essay_pay.php | Diff File | ||
|
master 96622672 2016-01-21 12:40 Details Diff |
Merge branch 'master' of ssh://taler.net/var/git/merchant | ||
| mod - src/frontend/checkout.php | Diff File | ||
| add - src/frontend_blog/README | Diff File | ||
| add - src/frontend_blog/articles/essay-x.html | Diff File | ||
| add - src/frontend_blog/blog_lib.php | Diff File | ||
| add - src/frontend_blog/essay_checkout.php | Diff File | ||
| add - src/frontend_blog/essay_contract.php | Diff File | ||
| add - src/frontend_blog/essay_fulfillment.php | Diff File | ||
| add - src/frontend_blog/essay_pay.php | Diff File | ||
| add - src/frontend_blog/execute.js | Diff File | ||
| add - src/frontend_blog/execute.php | Diff File | ||
| add - src/frontend_blog/execute.tsx | Diff File | ||
| add - src/frontend_blog/index.html | Diff File | ||
| add - src/frontend_blog/style.css | Diff File | ||
| add - src/frontend_blog/teaser.php | Diff File | ||
| add - src/frontend_lib/merchants.php | Diff File | ||
