Changesets: merchant

master 0e9ee165

2016-03-10 12:51

Marcello Stanisci


Details Diff
testing push
add - push_test Diff File

master 1597034b

2016-03-09 17:19

Marcello Stanisci


Details Diff
making HTML pick CSS from web-common and committing latest
mod - examples/blog/articles/scrap1_1.html Diff File
mod - examples/blog/articles/scrap1_10.html Diff File
mod - examples/blog/articles/scrap1_11.html Diff File
mod - examples/blog/articles/scrap1_12.html Diff File
mod - examples/blog/articles/scrap1_13.html Diff File
mod - examples/blog/articles/scrap1_14.html Diff File
mod - examples/blog/articles/scrap1_15.html Diff File
mod - examples/blog/articles/scrap1_16.html Diff File
mod - examples/blog/articles/scrap1_17.html Diff File
mod - examples/blog/articles/scrap1_18.html Diff File
mod - examples/blog/articles/scrap1_19.html Diff File
mod - examples/blog/articles/scrap1_2.html Diff File
mod - examples/blog/articles/scrap1_20.html Diff File
mod - examples/blog/articles/scrap1_21.html Diff File
mod - examples/blog/articles/scrap1_22.html Diff File
mod - examples/blog/articles/scrap1_23.html Diff File
mod - examples/blog/articles/scrap1_24.html Diff File
mod - examples/blog/articles/scrap1_25.html Diff File
mod - examples/blog/articles/scrap1_26.html Diff File
mod - examples/blog/articles/scrap1_27.html Diff File
mod - examples/blog/articles/scrap1_28.html Diff File
mod - examples/blog/articles/scrap1_29.html Diff File
mod - examples/blog/articles/scrap1_3.html Diff File
mod - examples/blog/articles/scrap1_30.html Diff File
mod - examples/blog/articles/scrap1_31.html Diff File
mod - examples/blog/articles/scrap1_32.html Diff File
mod - examples/blog/articles/scrap1_33.html Diff File
mod - examples/blog/articles/scrap1_34.html Diff File
mod - examples/blog/articles/scrap1_35.html Diff File
mod - examples/blog/articles/scrap1_36.html Diff File
mod - examples/blog/articles/scrap1_37.html Diff File
mod - examples/blog/articles/scrap1_38.html Diff File
mod - examples/blog/articles/scrap1_39.html Diff File
mod - examples/blog/articles/scrap1_4.html Diff File
mod - examples/blog/articles/scrap1_40.html Diff File
mod - examples/blog/articles/scrap1_41.html Diff File
mod - examples/blog/articles/scrap1_42.html Diff File
mod - examples/blog/articles/scrap1_43.html Diff File
mod - examples/blog/articles/scrap1_46.html Diff File
mod - examples/blog/articles/scrap1_47.html Diff File
mod - examples/blog/articles/scrap1_5.html Diff File
mod - examples/blog/articles/scrap1_6.html Diff File
mod - examples/blog/articles/scrap1_7.html Diff File
mod - examples/blog/articles/scrap1_8.html Diff File
mod - examples/blog/articles/scrap1_9.html Diff File
mod - examples/blog/articles/scrap1_U.0.html Diff File
mod - examples/blog/articles/scrap1_U.1.html Diff File
mod - examples/blog/essay_cc-form.html Diff File
mod - examples/blog/index.html Diff File
mod - examples/blog/web-common Diff File
mod - examples/shop/checkout.php Diff File
mod - examples/shop/fulfillment.php Diff File
mod - examples/shop/index.php Diff File
mod - examples/shop/web-common Diff File

master 56aad665

2016-03-08 18:58

Marcello Stanisci


Details Diff
still on licensing
mod - licensing.rst Diff File

master 2f82e43f

2016-03-08 14:22

Marcello Stanisci


Details Diff
adding AUTHORS file
mod - AUTHORS Diff File

master c9545b06

2016-03-08 11:45

Marcello Stanisci


Details Diff
updating licensing information
mod - copylib/config.php Diff File
mod - copylib/merchants.php Diff File
mod - copylib/util.php Diff File
mod - examples/blog/blog_lib.php Diff File
mod - examples/blog/essay_cc-form.html Diff File
mod - examples/blog/essay_cc-fulfillment.php Diff File
mod - examples/blog/essay_contract.php Diff File
mod - examples/blog/essay_fulfillment.php Diff File
mod - examples/blog/essay_pay.php Diff File
mod - examples/blog/index.html Diff File
rm - examples/blog/style.css Diff File
mod - examples/shop/checkout.php Diff File
mod - examples/shop/fulfillment.php Diff File
mod - examples/shop/index.php Diff File
mod - examples/shop/pay.php Diff File
mod - licensing.rst Diff File
mod - src/backend/myconf.sh 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_auditors.c 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_exchanges.c Diff File
mod - src/backend/taler-merchant-httpd_exchanges.h Diff File
mod - src/backend/taler-merchant-httpd_mhd.c Diff File
mod - src/backend/taler-merchant-httpd_parsing.c Diff File
mod - src/backend/taler-merchant-httpd_responses.c Diff File
mod - src/backend/taler-merchant-httpd_util.c Diff File
mod - src/backenddb/merchantdb_plugin.c Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/include/platform.h Diff File
mod - src/include/taler_merchant_service.h Diff File
mod - src/include/taler_merchantdb_lib.h Diff File
mod - src/include/taler_merchantdb_plugin.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_json.c Diff File
mod - src/lib/merchant_api_json.h Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/test_merchant_api.c Diff File
mod - src/tests/test_contract.c Diff File

master 3bbc4329

2016-03-07 18:37

Marcello Stanisci


Details Diff
removing use of copy&pasted HTML/JS
rm - copylib/taler-presence.js Diff File
mod - examples/blog/essay_cc-form.html Diff File
rm - examples/blog/taler-presence.js Diff File
mod - licensing.rst Diff File

master 065d8548

2016-03-07 16:41

Marcello Stanisci


Details Diff
uncommenting wire transfer type selection based on config file
mod - src/backend/taler-merchant-httpd.c Diff File

master ac9ae098

2016-03-07 15:56

Marcello Stanisci


Details Diff
removing double memory free
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_parsing.c Diff File

master dfa69cf1

2016-03-07 11:53

Marcello Stanisci


Details Diff
still on licensing
add - OWNERS.rst Diff File
mod - examples/blog/blog_lib.php Diff File
mod - examples/blog/essay_cc-form.html Diff File
mod - examples/blog/essay_cc-fulfillment.php Diff File
mod - examples/blog/essay_contract.php Diff File
mod - examples/blog/essay_fulfillment.php Diff File
mod - examples/blog/essay_pay.php Diff File
mod - examples/blog/index.html Diff File
mod - examples/blog/style.css Diff File
mod - examples/blog/taler-presence.js Diff File
mod - examples/shop/checkout.php Diff File
mod - examples/shop/config.php Diff File
mod - examples/shop/fulfillment.php Diff File
mod - examples/shop/generate_taler_contract.php Diff File
mod - examples/shop/index.php Diff File
mod - examples/shop/pay.php Diff File
mod - examples/shop/style.css Diff File
mod - src/Makefile.am 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_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_exchanges.c Diff File
mod - src/backend/taler-merchant-httpd_exchanges.h Diff File
mod - src/backend/taler-merchant-httpd_mhd.c Diff File
mod - src/backend/taler-merchant-httpd_mhd.h Diff File
mod - src/backend/taler-merchant-httpd_pay.c Diff File
mod - src/backend/taler-merchant-httpd_util.c Diff File
mod - src/backenddb/merchantdb_plugin.c Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/include/platform.h Diff File
mod - src/include/taler_merchant_service.h 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 97535db1

2016-03-04 18:17

Marcello Stanisci


Details Diff
making TEST account_number a json_int_t
mod - src/backend/taler-merchant-httpd.c Diff File

master 246aed04

2016-03-04 16:58

Marcello Stanisci


Details Diff
removing unneeded prints
mod - src/backend/taler-merchant-httpd_pay.c Diff File

master 1eedc6b5

2016-03-04 16:29

Marcello Stanisci


Details Diff
adding TEST as possible wiretransfer types (backend)
rm - src/backend/merchant.conf Diff File
mod - src/backend/taler-merchant-httpd.c Diff File

master 1879165d

2016-03-03 01:11

Florian Dold


Details Diff
typo
mod - examples/shop/fulfillment.php Diff File

master 9ea8ecca

2016-03-03 01:10

Florian Dold


Details Diff
hacky way to hide intermediate page
mod - examples/shop/fulfillment.php Diff File

master d5ebd6ca

2016-03-02 15:36

Florian Dold


Details Diff
refactor
mod - copylib/merchants.php Diff File
mod - examples/blog/essay_contract.php Diff File
mod - examples/blog/essay_fulfillment.php Diff File
mod - examples/shop/generate_taler_contract.php Diff File

master 51c8aca5

2016-03-02 15:29

Florian Dold


Details Diff
fix url concatenation
mod - copylib/merchants.php Diff File
mod - examples/blog/essay_contract.php Diff File
mod - examples/blog/essay_fulfillment.php Diff File
mod - examples/blog/essay_pay.php Diff File

master 691d5288

2016-03-02 06:12

Florian Dold


Details Diff
cancel timeout
mod - examples/blog/essay_cc-form.html Diff File

master 586e3c28

2016-03-02 06:05

Florian Dold


Details Diff
fading
mod - examples/blog/essay_cc-form.html Diff File
mod - examples/blog/style.css Diff File

master 12795fb4

2016-03-02 05:50

Florian Dold


Details Diff
prettier wallet handling
mod - examples/blog/essay_cc-form.html Diff File

master 1108f7ca

2016-03-02 05:36

Florian Dold


Details Diff
parse json before giving it to wallet
mod - examples/blog/essay_cc-form.html Diff File
mod - examples/shop/checkout.php Diff File

master 8782d435

2016-03-02 05:28

Florian Dold


Details Diff
rename event
mod - examples/blog/essay_cc-form.html Diff File
mod - examples/shop/checkout.php Diff File

master 4184067e

2016-03-01 20:36

Florian Dold


Details Diff
mint->exchange
mod - src/lib/test-exchange-home/config/exchange-common.conf Diff File
mod - src/lib/test-exchange-home/config/exchange-keyup.conf Diff File
mod - src/lib/test-exchange-home/master.priv Diff File
mod - src/lib/test-exchange-home/sepa.json Diff File

master 42648745

2016-03-01 20:35

Florian Dold


Details Diff
make bootstrap executable again
mod - bootstrap Diff File

master 8c41ec42

2016-03-01 17:16

Christian Grothoff


Details Diff
Merge branch 'master' of git.taler.net:/var/git/merchant
mod - examples/shop/index.php Diff File
rm - src/tests/test.valgrind Diff File

master 94059c03

2016-03-01 17:16

Christian Grothoff


Details Diff
mint->exchange renaming
mod - bootstrap Diff File
mod - configure.ac Diff File
mod - examples/shop/README Diff File
mod - examples/shop/index.php Diff File
mod - src/backend/Makefile.am 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_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_exchanges.c Diff File
add - src/backend/taler-merchant-httpd_exchanges.h Diff File
mod - src/backend/taler-merchant-httpd_mhd.c Diff File
mod - src/backend/taler-merchant-httpd_mhd.h Diff File
rm - 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
mod - src/backend/taler-merchant-httpd_util.c Diff File
mod - src/backend/taler-merchant-httpd_util.h Diff File
mod - src/backenddb/plugin_merchantdb_postgres.c Diff File
mod - src/include/taler_merchant_service.h Diff File
mod - src/include/taler_merchantdb_plugin.h Diff File
mod - src/lib/Makefile.am Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/test-mint-home/config/mint-common.conf Diff File
mod - src/lib/test-mint-home/config/mint-keyup.conf Diff File
mod - src/lib/test_merchant.conf Diff File
mod - src/lib/test_merchant_api.c Diff File
mod - src/tests/Makefile.am Diff File
mod - src/tests/deposit_permission.sample Diff File
mod - src/tests/deposit_permission_backend.sample Diff File
mod - src/tests/deposit_permission_edate_backend.sample Diff File
mod - src/tests/merchant.conf Diff File
mod - src/tests/test_contract.c Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 107 108 109 110 111 112 113 ... 120 ... 127 128 129  Next  Last