[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 71dafa: Add favorite button into coun
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 71dafa: Add favorite button into country dictionary to put... |
|
Date: |
Sat, 18 Oct 2014 06:46:16 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 71dafac03ce6fa79366a9f04d0b7f6b3c7add23c
https://github.com/Dolibarr/dolibarr/commit/71dafac03ce6fa79366a9f04d0b7f6b3c7add23c
Author: aspangaro <address@hidden>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
M htdocs/core/class/html.form.class.php
M htdocs/install/mysql/data/llx_00_c_country.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_c_country.sql
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Add favorite button into country dictionary to put value on top select list
Commit: dad9a54959a8bbe44dbdb02351f218ac9823f5cf
https://github.com/Dolibarr/dolibarr/commit/dad9a54959a8bbe44dbdb02351f218ac9823f5cf
Author: aspangaro <address@hidden>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/company.lib.php
M htdocs/langs/en_US/main.lang
M htdocs/societe/soc.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
Commit: dc6817813e82f0029a45d6b68230bbc5588274d3
https://github.com/Dolibarr/dolibarr/commit/dc6817813e82f0029a45d6b68230bbc5588274d3
Author: aspangaro <address@hidden>
Date: 2014-10-12 (Sun, 12 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
A htdocs/install/mysql/tables/llx_c_email_template.key.sql
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
Commit: 861583bb77330e2f9fd11ee397a8cef6096f628a
https://github.com/Dolibarr/dolibarr/commit/861583bb77330e2f9fd11ee397a8cef6096f628a
Author: aspangaro <address@hidden>
Date: 2014-10-14 (Tue, 14 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
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/peruser.php
M htdocs/comm/propal.php
M htdocs/compta/facture.php
R htdocs/core/boxes/box_osc_client.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
R htdocs/core/modules/modBoutique.class.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
R htdocs/install/mysql/tables/llx_c_email_template.key.sql
R htdocs/install/mysql/tables/llx_c_email_template.sql
A htdocs/install/mysql/tables/llx_c_email_templates.key.sql
A htdocs/install/mysql/tables/llx_c_email_templates.sql
M htdocs/install/pgsql/functions/functions.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
M htdocs/theme/amarok/style.css.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 remote-tracking branch 'Upstream/develop' into develop-favorite
Commit: 9f6a460d42b4979b1aa26c7c04203c5e275deeb7
https://github.com/Dolibarr/dolibarr/commit/9f6a460d42b4979b1aa26c7c04203c5e275deeb7
Author: aspangaro <address@hidden>
Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths:
M .tx/config
M ChangeLog
M dev/fixperms.sh
M htdocs/adherents/index.php
M htdocs/admin/dict.php
M htdocs/categories/index.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/peruser.php
M htdocs/comm/propal/apercu.php
M htdocs/commande/apercu.php
M htdocs/commande/card.php
M htdocs/compta/bank/index.php
M htdocs/compta/facture/apercu.php
M htdocs/contact/card.php
A htdocs/core/ajax/productonoff.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/fichinter/apercu.php
M htdocs/fichinter/list.php
M htdocs/holiday/admin/tomergewithholiday.php
M htdocs/holiday/tomergewithdefine_holiday.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_c_email_templates.key.sql
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/commercial.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/contracts.lang
M htdocs/langs/en_US/donations.lang
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/propal.lang
M htdocs/langs/en_US/resource.lang
M htdocs/langs/en_US/suppliers.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/es_ES/main.lang
M htdocs/product/card.php
M htdocs/product/index.php
M htdocs/projet/tasks/time.php
M htdocs/resource/add.php
M htdocs/resource/card.php
M htdocs/societe/consumption.php
M htdocs/societe/index.php
M htdocs/societe/soc.php
M htdocs/societe/societecontact.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/agenda_extsites.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/webservices/server_order.php
M scripts/accountancy/export-thirdpartyaccount.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
Resolve conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Commit: e53c3287676a6950b7508889663586bd36958512
https://github.com/Dolibarr/dolibarr/commit/e53c3287676a6950b7508889663586bd36958512
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
M htdocs/core/class/html.form.class.php
M htdocs/install/mysql/data/llx_00_c_country.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_c_country.sql
M htdocs/install/mysql/tables/llx_extrafields.sql
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
aspangaro-develop-favorite
Conflicts:
ChangeLog
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Commit: 2466a55193ff8bf9713475687a072e7c74aafa1a
https://github.com/Dolibarr/dolibarr/commit/2466a55193ff8bf9713475687a072e7c74aafa1a
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
M htdocs/core/class/html.form.class.php
M htdocs/install/mysql/data/llx_00_c_country.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_c_country.sql
M htdocs/install/mysql/tables/llx_extrafields.sql
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge branch 'aspangaro-develop-favorite' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/331e047c6d45...2466a55193ff
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 71dafa: Add favorite button into country dictionary to put...,
Laurent Destailleur <=