[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 4e1f9b: Merge
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 4e1f9b: Merge |
|
Date: |
Thu, 27 Nov 2014 14:58:45 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 4e1f9babaf4e8f823824371f67f9cb6b2dab5185
https://github.com/Dolibarr/dolibarr/commit/4e1f9babaf4e8f823824371f67f9cb6b2dab5185
Author: aspangaro <address@hidden>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Merge
Commit: b4c0e39b6d409b5478516309e5dda902f5a713d2
https://github.com/Dolibarr/dolibarr/commit/b4c0e39b6d409b5478516309e5dda902f5a713d2
Author: aspangaro <address@hidden>
Date: 2014-11-12 (Wed, 12 Nov 2014)
Changed paths:
M .travis.yml
M COPYRIGHT
M ChangeLog
M build/makepack-dolibarr.pl
M dev/codesniffer/ruleset.xml
M dev/skeletons/skeleton_class.class.php
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/cashjournal.php
M htdocs/accountancy/journal/index.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/index.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/security.php
M htdocs/comm/action/document.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/peruser.php
M htdocs/comm/propal.php
M htdocs/comm/propal/list.php
M htdocs/comm/prospect/list.php
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/compta/bank/search.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/dons/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/list.php
R htdocs/compta/prelevement/bon.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/resultat/index.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/index.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/antispamimage.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/js/lib_head.js
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/core/modules/modAccounting.class.php
A htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/fichinter/admin/fichinter_extrafields.php
M htdocs/fichinter/list.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/list.php
M htdocs/holiday/index.php
A htdocs/includes/jquery/plugins/multiple-select/LICENSE
A htdocs/includes/jquery/plugins/multiple-select/README.md
A htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js
A htdocs/includes/jquery/plugins/multiple-select/multiple-select.css
A htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json
A htdocs/includes/jquery/plugins/multiple-select/multiple-select.png
R htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
R htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
R htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
M htdocs/includes/odtphp/odf.php
M htdocs/install/mssql/functions/functions.sql
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_notify.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/install/upgrade.php
M htdocs/install/upgrade2.php
M htdocs/langs/ar_SA/install.lang
M htdocs/langs/ar_SA/projects.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/margins.lang
M htdocs/langs/en_US/resource.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/en_US/withdrawals.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/agenda.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/boxes.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/deliveries.lang
M htdocs/langs/es_ES/donations.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/es_ES/interventions.lang
M htdocs/langs/es_ES/mails.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/members.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/langs/es_ES/propal.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/es_ES/withdrawals.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/agenda.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/commercial.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/deliveries.lang
M htdocs/langs/fr_FR/donations.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/fr_FR/interventions.lang
M htdocs/langs/fr_FR/mails.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/margins.lang
M htdocs/langs/fr_FR/members.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/fr_FR/propal.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/langs/fr_FR/sendings.lang
M htdocs/langs/fr_FR/suppliers.lang
M htdocs/langs/fr_FR/users.lang
M htdocs/langs/id_ID/link.lang
M htdocs/langs/id_ID/salaries.lang
M htdocs/langs/sv_SE/accountancy.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/agenda.lang
M htdocs/langs/sv_SE/banks.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/sv_SE/boxes.lang
M htdocs/langs/sv_SE/cashdesk.lang
M htdocs/langs/sv_SE/categories.lang
M htdocs/langs/sv_SE/commercial.lang
M htdocs/langs/sv_SE/companies.lang
M htdocs/langs/sv_SE/contracts.lang
M htdocs/langs/sv_SE/cron.lang
M htdocs/langs/sv_SE/deliveries.lang
M htdocs/langs/sv_SE/dict.lang
M htdocs/langs/sv_SE/donations.lang
M htdocs/langs/sv_SE/ecm.lang
M htdocs/langs/sv_SE/errors.lang
M htdocs/langs/sv_SE/externalsite.lang
M htdocs/langs/sv_SE/ftp.lang
M htdocs/langs/sv_SE/help.lang
M htdocs/langs/sv_SE/holiday.lang
M htdocs/langs/sv_SE/languages.lang
M htdocs/langs/sv_SE/link.lang
M htdocs/langs/sv_SE/mailmanspip.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/sv_SE/members.lang
M htdocs/langs/sv_SE/opensurvey.lang
M htdocs/langs/sv_SE/orders.lang
M htdocs/langs/sv_SE/other.lang
M htdocs/langs/sv_SE/paypal.lang
M htdocs/langs/sv_SE/propal.lang
M htdocs/langs/sv_SE/salaries.lang
M htdocs/langs/sv_SE/sendings.lang
M htdocs/langs/sv_SE/stocks.lang
M htdocs/langs/sv_SE/users.lang
M htdocs/langs/tr_TR/accountancy.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/banks.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/langs/tr_TR/boxes.lang
M htdocs/langs/tr_TR/categories.lang
M htdocs/langs/tr_TR/commercial.lang
M htdocs/langs/tr_TR/companies.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/tr_TR/contracts.lang
M htdocs/langs/tr_TR/cron.lang
M htdocs/langs/tr_TR/dict.lang
M htdocs/langs/tr_TR/donations.lang
M htdocs/langs/tr_TR/errors.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/help.lang
M htdocs/langs/tr_TR/holiday.lang
M htdocs/langs/tr_TR/mails.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/margins.lang
M htdocs/langs/tr_TR/orders.lang
M htdocs/langs/tr_TR/products.lang
M htdocs/langs/tr_TR/projects.lang
M htdocs/langs/tr_TR/sendings.lang
M htdocs/langs/tr_TR/stocks.lang
M htdocs/langs/tr_TR/suppliers.lang
M htdocs/langs/tr_TR/users.lang
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/projet/class/task.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/notify/card.php
M htdocs/societe/soc.php
M htdocs/theme/.gitignore
A htdocs/theme/eldy/.gitignore
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/webservices/server_thirdparty.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop-admin
Commit: c80bc52f5ce0e0b7d099bc1006eec98136022a73
https://github.com/Dolibarr/dolibarr/commit/c80bc52f5ce0e0b7d099bc1006eec98136022a73
Author: aspangaro <address@hidden>
Date: 2014-11-23 (Sun, 23 Nov 2014)
Changed paths:
M .scrutinizer.yml
M COPYRIGHT
M ChangeLog
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
M dev/skeletons/skeleton_class.class.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/dict.php
M htdocs/admin/dons.php
M htdocs/admin/events.php
M htdocs/admin/ihm.php
M htdocs/admin/menus.php
M htdocs/admin/menus/index.php
M htdocs/admin/proxy.php
M htdocs/admin/salaries.php
M htdocs/admin/security_other.php
M htdocs/admin/syslog.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/photos.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/peruser.php
M htdocs/comm/list.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/class/paymentterm.class.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_comptes.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/ccountry.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/ctypent.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formcontract.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/db/Database.interface.php
M htdocs/core/db/DoliDB.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/login/functions_dolibarr.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/list.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/fichinter/apercu.php
M htdocs/fichinter/list.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
R htdocs/includes/jquery/plugins/multiple-select/LICENSE
R htdocs/includes/jquery/plugins/multiple-select/README.md
R htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js
R htdocs/includes/jquery/plugins/multiple-select/multiple-select.css
R htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json
R htdocs/includes/jquery/plugins/multiple-select/multiple-select.png
A htdocs/includes/jquery/plugins/select2/.gitignore
A htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md
A htdocs/includes/jquery/plugins/select2/LICENSE
A htdocs/includes/jquery/plugins/select2/README.md
A htdocs/includes/jquery/plugins/select2/bower.json
A htdocs/includes/jquery/plugins/select2/component.json
A htdocs/includes/jquery/plugins/select2/composer.json
A htdocs/includes/jquery/plugins/select2/package.json
A htdocs/includes/jquery/plugins/select2/release.sh
A htdocs/includes/jquery/plugins/select2/select2-bootstrap.css
A htdocs/includes/jquery/plugins/select2/select2-spinner.gif
A htdocs/includes/jquery/plugins/select2/select2.css
A htdocs/includes/jquery/plugins/select2/select2.jquery.json
A htdocs/includes/jquery/plugins/select2/select2.js
A htdocs/includes/jquery/plugins/select2/select2.min.js
A htdocs/includes/jquery/plugins/select2/select2.png
A htdocs/includes/jquery/plugins/select2/select2_locale_ar.js
A htdocs/includes/jquery/plugins/select2/select2_locale_az.js
A htdocs/includes/jquery/plugins/select2/select2_locale_bg.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ca.js
A htdocs/includes/jquery/plugins/select2/select2_locale_cs.js
A htdocs/includes/jquery/plugins/select2/select2_locale_da.js
A htdocs/includes/jquery/plugins/select2/select2_locale_de.js
A htdocs/includes/jquery/plugins/select2/select2_locale_el.js
A htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template
A htdocs/includes/jquery/plugins/select2/select2_locale_es.js
A htdocs/includes/jquery/plugins/select2/select2_locale_et.js
A htdocs/includes/jquery/plugins/select2/select2_locale_eu.js
A htdocs/includes/jquery/plugins/select2/select2_locale_fa.js
A htdocs/includes/jquery/plugins/select2/select2_locale_fi.js
A htdocs/includes/jquery/plugins/select2/select2_locale_fr.js
A htdocs/includes/jquery/plugins/select2/select2_locale_gl.js
A htdocs/includes/jquery/plugins/select2/select2_locale_he.js
A htdocs/includes/jquery/plugins/select2/select2_locale_hr.js
A htdocs/includes/jquery/plugins/select2/select2_locale_hu.js
A htdocs/includes/jquery/plugins/select2/select2_locale_id.js
A htdocs/includes/jquery/plugins/select2/select2_locale_is.js
A htdocs/includes/jquery/plugins/select2/select2_locale_it.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ja.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ka.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ko.js
A htdocs/includes/jquery/plugins/select2/select2_locale_lt.js
A htdocs/includes/jquery/plugins/select2/select2_locale_lv.js
A htdocs/includes/jquery/plugins/select2/select2_locale_mk.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ms.js
A htdocs/includes/jquery/plugins/select2/select2_locale_nb.js
A htdocs/includes/jquery/plugins/select2/select2_locale_nl.js
A htdocs/includes/jquery/plugins/select2/select2_locale_pl.js
A htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js
A htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ro.js
A htdocs/includes/jquery/plugins/select2/select2_locale_rs.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ru.js
A htdocs/includes/jquery/plugins/select2/select2_locale_sk.js
A htdocs/includes/jquery/plugins/select2/select2_locale_sv.js
A htdocs/includes/jquery/plugins/select2/select2_locale_th.js
A htdocs/includes/jquery/plugins/select2/select2_locale_tr.js
A htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js
A htdocs/includes/jquery/plugins/select2/select2_locale_uk.js
A htdocs/includes/jquery/plugins/select2/select2_locale_vi.js
A htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js
A htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js
A htdocs/includes/jquery/plugins/select2/select2x2.png
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_bank_account.sql
M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
M htdocs/install/mysql/tables/llx_contrat.sql
M htdocs/install/mysql/tables/llx_facture_fourn.sql
M htdocs/install/mysql/tables/llx_societe_rib.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/install/upgrade.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/donations.lang
M htdocs/langs/en_US/externalsite.lang
M htdocs/langs/en_US/paybox.lang
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/categories.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/main.inc.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/composition/card.php
M htdocs/product/index.php
M htdocs/product/list.php
M htdocs/product/reassort.php
M htdocs/projet/card.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/public/demo/index.php
M htdocs/public/test/test_arrays.php
M htdocs/public/test/test_forms.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/class/address.class.php
M htdocs/societe/class/companybankaccount.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/index.php
M htdocs/societe/rib.php
M htdocs/societe/soc.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop-admin
Commit: c56af23faa4b196294e51d4ffddc5fb8cba85d89
https://github.com/Dolibarr/dolibarr/commit/c56af23faa4b196294e51d4ffddc5fb8cba85d89
Author: aspangaro <address@hidden>
Date: 2014-11-24 (Mon, 24 Nov 2014)
Changed paths:
M .travis.yml
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/adherents/list.php
M htdocs/admin/dict.php
M htdocs/bookmarks/card.php
M htdocs/bookmarks/list.php
M htdocs/comm/action/listactions.php
M htdocs/comm/index.php
M htdocs/comm/list.php
M htdocs/comm/prospect/list.php
M htdocs/commande/list.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/search.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/dons/list.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/list.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/index.php
M htdocs/compta/tva/reglement.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/cron/list.php
M htdocs/expedition/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/document.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/list.php
M htdocs/fourn/product/list.php
M htdocs/holiday/index.php
M htdocs/langs/en_US/stocks.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/stock/index.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/projet/list.php
M htdocs/projet/tasks/index.php
M htdocs/public/test/test_forms.php
M htdocs/societe/consumption.php
M htdocs/societe/societe.php
M htdocs/user/group/index.php
M htdocs/webservices/server_contact.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop-center
Commit: ef991e6c5dff769ca1eb5e776df956971d2ea1b7
https://github.com/Dolibarr/dolibarr/commit/ef991e6c5dff769ca1eb5e776df956971d2ea1b7
Author: aspangaro <address@hidden>
Date: 2014-11-24 (Mon, 24 Nov 2014)
Changed paths:
M htdocs/product/price.php
M htdocs/product/stock/card.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
M htdocs/projet/card.php
M htdocs/projet/tasks/task.php
M htdocs/public/demo/index.php
M htdocs/public/members/new.php
M htdocs/public/paybox/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/societe/checkvat/checkVatPopup.php
M htdocs/societe/price.php
M htdocs/societe/rib.php
M htdocs/societe/soc.php
M htdocs/user/agenda_extsites.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/group/card.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/webservices/admin/webservices.php
Log Message:
-----------
HTML5 - <center> is deprecated - Need CSS - continue working
Commit: c4c69e191bdc616e25fd7f04448ba5189594a130
https://github.com/Dolibarr/dolibarr/commit/c4c69e191bdc616e25fd7f04448ba5189594a130
Author: aspangaro <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M dev/skeletons/skeleton_page.php
M dev/test/testdiv.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/customer/card.php
M htdocs/adherents/admin/public.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/type.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_other.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/clicktodial.php
M htdocs/admin/company.php
M htdocs/admin/delais.php
M htdocs/admin/external_rss.php
M htdocs/admin/fckeditor.php
M htdocs/admin/ihm.php
M htdocs/admin/index.php
M htdocs/admin/ldap.php
M htdocs/admin/limits.php
M htdocs/admin/mails.php
M htdocs/admin/menus.php
M htdocs/admin/menus/edit.php
M htdocs/admin/notification.php
M htdocs/admin/pdf.php
M htdocs/admin/prelevement.php
M htdocs/admin/sms.php
M htdocs/admin/tools/index.php
M htdocs/admin/tools/purge.php
M htdocs/bookmarks/admin/bookmark.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/categories/card.php
M htdocs/categories/edit.php
M htdocs/categories/traduction.php
M htdocs/comm/action/card.php
M htdocs/comm/address.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/dons/card.php
M htdocs/compta/facture.php
M htdocs/compta/localtax/card.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/salaries/card.php
M htdocs/compta/tva/card.php
M htdocs/contact/card.php
M htdocs/contact/perso.php
M htdocs/contrat/card.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/photos_resize.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/cron/admin/cron.php
M htdocs/ecm/docdir.php
M htdocs/expedition/card.php
M htdocs/exports/index.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/externalsite/frames.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/paiement.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/holiday/card.php
M htdocs/imports/import.php
M htdocs/imports/index.php
M htdocs/install/check.php
M htdocs/install/etape5.php
M htdocs/install/index.php
M htdocs/install/repair.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/wizard/choix_date.php
M htdocs/opensurvey/wizard/index.php
M htdocs/paybox/admin/paybox.php
M htdocs/paybox/lib/paybox.lib.php
M htdocs/paypal/admin/paypal.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Replace <center> tags
Commit: 559bf93acbb55f3ce2067456143a64e1e2bebf23
https://github.com/Dolibarr/dolibarr/commit/559bf93acbb55f3ce2067456143a64e1e2bebf23
Author: aspangaro <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/core/tpl/login.tpl.php
M htdocs/cron/card.php
M htdocs/exports/index.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/opensurvey/wizard/choix_date.php
Log Message:
-----------
Correct
Commit: 38d94bac338d2c8e2397968a1dc1f4d6d00d025c
https://github.com/Dolibarr/dolibarr/commit/38d94bac338d2c8e2397968a1dc1f4d6d00d025c
Author: aspangaro <address@hidden>
Date: 2014-11-25 (Tue, 25 Nov 2014)
Changed paths:
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
Log Message:
-----------
Correct login page
Commit: d9cb9c1585c7e71643337c8e9ef98636de423a9c
https://github.com/Dolibarr/dolibarr/commit/d9cb9c1585c7e71643337c8e9ef98636de423a9c
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M dev/skeletons/skeleton_page.php
M dev/test/testdiv.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/customer/card.php
M htdocs/adherents/admin/public.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/type.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_other.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/clicktodial.php
M htdocs/admin/company.php
M htdocs/admin/delais.php
M htdocs/admin/external_rss.php
M htdocs/admin/fckeditor.php
M htdocs/admin/ihm.php
M htdocs/admin/index.php
M htdocs/admin/ldap.php
M htdocs/admin/limits.php
M htdocs/admin/mails.php
M htdocs/admin/menus.php
M htdocs/admin/menus/edit.php
M htdocs/admin/notification.php
M htdocs/admin/pdf.php
M htdocs/admin/prelevement.php
M htdocs/admin/sms.php
M htdocs/admin/tools/index.php
M htdocs/admin/tools/purge.php
M htdocs/bookmarks/admin/bookmark.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/categories/card.php
M htdocs/categories/edit.php
M htdocs/categories/traduction.php
M htdocs/comm/action/card.php
M htdocs/comm/address.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/dons/card.php
M htdocs/compta/facture.php
M htdocs/compta/localtax/card.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/salaries/card.php
M htdocs/compta/tva/card.php
M htdocs/contact/card.php
M htdocs/contact/perso.php
M htdocs/contrat/card.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/photos_resize.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/cron/admin/cron.php
M htdocs/cron/card.php
M htdocs/ecm/docdir.php
M htdocs/expedition/card.php
M htdocs/exports/index.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/externalsite/frames.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/paiement.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/holiday/card.php
M htdocs/imports/import.php
M htdocs/imports/index.php
M htdocs/install/check.php
M htdocs/install/etape5.php
M htdocs/install/index.php
M htdocs/install/repair.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/wizard/choix_date.php
M htdocs/opensurvey/wizard/index.php
M htdocs/paybox/admin/paybox.php
M htdocs/paybox/lib/paybox.lib.php
M htdocs/paypal/admin/paypal.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/fournisseurs.php
M htdocs/product/price.php
M htdocs/product/stock/card.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
M htdocs/projet/card.php
M htdocs/projet/tasks/task.php
M htdocs/public/demo/index.php
M htdocs/public/members/new.php
M htdocs/public/paybox/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/societe/checkvat/checkVatPopup.php
M htdocs/societe/price.php
M htdocs/societe/rib.php
M htdocs/societe/soc.php
M htdocs/user/agenda_extsites.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/group/card.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/webservices/admin/webservices.php
Log Message:
-----------
Merge pull request #2102 from aspangaro/develop-center
Task 1603 - Remove <center> deprecated HTML5 tags
Compare:
https://github.com/Dolibarr/dolibarr/compare/f01c5d0ea30d...d9cb9c1585c7
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 4e1f9b: Merge,
Laurent Destailleur <=