Changesets: merchant

Search Browse Back to Index

master e7c27f05

2016-03-15 19:28

Christian Grothoff


Details Diff		 include xgpl licenses
mod - Makefile.am Diff File
mod - examples/shop/web-common Diff File

master 68f9a48d

2016-03-15 19:27

Christian Grothoff


Details Diff		 Merge branch 'master' of ssh://taler.net/var/git/merchant
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/shop/web-common Diff File
mod - src/backenddb/merchantdb_plugin.c Diff File
add - src/backenddb/test_backenddb.c Diff File

master f43c3d2b

2016-03-15 19:27

Christian Grothoff


Details Diff		 missingfiles
add - examples/blog/Makefile.am Diff File
mod - examples/blog/web-common Diff File
add - examples/shop/Makefile.am Diff File

master cdf0f87f

2016-03-15 18:27

Marcello Stanisci


Details Diff		 adding stubs for backenddb testcases
mod - src/backenddb/merchantdb_plugin.c Diff File
add - src/backenddb/test_backenddb.c Diff File

master 7ac81ca8

2016-03-15 16:22

Marcello Stanisci


Details Diff		 Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - COPYING Diff File
add - COPYING.AGPL Diff File
add - COPYING.GPL Diff File
add - COPYING.LGPL Diff File
mod - Makefile.am Diff File
mod - configure.ac Diff File
add - examples/Makefile.am Diff File
add - examples/blog/articles/COPYING Diff File
add - examples/blog/articles/Makefile.am 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 9d76bbc9

2016-03-15 14:56

Christian Grothoff


Details Diff		 fixing build system to include examples
mod - Makefile.am Diff File
mod - configure.ac Diff File
add - examples/Makefile.am Diff File
add - examples/blog/articles/Makefile.am Diff File

master 19e9a9bc

2016-03-15 14:43

Christian Grothoff


Details Diff		 clarify licenses
mod - COPYING Diff File
add - COPYING.AGPL Diff File
add - COPYING.GPL Diff File
add - COPYING.LGPL Diff File
mod - configure.ac Diff File
add - examples/blog/articles/COPYING Diff File
mod - examples/blog/web-common Diff File
mod - examples/shop/web-common 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 f227e038

2016-03-11 12:37

Marcello Stanisci


Details Diff		 still on coexistence of navbar and h1 and clickable logo
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/web-common Diff File
mod - examples/shop/web-common Diff File

master 35cb0a1e

2016-03-11 12:00

Marcello Stanisci


Details Diff		 adding class="article" to blog's articles in order to make it
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

master 9379e65a

2016-03-10 16:34

Marcello Stanisci


Details Diff		 fixing links to style.css in web-common
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 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
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 105 106 107 108 109 110 111 ... 120 ... 125 126 127  Next  Last