Changesets: merchant

Search Browse Back to Index

master 6c15480a

2016-02-19 03:18

Florian Dold


Details Diff		 larger transaction IDs
mod - src/frontend/generate_taler_contract.php Diff File

master 80ef0b79

2016-02-18 22:35

Christian Grothoff


Details Diff		 corrections
mod - src/frontend_blog/index.html Diff File

master 9d522079

2016-02-18 22:34

Christian Grothoff


Details Diff		 remove dups
rm - src/frontend_blog/articles/scrap1_44.html Diff File
rm - src/frontend_blog/articles/scrap1_45.html Diff File
mod - src/frontend_blog/index.html Diff File

master fea4b0b8

2016-02-18 22:30

Christian Grothoff


Details Diff		 fix chapter 15
rm - src/frontend_blog/articles/scrap1.html Diff File
mod - src/frontend_blog/articles/scrap1_15.html Diff File
mod - src/frontend_blog/index.html Diff File

master 8b23123f

2016-02-18 22:19

Christian Grothoff


Details Diff		 fix more issues'
mod - src/frontend_blog/articles/scrap1.html Diff File
mod - src/frontend_blog/articles/scrap1_4.html Diff File
mod - src/frontend_blog/articles/scrap1_44.html Diff File
mod - src/frontend_blog/articles/scrap1_45.html Diff File
mod - src/frontend_blog/articles/scrap1_46.html Diff File
mod - src/frontend_blog/articles/scrap1_47.html Diff File
mod - src/frontend_blog/articles/scrap1_5.html Diff File
mod - src/frontend_blog/articles/scrap1_6.html Diff File
mod - src/frontend_blog/articles/scrap1_7.html Diff File
mod - src/frontend_blog/articles/scrap1_8.html Diff File
mod - src/frontend_blog/articles/scrap1_9.html Diff File
mod - src/frontend_blog/articles/scrap1_U.0.html Diff File
mod - src/frontend_blog/articles/scrap1_U.1.html Diff File
rm - src/frontend_blog/articles/scrap1_U.2.html Diff File
rm - src/frontend_blog/articles/scrap1_U.3.html Diff File
rm - src/frontend_blog/articles/scrap1_U.4.html Diff File
rm - src/frontend_blog/articles/scrap1_fot.html Diff File
rm - src/frontend_blog/articles/scrap1_ovr.html Diff File
rm - src/frontend_blog/articles/scrap1_top.html Diff File

master 5105944d

2016-02-18 22:01

Christian Grothoff


Details Diff		 misc corrections
mod - src/frontend_blog/articles/scrap1_1.html Diff File
mod - src/frontend_blog/articles/scrap1_11.html Diff File
mod - src/frontend_blog/articles/scrap1_12.html Diff File
mod - src/frontend_blog/articles/scrap1_13.html Diff File
mod - src/frontend_blog/articles/scrap1_14.html Diff File
mod - src/frontend_blog/articles/scrap1_16.html Diff File
mod - src/frontend_blog/articles/scrap1_17.html Diff File
mod - src/frontend_blog/articles/scrap1_18.html Diff File
mod - src/frontend_blog/articles/scrap1_19.html Diff File
mod - src/frontend_blog/articles/scrap1_2.html Diff File
mod - src/frontend_blog/articles/scrap1_20.html Diff File
mod - src/frontend_blog/articles/scrap1_21.html Diff File
mod - src/frontend_blog/articles/scrap1_22.html Diff File
mod - src/frontend_blog/articles/scrap1_23.html Diff File
mod - src/frontend_blog/articles/scrap1_24.html Diff File
mod - src/frontend_blog/articles/scrap1_25.html Diff File
mod - src/frontend_blog/articles/scrap1_26.html Diff File
mod - src/frontend_blog/articles/scrap1_27.html Diff File
mod - src/frontend_blog/articles/scrap1_28.html Diff File
mod - src/frontend_blog/articles/scrap1_29.html Diff File
mod - src/frontend_blog/articles/scrap1_3.html Diff File
mod - src/frontend_blog/articles/scrap1_30.html Diff File
mod - src/frontend_blog/articles/scrap1_31.html Diff File
mod - src/frontend_blog/articles/scrap1_32.html Diff File
mod - src/frontend_blog/articles/scrap1_33.html Diff File
mod - src/frontend_blog/articles/scrap1_34.html Diff File
mod - src/frontend_blog/articles/scrap1_35.html Diff File
mod - src/frontend_blog/articles/scrap1_36.html Diff File
mod - src/frontend_blog/articles/scrap1_37.html Diff File
mod - src/frontend_blog/articles/scrap1_38.html Diff File
mod - src/frontend_blog/articles/scrap1_39.html Diff File
mod - src/frontend_blog/articles/scrap1_40.html Diff File
mod - src/frontend_blog/articles/scrap1_41.html Diff File
mod - src/frontend_blog/articles/scrap1_42.html Diff File
mod - src/frontend_blog/articles/scrap1_43.html Diff File
mod - src/frontend_blog/articles/scrap1_44.html Diff File
rm - src/frontend_blog/articles/scrap1_48.html Diff File

master e0dd53c3

2016-02-18 21:43

Christian Grothoff


Details Diff		 images
add - src/frontend_blog/articles/arabic.jpg Diff File
add - src/frontend_blog/articles/belarusian.jpg Diff File
add - src/frontend_blog/articles/bulgarian.jpg Diff File
add - src/frontend_blog/articles/category.jpg Diff File
add - src/frontend_blog/articles/chinese-simplified.jpg Diff File
add - src/frontend_blog/articles/chinese-traditional.jpg Diff File
add - src/frontend_blog/articles/code.jpg Diff File
add - src/frontend_blog/articles/farsi.jpg Diff File
rm - src/frontend_blog/articles/fs-essay.html Diff File
add - src/frontend_blog/articles/greek.jpg Diff File
add - src/frontend_blog/articles/japanese-kana.jpg Diff File
add - src/frontend_blog/articles/japanese-kanji.jpg Diff File
add - src/frontend_blog/articles/korean.jpg Diff File
add - src/frontend_blog/articles/russian.jpg Diff File
mod - src/frontend_blog/articles/scrap1_10.html Diff File
add - src/frontend_blog/articles/serbian-croatian.jpg Diff File
add - src/frontend_blog/articles/song-book-jutta-scrunch-crop.jpg Diff File
add - src/frontend_blog/articles/tamil.jpg Diff File
add - src/frontend_blog/articles/ukrainian.jpg Diff File

master d9747bb3

2016-02-18 19:26

Marcello Stanisci


Details Diff		 Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - src/frontend_blog/articles/fs-essay.html Diff File
add - src/frontend_blog/articles/scrap1.html Diff File
add - src/frontend_blog/articles/scrap1_1.html Diff File
add - src/frontend_blog/articles/scrap1_10.html Diff File
add - src/frontend_blog/articles/scrap1_11.html Diff File
add - src/frontend_blog/articles/scrap1_12.html Diff File
add - src/frontend_blog/articles/scrap1_13.html Diff File
add - src/frontend_blog/articles/scrap1_14.html Diff File
add - src/frontend_blog/articles/scrap1_15.html Diff File
add - src/frontend_blog/articles/scrap1_16.html Diff File
add - src/frontend_blog/articles/scrap1_17.html Diff File
add - src/frontend_blog/articles/scrap1_18.html Diff File
add - src/frontend_blog/articles/scrap1_19.html Diff File
add - src/frontend_blog/articles/scrap1_2.html Diff File
add - src/frontend_blog/articles/scrap1_20.html Diff File
add - src/frontend_blog/articles/scrap1_21.html Diff File
add - src/frontend_blog/articles/scrap1_22.html Diff File
add - src/frontend_blog/articles/scrap1_23.html Diff File
add - src/frontend_blog/articles/scrap1_24.html Diff File
add - src/frontend_blog/articles/scrap1_25.html Diff File
add - src/frontend_blog/articles/scrap1_26.html Diff File
add - src/frontend_blog/articles/scrap1_27.html Diff File
add - src/frontend_blog/articles/scrap1_28.html Diff File
add - src/frontend_blog/articles/scrap1_29.html Diff File
add - src/frontend_blog/articles/scrap1_3.html Diff File
add - src/frontend_blog/articles/scrap1_30.html Diff File
add - src/frontend_blog/articles/scrap1_31.html Diff File
add - src/frontend_blog/articles/scrap1_32.html Diff File
add - src/frontend_blog/articles/scrap1_33.html Diff File
add - src/frontend_blog/articles/scrap1_34.html Diff File
add - src/frontend_blog/articles/scrap1_35.html Diff File
add - src/frontend_blog/articles/scrap1_36.html Diff File
add - src/frontend_blog/articles/scrap1_37.html Diff File
add - src/frontend_blog/articles/scrap1_38.html Diff File
add - src/frontend_blog/articles/scrap1_39.html Diff File
add - src/frontend_blog/articles/scrap1_4.html Diff File
add - src/frontend_blog/articles/scrap1_40.html Diff File
add - src/frontend_blog/articles/scrap1_41.html Diff File
add - src/frontend_blog/articles/scrap1_42.html Diff File
add - src/frontend_blog/articles/scrap1_43.html Diff File
add - src/frontend_blog/articles/scrap1_44.html Diff File
add - src/frontend_blog/articles/scrap1_45.html Diff File
add - src/frontend_blog/articles/scrap1_46.html Diff File
add - src/frontend_blog/articles/scrap1_47.html Diff File
add - src/frontend_blog/articles/scrap1_48.html Diff File
add - src/frontend_blog/articles/scrap1_5.html Diff File
add - src/frontend_blog/articles/scrap1_6.html Diff File
add - src/frontend_blog/articles/scrap1_7.html Diff File
add - src/frontend_blog/articles/scrap1_8.html Diff File
add - src/frontend_blog/articles/scrap1_9.html Diff File
add - src/frontend_blog/articles/scrap1_U.0.html Diff File
add - src/frontend_blog/articles/scrap1_U.1.html Diff File
add - src/frontend_blog/articles/scrap1_U.2.html Diff File
add - src/frontend_blog/articles/scrap1_U.3.html Diff File
add - src/frontend_blog/articles/scrap1_U.4.html Diff File
add - src/frontend_blog/articles/scrap1_fot.html Diff File
add - src/frontend_blog/articles/scrap1_ovr.html Diff File
add - src/frontend_blog/articles/scrap1_top.html Diff File
add - src/frontend_blog/gnu.svg Diff File
mod - src/frontend_blog/index.html Diff File

master 274723e3

2016-02-18 19:25

Marcello Stanisci


Details Diff		 Unifying blog's _offer and _fulfillment sources
mod - src/frontend_blog/articles/fs-essay.html Diff File
mod - src/frontend_blog/essay_cc-fulfillment.php Diff File
mod - src/frontend_blog/essay_cc-payment.html 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_lib/merchants.php Diff File
mod - src/frontend_lib/util.php Diff File

master e97c56fd

2016-02-18 16:02

Christian Grothoff


Details Diff		 formatting, copyright notice
mod - src/frontend_blog/index.html Diff File

master 6da7f998

2016-02-18 15:58

Christian Grothoff


Details Diff		 fix charset
mod - src/frontend_blog/index.html Diff File

master bfc8556e

2016-02-18 15:52

Christian Grothoff


Details Diff		 adding teasers
mod - src/frontend_blog/index.html Diff File

master 211c8eb5

2016-02-18 15:19

Christian Grothoff


Details Diff		 import FSFS
mod - src/frontend_blog/articles/fs-essay.html Diff File
add - src/frontend_blog/articles/scrap1.html Diff File
add - src/frontend_blog/articles/scrap1_1.html Diff File
add - src/frontend_blog/articles/scrap1_10.html Diff File
add - src/frontend_blog/articles/scrap1_11.html Diff File
add - src/frontend_blog/articles/scrap1_12.html Diff File
add - src/frontend_blog/articles/scrap1_13.html Diff File
add - src/frontend_blog/articles/scrap1_14.html Diff File
add - src/frontend_blog/articles/scrap1_15.html Diff File
add - src/frontend_blog/articles/scrap1_16.html Diff File
add - src/frontend_blog/articles/scrap1_17.html Diff File
add - src/frontend_blog/articles/scrap1_18.html Diff File
add - src/frontend_blog/articles/scrap1_19.html Diff File
add - src/frontend_blog/articles/scrap1_2.html Diff File
add - src/frontend_blog/articles/scrap1_20.html Diff File
add - src/frontend_blog/articles/scrap1_21.html Diff File
add - src/frontend_blog/articles/scrap1_22.html Diff File
add - src/frontend_blog/articles/scrap1_23.html Diff File
add - src/frontend_blog/articles/scrap1_24.html Diff File
add - src/frontend_blog/articles/scrap1_25.html Diff File
add - src/frontend_blog/articles/scrap1_26.html Diff File
add - src/frontend_blog/articles/scrap1_27.html Diff File
add - src/frontend_blog/articles/scrap1_28.html Diff File
add - src/frontend_blog/articles/scrap1_29.html Diff File
add - src/frontend_blog/articles/scrap1_3.html Diff File
add - src/frontend_blog/articles/scrap1_30.html Diff File
add - src/frontend_blog/articles/scrap1_31.html Diff File
add - src/frontend_blog/articles/scrap1_32.html Diff File
add - src/frontend_blog/articles/scrap1_33.html Diff File
add - src/frontend_blog/articles/scrap1_34.html Diff File
add - src/frontend_blog/articles/scrap1_35.html Diff File
add - src/frontend_blog/articles/scrap1_36.html Diff File
add - src/frontend_blog/articles/scrap1_37.html Diff File
add - src/frontend_blog/articles/scrap1_38.html Diff File
add - src/frontend_blog/articles/scrap1_39.html Diff File
add - src/frontend_blog/articles/scrap1_4.html Diff File
add - src/frontend_blog/articles/scrap1_40.html Diff File
add - src/frontend_blog/articles/scrap1_41.html Diff File
add - src/frontend_blog/articles/scrap1_42.html Diff File
add - src/frontend_blog/articles/scrap1_43.html Diff File
add - src/frontend_blog/articles/scrap1_44.html Diff File
add - src/frontend_blog/articles/scrap1_45.html Diff File
add - src/frontend_blog/articles/scrap1_46.html Diff File
add - src/frontend_blog/articles/scrap1_47.html Diff File
add - src/frontend_blog/articles/scrap1_48.html Diff File
add - src/frontend_blog/articles/scrap1_5.html Diff File
add - src/frontend_blog/articles/scrap1_6.html Diff File
add - src/frontend_blog/articles/scrap1_7.html Diff File
add - src/frontend_blog/articles/scrap1_8.html Diff File
add - src/frontend_blog/articles/scrap1_9.html Diff File
add - src/frontend_blog/articles/scrap1_U.0.html Diff File
add - src/frontend_blog/articles/scrap1_U.1.html Diff File
add - src/frontend_blog/articles/scrap1_U.2.html Diff File
add - src/frontend_blog/articles/scrap1_U.3.html Diff File
add - src/frontend_blog/articles/scrap1_U.4.html Diff File
add - src/frontend_blog/articles/scrap1_fot.html Diff File
add - src/frontend_blog/articles/scrap1_ovr.html Diff File
add - src/frontend_blog/articles/scrap1_top.html Diff File
add - src/frontend_blog/gnu.svg Diff File

master f1e49844

2016-02-18 14:38

Marcello Stanisci


Details Diff		 removing unnecessary CSS from ffillment (blog) page
mod - src/frontend_blog/essay_fulfillment.php Diff File
mod - src/frontend_lib/config.php Diff File

master e4ccb082

2016-02-18 12:12

Marcello Stanisci


Details Diff		 aligning final article style with blog's
mod - src/backend/merchant.conf Diff File
mod - src/frontend_blog/articles/fs-essay.html Diff File
mod - src/frontend_lib/config.php Diff File

master bf3a16e2

2016-02-17 19:57

Marcello Stanisci


Details Diff		 typo
mod - src/frontend_blog/index.html Diff File

master f4f8f026

2016-02-17 19:40

Marcello Stanisci


Details Diff		 cleaning up the blog to match http://api.taler.net/example-essay-store.html
mod - src/frontend_blog/blog_lib.php Diff File
mod - src/frontend_blog/essay_cc-fulfillment.php Diff File
mod - src/frontend_blog/essay_cc-payment.html Diff File
rm - src/frontend_blog/essay_checkout.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_offer.php Diff File
mod - src/frontend_blog/essay_pay.php Diff File
mod - src/frontend_lib/config.php Diff File
mod - src/frontend_lib/merchants.php Diff File
mod - src/frontend_lib/util.php Diff File

master ba7df21d

2016-02-17 15:11

Florian Dold


Details Diff		 simplify contract, use nicer name
mod - src/frontend/generate_taler_contract.php Diff File

master 0d500cb4

2016-02-17 04:20

Florian Dold


Details Diff		 better error handling for hash-contract, again
mod - src/backend/taler-merchant-httpd_contract.c Diff File
mod - src/backend/taler-merchant-httpd_util.c Diff File

master 47993fae

2016-02-17 04:18

Florian Dold


Details Diff		 better error handling for hash-contract
mod - src/backend/taler-merchant-httpd_util.c Diff File

master 75a01337

2016-02-17 04:05

Florian Dold


Details Diff		 fix 0004174 Affected Issues
0004174
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_pay.c Diff File
mod - src/backend/taler-merchant-httpd_util.c Diff File

master 496f3dab

2016-02-16 23:27

Marcello Stanisci


Details Diff		 fixing the offering URL in blog
mod - src/frontend_blog/essay_fulfillment.php Diff File

master 568d83e1

2016-02-16 22:57

Marcello Stanisci


Details Diff		 minor
mod - src/frontend_blog/essay_contract.php Diff File
mod - src/frontend_blog/essay_pay.php Diff File

master b798cbda

2016-02-16 22:24

Marcello Stanisci


Details Diff		 changing 'let' to 'var' in frontends JS
mod - src/backend/merchant.conf Diff File
mod - src/frontend/index.php Diff File
mod - src/frontend_blog/essay_contract.php Diff File
mod - src/frontend_lib/config.php Diff File

master aee31d8c

2016-02-16 21:33

Marcello Stanisci


Details Diff		 adding /hash-contract feature
mod - src/backend/Makefile.am Diff File
mod - src/backend/taler-merchant-httpd.c Diff File
add - src/backend/taler-merchant-httpd_util.c Diff File
add - src/backend/taler-merchant-httpd_util.h Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 109 110 111 112 113 114 115 ... 120 ... 127 128 129  Next  Last