[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7bfdec: Fix: css
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7bfdec: Fix: css |
|
Date: |
Mon, 24 Jun 2013 11:02:49 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7bfdec7993771b37e0e5d2f9045ba57cf3d18f7a
https://github.com/Dolibarr/dolibarr/commit/7bfdec7993771b37e0e5d2f9045ba57cf3d18f7a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-23 (Sun, 23 Jun 2013)
Changed paths:
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: css
Commit: 7fb8a740e7bc50e3f6e1c274a76d9a6ad250bd87
https://github.com/Dolibarr/dolibarr/commit/7fb8a740e7bc50e3f6e1c274a76d9a6ad250bd87
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-23 (Sun, 23 Jun 2013)
Changed paths:
M htdocs/core/tpl/contacts.tpl.php
Log Message:
-----------
Fix: bad function
Commit: aa7e61178a3c0f385b2cc71498fa25658d26c6ed
https://github.com/Dolibarr/dolibarr/commit/aa7e61178a3c0f385b2cc71498fa25658d26c6ed
Author: Regis Houssin <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
New: add product price sharing for multicompany
Commit: cb9dcfa3697c64c7d7c0d4bea2eed1bef57a65aa
https://github.com/Dolibarr/dolibarr/commit/cb9dcfa3697c64c7d7c0d4bea2eed1bef57a65aa
Author: Regis Houssin <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/adherents/admin/adherent.php
M htdocs/comm/action/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/compta/bank/account.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/search_page.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/exports/export.php
A htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif
R htdocs/includes/jquery/plugins/mobile/images/ajax-loader.png
M htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png
M htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png
M htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png
M htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png
M htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
M htdocs/includes/odtphp/odf.php
M htdocs/install/mysql/data/llx_const.sql
M htdocs/langs/en_US/exports.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/opensurvey.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/exports.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/fr_FR/mails.lang
M htdocs/langs/fr_FR/opensurvey.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/bookmarks.lang
M htdocs/langs/tr_TR/boxes.lang
M htdocs/langs/tr_TR/cashdesk.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
A htdocs/langs/tr_TR/cron.lang
M htdocs/langs/tr_TR/deliveries.lang
M htdocs/langs/tr_TR/dict.lang
M htdocs/langs/tr_TR/donations.lang
M htdocs/langs/tr_TR/ecm.lang
M htdocs/langs/tr_TR/errors.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/externalsite.lang
M htdocs/langs/tr_TR/ftp.lang
M htdocs/langs/tr_TR/help.lang
M htdocs/langs/tr_TR/holiday.lang
M htdocs/langs/tr_TR/install.lang
M htdocs/langs/tr_TR/interventions.lang
M htdocs/langs/tr_TR/languages.lang
M htdocs/langs/tr_TR/ldap.lang
M htdocs/langs/tr_TR/mailmanspip.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/members.lang
A htdocs/langs/tr_TR/opensurvey.lang
M htdocs/langs/tr_TR/orders.lang
M htdocs/langs/tr_TR/oscommerce.lang
M htdocs/langs/tr_TR/other.lang
M htdocs/langs/tr_TR/paybox.lang
M htdocs/langs/tr_TR/paypal.lang
M htdocs/langs/tr_TR/products.lang
M htdocs/langs/tr_TR/projects.lang
M htdocs/langs/tr_TR/propal.lang
M htdocs/langs/tr_TR/sendings.lang
M htdocs/langs/tr_TR/shop.lang
M htdocs/langs/tr_TR/sms.lang
M htdocs/langs/tr_TR/stocks.lang
M htdocs/langs/tr_TR/suppliers.lang
M htdocs/langs/tr_TR/trips.lang
M htdocs/langs/tr_TR/users.lang
M htdocs/langs/tr_TR/withdrawals.lang
M htdocs/langs/tr_TR/workflow.lang
M htdocs/main.inc.php
M htdocs/opensurvey/public/create_survey.php
M htdocs/opensurvey/public/index.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
M htdocs/product/liste.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/societe/soc.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
A htdocs/theme/cameleo/img/menus/holiday.png
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/logout.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 05bd035488ef59221fdb1581b10fba7655e826e9
https://github.com/Dolibarr/dolibarr/commit/05bd035488ef59221fdb1581b10fba7655e826e9
Author: Regis Houssin <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/adherents/stats/byproperties.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
M htdocs/admin/boxes.php
M htdocs/admin/clicktodial.php
M htdocs/admin/commande.php
M htdocs/admin/system/phpinfo.php
M htdocs/admin/triggers.php
M htdocs/categories/index.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/comm/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/class/commandestats.class.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/bilan.php
M htdocs/compta/bank/budget.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/info.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/search.php
M htdocs/compta/bank/treso.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/fiche.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/cheque/liste.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/bon.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/prelevement/stats.php
M htdocs/compta/tva/fiche.php
M htdocs/contact/class/contact.class.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/barcode.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/modOpenSurvey.class.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
M htdocs/core/search_page.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/cron/list.php
M htdocs/document.php
M htdocs/exports/index.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/fiche.php
M htdocs/imports/import.php
M htdocs/imports/index.php
M htdocs/install/upgrade2.php
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/main.inc.php
M htdocs/opensurvey/admin/index.php
M htdocs/opensurvey/adminstuds.php
M htdocs/opensurvey/adminstuds_preview.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/opensurvey/fonctions.php
M htdocs/opensurvey/index.php
M htdocs/opensurvey/list.php
M htdocs/opensurvey/public/choix_autre.php
M htdocs/opensurvey/public/choix_date.php
M htdocs/opensurvey/public/create_survey.php
M htdocs/opensurvey/public/exportcsv.php
M htdocs/opensurvey/public/index.php
M htdocs/opensurvey/public/studs.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/liste.php
M htdocs/projet/activity/index.php
M htdocs/public/demo/index.php
M htdocs/public/emailing/mailing-read.php
M htdocs/public/emailing/mailing-unsubscribe.php
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/societe/checkvat/checkVatPopup.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/soc.php
M htdocs/support/index.php
M htdocs/theme/amarok/graph-color.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/clicktodial.php
M htdocs/user/logout.php
M htdocs/user/param_ihm.php
M htdocs/user/passwordforgotten.php
M htdocs/user/perms.php
M htdocs/viewimage.php
M htdocs/webservices/server_supplier_invoice.php
Log Message:
-----------
Fix: convert line delimiters
Commit: 307ae65924ae509c00ac335f23d8748886629fc4
https://github.com/Dolibarr/dolibarr/commit/307ae65924ae509c00ac335f23d8748886629fc4
Author: Regis Houssin <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/includes/ckeditor/CHANGES.html
M htdocs/includes/ckeditor/INSTALL.html
M htdocs/includes/ckeditor/LICENSE.html
M htdocs/includes/ckeditor/adapters/jquery.js
M htdocs/includes/ckeditor/ckeditor.js
M htdocs/includes/ckeditor/ckeditor_basic.js
M htdocs/includes/ckeditor/ckeditor_basic_source.js
M htdocs/includes/ckeditor/ckeditor_source.js
M htdocs/includes/ckeditor/config.js
M htdocs/includes/ckeditor/lang/_languages.js
M htdocs/includes/ckeditor/lang/af.js
M htdocs/includes/ckeditor/lang/ar.js
M htdocs/includes/ckeditor/lang/bg.js
M htdocs/includes/ckeditor/lang/bn.js
M htdocs/includes/ckeditor/lang/bs.js
M htdocs/includes/ckeditor/lang/ca.js
M htdocs/includes/ckeditor/lang/cs.js
M htdocs/includes/ckeditor/lang/cy.js
M htdocs/includes/ckeditor/lang/da.js
M htdocs/includes/ckeditor/lang/de.js
M htdocs/includes/ckeditor/lang/el.js
M htdocs/includes/ckeditor/lang/en-au.js
M htdocs/includes/ckeditor/lang/en-ca.js
M htdocs/includes/ckeditor/lang/en-gb.js
M htdocs/includes/ckeditor/lang/en.js
M htdocs/includes/ckeditor/lang/eo.js
M htdocs/includes/ckeditor/lang/es.js
M htdocs/includes/ckeditor/lang/et.js
M htdocs/includes/ckeditor/lang/eu.js
M htdocs/includes/ckeditor/lang/fa.js
M htdocs/includes/ckeditor/lang/fi.js
M htdocs/includes/ckeditor/lang/fo.js
M htdocs/includes/ckeditor/lang/fr-ca.js
M htdocs/includes/ckeditor/lang/fr.js
M htdocs/includes/ckeditor/lang/gl.js
M htdocs/includes/ckeditor/lang/gu.js
M htdocs/includes/ckeditor/lang/he.js
M htdocs/includes/ckeditor/lang/hi.js
M htdocs/includes/ckeditor/lang/hr.js
M htdocs/includes/ckeditor/lang/hu.js
M htdocs/includes/ckeditor/lang/id.js
M htdocs/includes/ckeditor/lang/is.js
M htdocs/includes/ckeditor/lang/it.js
M htdocs/includes/ckeditor/lang/ja.js
M htdocs/includes/ckeditor/lang/ka.js
M htdocs/includes/ckeditor/lang/km.js
M htdocs/includes/ckeditor/lang/ko.js
M htdocs/includes/ckeditor/lang/lt.js
M htdocs/includes/ckeditor/lang/lv.js
M htdocs/includes/ckeditor/lang/mk.js
M htdocs/includes/ckeditor/lang/mn.js
M htdocs/includes/ckeditor/lang/ms.js
M htdocs/includes/ckeditor/lang/nb.js
M htdocs/includes/ckeditor/lang/nl.js
M htdocs/includes/ckeditor/lang/no.js
M htdocs/includes/ckeditor/lang/pl.js
M htdocs/includes/ckeditor/lang/pt-br.js
M htdocs/includes/ckeditor/lang/pt.js
M htdocs/includes/ckeditor/lang/ro.js
M htdocs/includes/ckeditor/lang/ru.js
M htdocs/includes/ckeditor/lang/sk.js
M htdocs/includes/ckeditor/lang/sl.js
M htdocs/includes/ckeditor/lang/sr-latn.js
M htdocs/includes/ckeditor/lang/sr.js
M htdocs/includes/ckeditor/lang/sv.js
M htdocs/includes/ckeditor/lang/th.js
M htdocs/includes/ckeditor/lang/tr.js
M htdocs/includes/ckeditor/lang/ug.js
M htdocs/includes/ckeditor/lang/uk.js
M htdocs/includes/ckeditor/lang/vi.js
M htdocs/includes/ckeditor/lang/zh-cn.js
M htdocs/includes/ckeditor/lang/zh.js
M htdocs/includes/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/cs.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/cy.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/da.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/de.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/el.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/en.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/eo.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/fa.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/fi.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/fr.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/gu.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/he.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/it.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/mk.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/nb.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/nl.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/no.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/ro.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/tr.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/ug.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/vi.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/about/dialogs/about.js
M htdocs/includes/ckeditor/plugins/adobeair/plugin.js
M htdocs/includes/ckeditor/plugins/ajax/plugin.js
M htdocs/includes/ckeditor/plugins/autogrow/plugin.js
M htdocs/includes/ckeditor/plugins/bbcode/plugin.js
M htdocs/includes/ckeditor/plugins/clipboard/dialogs/paste.js
M htdocs/includes/ckeditor/plugins/colordialog/dialogs/colordialog.js
M htdocs/includes/ckeditor/plugins/devtools/lang/bg.js
M htdocs/includes/ckeditor/plugins/devtools/lang/cs.js
M htdocs/includes/ckeditor/plugins/devtools/lang/cy.js
M htdocs/includes/ckeditor/plugins/devtools/lang/da.js
M htdocs/includes/ckeditor/plugins/devtools/lang/de.js
M htdocs/includes/ckeditor/plugins/devtools/lang/el.js
M htdocs/includes/ckeditor/plugins/devtools/lang/en.js
M htdocs/includes/ckeditor/plugins/devtools/lang/eo.js
M htdocs/includes/ckeditor/plugins/devtools/lang/et.js
M htdocs/includes/ckeditor/plugins/devtools/lang/fa.js
M htdocs/includes/ckeditor/plugins/devtools/lang/fi.js
M htdocs/includes/ckeditor/plugins/devtools/lang/fr.js
M htdocs/includes/ckeditor/plugins/devtools/lang/gu.js
M htdocs/includes/ckeditor/plugins/devtools/lang/he.js
M htdocs/includes/ckeditor/plugins/devtools/lang/hr.js
M htdocs/includes/ckeditor/plugins/devtools/lang/it.js
M htdocs/includes/ckeditor/plugins/devtools/lang/nb.js
M htdocs/includes/ckeditor/plugins/devtools/lang/nl.js
M htdocs/includes/ckeditor/plugins/devtools/lang/no.js
M htdocs/includes/ckeditor/plugins/devtools/lang/pl.js
M htdocs/includes/ckeditor/plugins/devtools/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/devtools/lang/tr.js
M htdocs/includes/ckeditor/plugins/devtools/lang/ug.js
M htdocs/includes/ckeditor/plugins/devtools/lang/uk.js
M htdocs/includes/ckeditor/plugins/devtools/lang/vi.js
M htdocs/includes/ckeditor/plugins/devtools/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/devtools/plugin.js
M htdocs/includes/ckeditor/plugins/dialog/dialogDefinition.js
M htdocs/includes/ckeditor/plugins/div/dialogs/div.js
M htdocs/includes/ckeditor/plugins/docprops/dialogs/docprops.js
M htdocs/includes/ckeditor/plugins/docprops/plugin.js
M htdocs/includes/ckeditor/plugins/find/dialogs/find.js
M htdocs/includes/ckeditor/plugins/flash/dialogs/flash.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/button.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/checkbox.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/form.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/hiddenfield.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/radio.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/select.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/textarea.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/textfield.js
M htdocs/includes/ckeditor/plugins/iframe/dialogs/iframe.js
M htdocs/includes/ckeditor/plugins/iframedialog/plugin.js
M htdocs/includes/ckeditor/plugins/image/dialogs/image.js
M htdocs/includes/ckeditor/plugins/link/dialogs/anchor.js
M htdocs/includes/ckeditor/plugins/link/dialogs/link.js
M htdocs/includes/ckeditor/plugins/liststyle/dialogs/liststyle.js
M htdocs/includes/ckeditor/plugins/pastefromword/filter/default.js
M htdocs/includes/ckeditor/plugins/pastetext/dialogs/pastetext.js
M htdocs/includes/ckeditor/plugins/placeholder/dialogs/placeholder.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/bg.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/cs.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/cy.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/da.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/de.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/el.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/en.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/eo.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/et.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/fa.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/fi.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/fr.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/he.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/hr.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/it.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/nb.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/nl.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/no.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/pl.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/tr.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/ug.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/uk.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/vi.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/placeholder/plugin.js
M htdocs/includes/ckeditor/plugins/preview/preview.html
M htdocs/includes/ckeditor/plugins/scayt/dialogs/options.js
M htdocs/includes/ckeditor/plugins/smiley/dialogs/smiley.js
M htdocs/includes/ckeditor/plugins/specialchar/dialogs/specialchar.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/cs.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/cy.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/de.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/el.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/en.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/eo.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/et.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/fa.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/fi.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/fr.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/he.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/hr.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/it.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/nb.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/nl.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/no.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/tr.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/ug.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/styles/styles/default.js
M htdocs/includes/ckeditor/plugins/stylesheetparser/plugin.js
M htdocs/includes/ckeditor/plugins/table/dialogs/table.js
M htdocs/includes/ckeditor/plugins/tableresize/plugin.js
M htdocs/includes/ckeditor/plugins/tabletools/dialogs/tableCell.js
M htdocs/includes/ckeditor/plugins/templates/dialogs/templates.js
M htdocs/includes/ckeditor/plugins/templates/templates/default.js
M htdocs/includes/ckeditor/plugins/uicolor/dialogs/uicolor.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/bg.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/cs.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/cy.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/da.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/de.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/el.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/en.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/eo.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/et.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/fa.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/fi.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/fr.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/he.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/hr.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/it.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/mk.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/nb.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/nl.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/no.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/pl.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/tr.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/ug.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/uk.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/vi.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/uicolor/plugin.js
M htdocs/includes/ckeditor/plugins/uicolor/yui/yui.js
M htdocs/includes/ckeditor/plugins/wsc/dialogs/ciframe.html
M htdocs/includes/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
M htdocs/includes/ckeditor/plugins/wsc/dialogs/wsc.js
M htdocs/includes/ckeditor/plugins/xml/plugin.js
M htdocs/includes/ckeditor/skins/kama/skin.js
M htdocs/includes/ckeditor/skins/office2003/skin.js
M htdocs/includes/ckeditor/skins/v2/skin.js
M htdocs/includes/ckeditor/themes/default/theme.js
M htdocs/includes/jquery/js/jquery-latest.min.js
M htdocs/includes/jquery/plugins/jpicker/Example.html
M htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
M htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
M htdocs/includes/jquery/plugins/layout/jquery.layout-latest.js
Log Message:
-----------
Fix: crlf to lf for avoid errors with git clone
Commit: a5ba59312de445e4975ee4acdea8955d2c9199e0
https://github.com/Dolibarr/dolibarr/commit/a5ba59312de445e4975ee4acdea8955d2c9199e0
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M dev/fixdosfiles.sh
M dev/fixutf8bomfiles.sh
Log Message:
-----------
Fix: Fix some bug into script to detect bad utf8 and dos files
Commit: 8d04f5a8059534ad33e977023b7cb7fb5a0e136f
https://github.com/Dolibarr/dolibarr/commit/8d04f5a8059534ad33e977023b7cb7fb5a0e136f
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/cashdesk/facturation.php
Log Message:
-----------
Fix: warning
Commit: eb07c6b2e7f8e19f8c74ab431f856887acd69d75
https://github.com/Dolibarr/dolibarr/commit/eb07c6b2e7f8e19f8c74ab431f856887acd69d75
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Missing left padding
Commit: 1d8b9949d64d645863886b49d1beb9bf0831265a
https://github.com/Dolibarr/dolibarr/commit/1d8b9949d64d645863886b49d1beb9bf0831265a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/cron/list.php
M htdocs/document.php
M htdocs/product/ajax/products.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/logout.php
M htdocs/viewimage.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/cba1d73dd4ec...1d8b9949d64d