merchant: master 9bc6e42b

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-02-27 17:06 master 1b46587b
Changeset Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - README Diff File
mod - copylib/config.php Diff File
mod - copylib/merchants.php Diff File
mod - copylib/taler-presence.js Diff File
mod - copylib/util.php Diff File
mod - examples/blog/articles/arabic.jpg Diff File
mod - examples/blog/articles/belarusian.jpg Diff File
mod - examples/blog/articles/bulgarian.jpg Diff File
mod - examples/blog/articles/category.jpg Diff File
mod - examples/blog/articles/chinese-simplified.jpg Diff File
mod - examples/blog/articles/chinese-traditional.jpg Diff File
mod - examples/blog/articles/code.jpg Diff File
mod - examples/blog/articles/farsi.jpg Diff File
mod - examples/blog/articles/greek.jpg Diff File
mod - examples/blog/articles/japanese-kana.jpg Diff File
mod - examples/blog/articles/japanese-kanji.jpg Diff File
mod - examples/blog/articles/korean.jpg Diff File
mod - examples/blog/articles/russian.jpg Diff File
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
add - examples/blog/articles/scrap1_U.0.html Diff File
mod - examples/blog/articles/scrap1_U.1.html Diff File
mod - examples/blog/articles/serbian-croatian.jpg Diff File
mod - examples/blog/articles/song-book-jutta-scrunch-crop.jpg Diff File
mod - examples/blog/articles/tamil.jpg Diff File
mod - examples/blog/articles/ukrainian.jpg Diff File
add - examples/blog/blog_lib.php Diff File
add - examples/blog/essay_cc-form.html Diff File
add - examples/blog/essay_cc-fulfillment.php Diff File
add - examples/blog/essay_contract.php Diff File
add - examples/blog/essay_fulfillment.php Diff File
add - examples/blog/essay_pay.php Diff File
mod - examples/blog/gnu.svg Diff File
add - examples/blog/index.html Diff File
mod - examples/blog/style.css Diff File
add - examples/blog/taler-presence.js Diff File
mod - examples/shop/README 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
add - examples/shop/index.php Diff File
mod - examples/shop/pay.php Diff File
mod - examples/shop/style.css Diff File
add - examples/shop/taler-presence.js Diff File
rm - src/frontend/index.php Diff File
rm - src/frontend_blog/articles/scrap1_U.0.html Diff File
rm - src/frontend_blog/blog_lib.php Diff File
rm - src/frontend_blog/essay_cc-fulfillment.php Diff File
rm - src/frontend_blog/essay_cc-payment.html Diff File
rm - src/frontend_blog/essay_contract.php Diff File
rm - src/frontend_blog/essay_fulfillment.php Diff File
rm - src/frontend_blog/essay_offer.php Diff File
rm - src/frontend_blog/essay_pay.php Diff File
rm - src/frontend_blog/index.html Diff File