dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] f01e76: Removed unmaintaned OScommerc

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] f01e76: Removed unmaintaned OScommerce module
Date: Sun, 12 Oct 2014 15:51:16 -0700 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f01e76f686ba37dac3632d64e2266b4c0fa80bb5
      
https://github.com/Dolibarr/dolibarr/commit/f01e76f686ba37dac3632d64e2266b4c0fa80bb5
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M ChangeLog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    R htdocs/admin/osc-languages.php
    R htdocs/boutique/admin/boutique.php
    R htdocs/boutique/admin/index.html
    R htdocs/boutique/client/card.php
    R htdocs/boutique/client/class/boutiqueclient.class.php
    R htdocs/boutique/client/class/index.html
    R htdocs/boutique/client/index.php
    R htdocs/boutique/commande/ca.php
    R htdocs/boutique/commande/card.php
    R htdocs/boutique/commande/class/boutiquecommande.class.php
    R htdocs/boutique/commande/class/index.html
    R htdocs/boutique/commande/index.php
    R htdocs/boutique/critiques/bestproduct.php
    R htdocs/boutique/critiques/card.php
    R htdocs/boutique/critiques/class/critique.class.php
    R htdocs/boutique/critiques/class/index.html
    R htdocs/boutique/critiques/index.php
    R htdocs/boutique/index.php
    R htdocs/boutique/notification/index.php
    R htdocs/boutique/notification/produits.php
    R htdocs/boutique/osc_master.inc.php
    R htdocs/boutique/produits/index.php
    R htdocs/boutique/produits/osc-list.php
    R htdocs/boutique/promotion/class/index.html
    R htdocs/boutique/promotion/class/promotion.class.php
    R htdocs/boutique/promotion/index.php
    R htdocs/core/boxes/box_osc_client.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    R htdocs/core/modules/modBoutique.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/langs/ar_SA/admin.lang
    R htdocs/langs/ar_SA/shop.lang
    M htdocs/langs/bg_BG/admin.lang
    R htdocs/langs/bg_BG/shop.lang
    M htdocs/langs/bs_BA/admin.lang
    R htdocs/langs/bs_BA/shop.lang
    M htdocs/langs/ca_ES/admin.lang
    R htdocs/langs/ca_ES/shop.lang
    M htdocs/langs/cs_CZ/admin.lang
    R htdocs/langs/cs_CZ/shop.lang
    M htdocs/langs/da_DK/admin.lang
    R htdocs/langs/da_DK/shop.lang
    R htdocs/langs/de_AT/shop.lang
    M htdocs/langs/de_DE/admin.lang
    R htdocs/langs/de_DE/shop.lang
    M htdocs/langs/el_GR/admin.lang
    R htdocs/langs/el_GR/shop.lang
    M htdocs/langs/en_US/admin.lang
    R htdocs/langs/en_US/shop.lang
    M htdocs/langs/es_ES/admin.lang
    R htdocs/langs/es_ES/shop.lang
    M htdocs/langs/et_EE/admin.lang
    R htdocs/langs/et_EE/shop.lang
    M htdocs/langs/eu_ES/admin.lang
    R htdocs/langs/eu_ES/shop.lang
    M htdocs/langs/fa_IR/admin.lang
    R htdocs/langs/fa_IR/shop.lang
    M htdocs/langs/fi_FI/admin.lang
    R htdocs/langs/fi_FI/shop.lang
    M htdocs/langs/fr_FR/admin.lang
    R htdocs/langs/fr_FR/shop.lang
    M htdocs/langs/he_IL/admin.lang
    R htdocs/langs/he_IL/shop.lang
    M htdocs/langs/hr_HR/admin.lang
    R htdocs/langs/hr_HR/shop.lang
    M htdocs/langs/hu_HU/admin.lang
    R htdocs/langs/hu_HU/shop.lang
    M htdocs/langs/id_ID/admin.lang
    R htdocs/langs/id_ID/shop.lang
    M htdocs/langs/is_IS/admin.lang
    R htdocs/langs/is_IS/shop.lang
    M htdocs/langs/it_IT/admin.lang
    R htdocs/langs/it_IT/shop.lang
    M htdocs/langs/ja_JP/admin.lang
    R htdocs/langs/ja_JP/shop.lang
    M htdocs/langs/ko_KR/admin.lang
    R htdocs/langs/ko_KR/shop.lang
    M htdocs/langs/lt_LT/admin.lang
    R htdocs/langs/lt_LT/shop.lang
    M htdocs/langs/lv_LV/admin.lang
    R htdocs/langs/lv_LV/shop.lang
    M htdocs/langs/mk_MK/admin.lang
    R htdocs/langs/mk_MK/shop.lang
    M htdocs/langs/nb_NO/admin.lang
    R htdocs/langs/nb_NO/shop.lang
    R htdocs/langs/nl_BE/shop.lang
    M htdocs/langs/nl_NL/admin.lang
    R htdocs/langs/nl_NL/shop.lang
    M htdocs/langs/pl_PL/admin.lang
    R htdocs/langs/pl_PL/shop.lang
    M htdocs/langs/pt_BR/admin.lang
    R htdocs/langs/pt_BR/shop.lang
    M htdocs/langs/pt_PT/admin.lang
    R htdocs/langs/pt_PT/shop.lang
    M htdocs/langs/ro_RO/admin.lang
    R htdocs/langs/ro_RO/shop.lang
    M htdocs/langs/ru_RU/admin.lang
    R htdocs/langs/ru_RU/shop.lang
    R htdocs/langs/ru_UA/shop.lang
    M htdocs/langs/sk_SK/admin.lang
    R htdocs/langs/sk_SK/shop.lang
    M htdocs/langs/sl_SI/admin.lang
    R htdocs/langs/sl_SI/shop.lang
    M htdocs/langs/sq_AL/admin.lang
    R htdocs/langs/sq_AL/shop.lang
    M htdocs/langs/sv_SE/admin.lang
    R htdocs/langs/sv_SE/shop.lang
    M htdocs/langs/th_TH/admin.lang
    R htdocs/langs/th_TH/shop.lang
    M htdocs/langs/tr_TR/admin.lang
    R htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/uk_UA/admin.lang
    R htdocs/langs/uk_UA/shop.lang
    M htdocs/langs/uz_UZ/admin.lang
    R htdocs/langs/uz_UZ/shop.lang
    M htdocs/langs/vi_VN/admin.lang
    R htdocs/langs/vi_VN/shop.lang
    M htdocs/langs/zh_CN/admin.lang
    R htdocs/langs/zh_CN/shop.lang
    M htdocs/langs/zh_TW/admin.lang
    R htdocs/langs/zh_TW/shop.lang
    M htdocs/public/demo/index.php
    R htdocs/theme/auguria/img/menus/shop.png
    M htdocs/theme/auguria/style.css.php
    R htdocs/theme/bureau2crea/img/menus/shop.png
    M htdocs/theme/bureau2crea/style.css.php
    R htdocs/theme/cameleo/img/menus/shop.png
    M htdocs/theme/cameleo/style.css.php
    R htdocs/theme/eldy/img/menus/shop.png
    M htdocs/theme/eldy/style.css.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/phpunittest.xml

  Log Message:
  -----------
  Removed unmaintaned OScommerce module


  Commit: f49892171546ed3e8859a6c80865513cef628a51
      
https://github.com/Dolibarr/dolibarr/commit/f49892171546ed3e8859a6c80865513cef628a51
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M ChangeLog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    R htdocs/admin/osc-languages.php
    R htdocs/boutique/admin/boutique.php
    R htdocs/boutique/admin/index.html
    R htdocs/boutique/client/card.php
    R htdocs/boutique/client/class/boutiqueclient.class.php
    R htdocs/boutique/client/class/index.html
    R htdocs/boutique/client/index.php
    R htdocs/boutique/commande/ca.php
    R htdocs/boutique/commande/card.php
    R htdocs/boutique/commande/class/boutiquecommande.class.php
    R htdocs/boutique/commande/class/index.html
    R htdocs/boutique/commande/index.php
    R htdocs/boutique/critiques/bestproduct.php
    R htdocs/boutique/critiques/card.php
    R htdocs/boutique/critiques/class/critique.class.php
    R htdocs/boutique/critiques/class/index.html
    R htdocs/boutique/critiques/index.php
    R htdocs/boutique/index.php
    R htdocs/boutique/notification/index.php
    R htdocs/boutique/notification/produits.php
    R htdocs/boutique/osc_master.inc.php
    R htdocs/boutique/produits/index.php
    R htdocs/boutique/produits/osc-list.php
    R htdocs/boutique/promotion/class/index.html
    R htdocs/boutique/promotion/class/promotion.class.php
    R htdocs/boutique/promotion/index.php
    M htdocs/comm/action/card.php
    R htdocs/core/boxes/box_osc_client.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    R htdocs/core/modules/modBoutique.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/langs/ar_SA/admin.lang
    R htdocs/langs/ar_SA/shop.lang
    M htdocs/langs/bg_BG/admin.lang
    R htdocs/langs/bg_BG/shop.lang
    M htdocs/langs/bs_BA/admin.lang
    R htdocs/langs/bs_BA/shop.lang
    M htdocs/langs/ca_ES/admin.lang
    R htdocs/langs/ca_ES/shop.lang
    M htdocs/langs/cs_CZ/admin.lang
    R htdocs/langs/cs_CZ/shop.lang
    M htdocs/langs/da_DK/admin.lang
    R htdocs/langs/da_DK/shop.lang
    R htdocs/langs/de_AT/shop.lang
    M htdocs/langs/de_DE/admin.lang
    R htdocs/langs/de_DE/shop.lang
    M htdocs/langs/el_GR/admin.lang
    R htdocs/langs/el_GR/shop.lang
    M htdocs/langs/en_US/admin.lang
    R htdocs/langs/en_US/shop.lang
    M htdocs/langs/es_ES/admin.lang
    R htdocs/langs/es_ES/shop.lang
    M htdocs/langs/et_EE/admin.lang
    R htdocs/langs/et_EE/shop.lang
    M htdocs/langs/eu_ES/admin.lang
    R htdocs/langs/eu_ES/shop.lang
    M htdocs/langs/fa_IR/admin.lang
    R htdocs/langs/fa_IR/shop.lang
    M htdocs/langs/fi_FI/admin.lang
    R htdocs/langs/fi_FI/shop.lang
    M htdocs/langs/fr_FR/admin.lang
    R htdocs/langs/fr_FR/shop.lang
    M htdocs/langs/he_IL/admin.lang
    R htdocs/langs/he_IL/shop.lang
    M htdocs/langs/hr_HR/admin.lang
    R htdocs/langs/hr_HR/shop.lang
    M htdocs/langs/hu_HU/admin.lang
    R htdocs/langs/hu_HU/shop.lang
    M htdocs/langs/id_ID/admin.lang
    R htdocs/langs/id_ID/shop.lang
    M htdocs/langs/is_IS/admin.lang
    R htdocs/langs/is_IS/shop.lang
    M htdocs/langs/it_IT/admin.lang
    R htdocs/langs/it_IT/shop.lang
    M htdocs/langs/ja_JP/admin.lang
    R htdocs/langs/ja_JP/shop.lang
    M htdocs/langs/ko_KR/admin.lang
    R htdocs/langs/ko_KR/shop.lang
    M htdocs/langs/lt_LT/admin.lang
    R htdocs/langs/lt_LT/shop.lang
    M htdocs/langs/lv_LV/admin.lang
    R htdocs/langs/lv_LV/shop.lang
    M htdocs/langs/mk_MK/admin.lang
    R htdocs/langs/mk_MK/shop.lang
    M htdocs/langs/nb_NO/admin.lang
    R htdocs/langs/nb_NO/shop.lang
    R htdocs/langs/nl_BE/shop.lang
    M htdocs/langs/nl_NL/admin.lang
    R htdocs/langs/nl_NL/shop.lang
    M htdocs/langs/pl_PL/admin.lang
    R htdocs/langs/pl_PL/shop.lang
    M htdocs/langs/pt_BR/admin.lang
    R htdocs/langs/pt_BR/shop.lang
    M htdocs/langs/pt_PT/admin.lang
    R htdocs/langs/pt_PT/shop.lang
    M htdocs/langs/ro_RO/admin.lang
    R htdocs/langs/ro_RO/shop.lang
    M htdocs/langs/ru_RU/admin.lang
    R htdocs/langs/ru_RU/shop.lang
    R htdocs/langs/ru_UA/shop.lang
    M htdocs/langs/sk_SK/admin.lang
    R htdocs/langs/sk_SK/shop.lang
    M htdocs/langs/sl_SI/admin.lang
    R htdocs/langs/sl_SI/shop.lang
    M htdocs/langs/sq_AL/admin.lang
    R htdocs/langs/sq_AL/shop.lang
    M htdocs/langs/sv_SE/admin.lang
    R htdocs/langs/sv_SE/shop.lang
    M htdocs/langs/th_TH/admin.lang
    R htdocs/langs/th_TH/shop.lang
    M htdocs/langs/tr_TR/admin.lang
    R htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/uk_UA/admin.lang
    R htdocs/langs/uk_UA/shop.lang
    M htdocs/langs/uz_UZ/admin.lang
    R htdocs/langs/uz_UZ/shop.lang
    R htdocs/langs/vi_VN/shop.lang
    M htdocs/langs/zh_CN/admin.lang
    R htdocs/langs/zh_CN/shop.lang
    M htdocs/langs/zh_TW/admin.lang
    R htdocs/langs/zh_TW/shop.lang
    M htdocs/public/demo/index.php
    R htdocs/theme/auguria/img/menus/shop.png
    M htdocs/theme/auguria/style.css.php
    R htdocs/theme/bureau2crea/img/menus/shop.png
    M htdocs/theme/bureau2crea/style.css.php
    R htdocs/theme/cameleo/img/menus/shop.png
    M htdocs/theme/cameleo/style.css.php
    R htdocs/theme/eldy/img/menus/shop.png
    M htdocs/theme/eldy/style.css.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/phpunittest.xml

  Log Message:
  -----------
  Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
GPCsolutions-droposcommerce

Conflicts:
        htdocs/install/mysql/migration/3.6.0-3.7.0.sql
        htdocs/langs/vi_VN/admin.lang
        htdocs/langs/vi_VN/shop.lang


  Commit: 6d1b3c1f8319937ba91e53081ea1ce189af89d87
      
https://github.com/Dolibarr/dolibarr/commit/6d1b3c1f8319937ba91e53081ea1ce189af89d87
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M ChangeLog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    R htdocs/admin/osc-languages.php
    R htdocs/boutique/admin/boutique.php
    R htdocs/boutique/admin/index.html
    R htdocs/boutique/client/card.php
    R htdocs/boutique/client/class/boutiqueclient.class.php
    R htdocs/boutique/client/class/index.html
    R htdocs/boutique/client/index.php
    R htdocs/boutique/commande/ca.php
    R htdocs/boutique/commande/card.php
    R htdocs/boutique/commande/class/boutiquecommande.class.php
    R htdocs/boutique/commande/class/index.html
    R htdocs/boutique/commande/index.php
    R htdocs/boutique/critiques/bestproduct.php
    R htdocs/boutique/critiques/card.php
    R htdocs/boutique/critiques/class/critique.class.php
    R htdocs/boutique/critiques/class/index.html
    R htdocs/boutique/critiques/index.php
    R htdocs/boutique/index.php
    R htdocs/boutique/notification/index.php
    R htdocs/boutique/notification/produits.php
    R htdocs/boutique/osc_master.inc.php
    R htdocs/boutique/produits/index.php
    R htdocs/boutique/produits/osc-list.php
    R htdocs/boutique/promotion/class/index.html
    R htdocs/boutique/promotion/class/promotion.class.php
    R htdocs/boutique/promotion/index.php
    M htdocs/comm/action/card.php
    R htdocs/core/boxes/box_osc_client.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    R htdocs/core/modules/modBoutique.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/langs/ar_SA/admin.lang
    R htdocs/langs/ar_SA/shop.lang
    M htdocs/langs/bg_BG/admin.lang
    R htdocs/langs/bg_BG/shop.lang
    M htdocs/langs/bs_BA/admin.lang
    R htdocs/langs/bs_BA/shop.lang
    M htdocs/langs/ca_ES/admin.lang
    R htdocs/langs/ca_ES/shop.lang
    M htdocs/langs/cs_CZ/admin.lang
    R htdocs/langs/cs_CZ/shop.lang
    M htdocs/langs/da_DK/admin.lang
    R htdocs/langs/da_DK/shop.lang
    R htdocs/langs/de_AT/shop.lang
    M htdocs/langs/de_DE/admin.lang
    R htdocs/langs/de_DE/shop.lang
    M htdocs/langs/el_GR/admin.lang
    R htdocs/langs/el_GR/shop.lang
    M htdocs/langs/en_US/admin.lang
    R htdocs/langs/en_US/shop.lang
    M htdocs/langs/es_ES/admin.lang
    R htdocs/langs/es_ES/shop.lang
    M htdocs/langs/et_EE/admin.lang
    R htdocs/langs/et_EE/shop.lang
    M htdocs/langs/eu_ES/admin.lang
    R htdocs/langs/eu_ES/shop.lang
    M htdocs/langs/fa_IR/admin.lang
    R htdocs/langs/fa_IR/shop.lang
    M htdocs/langs/fi_FI/admin.lang
    R htdocs/langs/fi_FI/shop.lang
    M htdocs/langs/fr_FR/admin.lang
    R htdocs/langs/fr_FR/shop.lang
    M htdocs/langs/he_IL/admin.lang
    R htdocs/langs/he_IL/shop.lang
    M htdocs/langs/hr_HR/admin.lang
    R htdocs/langs/hr_HR/shop.lang
    M htdocs/langs/hu_HU/admin.lang
    R htdocs/langs/hu_HU/shop.lang
    M htdocs/langs/id_ID/admin.lang
    R htdocs/langs/id_ID/shop.lang
    M htdocs/langs/is_IS/admin.lang
    R htdocs/langs/is_IS/shop.lang
    M htdocs/langs/it_IT/admin.lang
    R htdocs/langs/it_IT/shop.lang
    M htdocs/langs/ja_JP/admin.lang
    R htdocs/langs/ja_JP/shop.lang
    M htdocs/langs/ko_KR/admin.lang
    R htdocs/langs/ko_KR/shop.lang
    M htdocs/langs/lt_LT/admin.lang
    R htdocs/langs/lt_LT/shop.lang
    M htdocs/langs/lv_LV/admin.lang
    R htdocs/langs/lv_LV/shop.lang
    M htdocs/langs/mk_MK/admin.lang
    R htdocs/langs/mk_MK/shop.lang
    M htdocs/langs/nb_NO/admin.lang
    R htdocs/langs/nb_NO/shop.lang
    R htdocs/langs/nl_BE/shop.lang
    M htdocs/langs/nl_NL/admin.lang
    R htdocs/langs/nl_NL/shop.lang
    M htdocs/langs/pl_PL/admin.lang
    R htdocs/langs/pl_PL/shop.lang
    M htdocs/langs/pt_BR/admin.lang
    R htdocs/langs/pt_BR/shop.lang
    M htdocs/langs/pt_PT/admin.lang
    R htdocs/langs/pt_PT/shop.lang
    M htdocs/langs/ro_RO/admin.lang
    R htdocs/langs/ro_RO/shop.lang
    M htdocs/langs/ru_RU/admin.lang
    R htdocs/langs/ru_RU/shop.lang
    R htdocs/langs/ru_UA/shop.lang
    M htdocs/langs/sk_SK/admin.lang
    R htdocs/langs/sk_SK/shop.lang
    M htdocs/langs/sl_SI/admin.lang
    R htdocs/langs/sl_SI/shop.lang
    M htdocs/langs/sq_AL/admin.lang
    R htdocs/langs/sq_AL/shop.lang
    M htdocs/langs/sv_SE/admin.lang
    R htdocs/langs/sv_SE/shop.lang
    M htdocs/langs/th_TH/admin.lang
    R htdocs/langs/th_TH/shop.lang
    M htdocs/langs/tr_TR/admin.lang
    R htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/uk_UA/admin.lang
    R htdocs/langs/uk_UA/shop.lang
    M htdocs/langs/uz_UZ/admin.lang
    R htdocs/langs/uz_UZ/shop.lang
    R htdocs/langs/vi_VN/shop.lang
    M htdocs/langs/zh_CN/admin.lang
    R htdocs/langs/zh_CN/shop.lang
    M htdocs/langs/zh_TW/admin.lang
    R htdocs/langs/zh_TW/shop.lang
    M htdocs/public/demo/index.php
    R htdocs/theme/auguria/img/menus/shop.png
    M htdocs/theme/auguria/style.css.php
    R htdocs/theme/bureau2crea/img/menus/shop.png
    M htdocs/theme/bureau2crea/style.css.php
    R htdocs/theme/cameleo/img/menus/shop.png
    M htdocs/theme/cameleo/style.css.php
    R htdocs/theme/eldy/img/menus/shop.png
    M htdocs/theme/eldy/style.css.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/phpunittest.xml

  Log Message:
  -----------
  Merge branch 'GPCsolutions-droposcommerce' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/86d25146cc49...6d1b3c1f8319
reply via email to
[Prev in Thread] Current Thread [Next in Thread]