Changesets: merchant

Search Browse Back to Index

master 7c1b3b65

2016-01-21 18:29

Marcello Stanisci


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

Marcello Stanisci


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

Marcello Stanisci


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

Florian Dold


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

master 6d59885d

2016-01-21 12:40

Florian Dold


Details Diff		 invert conditional
mod - src/frontend/index.html Diff File

master 1e936a74

2016-01-20 19:16

Marcello Stanisci


Details Diff		 Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - src/frontend/index.html Diff File
add - src/frontend/taler-presence.js Diff File

master 44b4a0b2

2016-01-20 19:15

Marcello Stanisci


Details Diff		 Adding most of blog-type website.
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

master e72726c5

2016-01-20 18:53

Florian Dold


Details Diff		 Put wallet presence handling in external script.
mod - src/frontend/index.html Diff File
add - src/frontend/taler-presence.js Diff File

master 09b3cfee

2016-01-19 15:39

Christian Grothoff


Details Diff		 -fix (C) notices
mod - src/include/taler_merchant_service.h Diff File
mod - src/lib/merchant_api_context.c Diff File
mod - src/lib/merchant_api_context.h Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/test_merchant_api.c Diff File

master e3a8b30d

2016-01-19 15:39

Christian Grothoff


Details Diff		 Merge branch 'master' of git.taler.net:/var/git/merchant
mod - .gitignore Diff File
mod - configure.ac Diff File
rm - contrib/merchant.conf Diff File
add - m4/libcurl.m4 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
mod - src/backend/taler-merchant-httpd_contract.c Diff File
mod - src/backend/taler-merchant-httpd_mints.c Diff File
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/frontend/checkout.php Diff File
add - src/frontend/execute.js Diff File
add - src/frontend/execute.php Diff File
add - src/frontend/execute.tsx Diff File
mod - src/frontend/fulfillment.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/frontend/style.css Diff File
mod - src/include/Makefile.am Diff File
add - src/include/taler_merchant_service.h Diff File
mod - 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-mint-home/config/mint-common.conf Diff File
add - src/lib/test-mint-home/config/mint-keyup.conf Diff File
add - src/lib/test-mint-home/master.priv Diff File
add - src/lib/test-mint-home/sepa.json Diff File
add - src/lib/test_merchant.conf Diff File
add - src/lib/test_merchant.priv Diff File
add - src/lib/test_merchant_api.c Diff File
add - src/tsconfig.json Diff File

master 5da68e54

2016-01-19 15:39

Christian Grothoff


Details Diff		 -fix (C) notices
mod - src/backend/taler-merchant-httpd.c Diff File
mod - src/backend/taler-merchant-httpd.h Diff File
mod - src/backend/taler-merchant-httpd_auditors.c Diff File
mod - 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_mints.c Diff File
mod - src/backend/taler-merchant-httpd_mints.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/backenddb/merchantdb_plugin.c Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/include/taler_merchantdb_lib.h Diff File
mod - src/include/taler_merchantdb_plugin.h Diff File
mod - src/tests/test_contract.c Diff File

master 6c2ab7a4

2016-01-12 19:01

Florian Dold


Details Diff		 Change signaling, simplify code.
mod - src/frontend/index.html Diff File

master 383eb619

2016-01-01 23:51

Christian Grothoff


Details Diff		 fix currency for test
mod - src/lib/test_merchant.conf Diff File

master 7eba288b

2016-01-01 23:49

Christian Grothoff


Details Diff		 fix URI
mod - src/lib/test_merchant_api.c Diff File

master de00cd1c

2016-01-01 23:43

Christian Grothoff


Details Diff		 wait separately for backend httpd to be up
mod - src/lib/test_merchant_api.c Diff File

master 5344133d

2016-01-01 23:12

Christian Grothoff


Details Diff		 more logging
mod - src/backend/taler-merchant-httpd_pay.c Diff File

master 1e43a2db

2016-01-01 23:04

Christian Grothoff


Details Diff		 fix initialization, fix timestamp rounding (in testcase)
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/test_merchant_api.c Diff File

master b7bdeb38

2016-01-01 22:48

Christian Grothoff


Details Diff		 Merge branch 'master' of ssh://taler.net:/var/git/merchant
mod - src/backend/taler-merchant-httpd.c 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/execute.js Diff File
mod - src/frontend/execute.tsx Diff File
mod - src/frontend/pay.php Diff File

master 30f6e2db

2016-01-01 22:48

Christian Grothoff


Details Diff		 add logic to initialize coin data for /pay test
mod - src/lib/test_merchant_api.c Diff File

master 76223a7a

2016-01-01 22:27

Christian Grothoff


Details Diff		 use init value from coin, not uninit and wrong pc array
mod - src/lib/merchant_api_pay.c Diff File

master bcd8706b

2016-01-01 22:19

Christian Grothoff


Details Diff		 fix JSON syntax of contract in testcase
mod - src/lib/test_merchant_api.c Diff File

master fae18993

2016-01-01 22:16

Christian Grothoff


Details Diff		 improve logging
mod - src/lib/test_merchant_api.c Diff File

master fd71cc18

2016-01-01 22:14

Christian Grothoff


Details Diff		 add logging, initialize max_fee field
mod - src/lib/test_merchant_api.c Diff File

master 59a87aa0

2016-01-01 22:13

Christian Grothoff


Details Diff		 add logging, initialize max_fee field
mod - src/lib/test_merchant_api.c Diff File

master 1b9cb320

2016-01-01 21:44

Christian Grothoff


Details Diff		 update max_fd to new max, never lower it
mod - src/lib/merchant_api_context.c Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 110 ... 120 ... 122 123 124 125 126 127 128 ... 130 ... 136 137 138  Next  Last