[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c43b5f: Works on jQuery fileupload up
|
From: |
Regis Houssin |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c43b5f: Works on jQuery fileupload upgrade (Todo: css prob... |
|
Date: |
Thu, 12 Jul 2012 00:06:18 -0700 |
Branch: refs/heads/3.2
Home: https://github.com/Dolibarr/dolibarr
Commit: c43b5f99ac72f9c17e635f3f68029cacb80f78d2
https://github.com/Dolibarr/dolibarr/commit/c43b5f99ac72f9c17e635f3f68029cacb80f78d2
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
M htdocs/core/class/html.formfile.class.php
A htdocs/core/tpl/ajax/fileupload_main.tpl.php
A htdocs/core/tpl/ajax/fileupload_view.tpl.php
R htdocs/core/tpl/ajaxfileupload.tpl.php
M htdocs/includes/jquery/plugins/fileupload/README.md
R htdocs/includes/jquery/plugins/fileupload/README.txt
A htdocs/includes/jquery/plugins/fileupload/css/bootstrap.min.css
A htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
A
htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings-white.png
A htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings.png
A htdocs/includes/jquery/plugins/fileupload/img/loading.gif
A htdocs/includes/jquery/plugins/fileupload/img/progressbar.gif
R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.css
R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.js
R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload.js
R htdocs/includes/jquery/plugins/fileupload/jquery.iframe-transport.js
R htdocs/includes/jquery/plugins/fileupload/jquery.tmpl.min.js
A htdocs/includes/jquery/plugins/fileupload/js/bootstrap.min.js
A
htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
A htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
A htdocs/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
A htdocs/includes/jquery/plugins/fileupload/js/main.js
A htdocs/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
R htdocs/includes/jquery/plugins/fileupload/pbar-ani.gif
A htdocs/includes/jquery/plugins/template/README.md
A htdocs/includes/jquery/plugins/template/compile.js
A htdocs/includes/jquery/plugins/template/runtime.js
A htdocs/includes/jquery/plugins/template/tmpl.js
A htdocs/includes/jquery/plugins/template/tmpl.min.js
M htdocs/main.inc.php
Log Message:
-----------
Works on jQuery fileupload upgrade (Todo: css problem)
Commit: bef5b66daba5f62fdc3ca4f0e135af9c7447565d
https://github.com/Dolibarr/dolibarr/commit/bef5b66daba5f62fdc3ca4f0e135af9c7447565d
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
R htdocs/includes/jquery/plugins/fileupload/css/bootstrap.min.css
M htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
R
htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings-white.png
R htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings.png
R htdocs/includes/jquery/plugins/fileupload/js/bootstrap.min.js
A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
A htdocs/includes/jquery/plugins/fileupload/js/locale.js
M htdocs/includes/jquery/plugins/fileupload/js/main.js
M htdocs/main.inc.php
Log Message:
-----------
Fix: replace Bootstrap version by jQueryUI version
Commit: 8c4ddb99be5049936edace880707de4098338ff7
https://github.com/Dolibarr/dolibarr/commit/8c4ddb99be5049936edace880707de4098338ff7
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
Log Message:
-----------
Fix: add max file size
Commit: 1649a9a1b1b38575cc1f37d592b266a4d73bf85f
https://github.com/Dolibarr/dolibarr/commit/1649a9a1b1b38575cc1f37d592b266a4d73bf85f
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
Log Message:
-----------
Fix: reload page after file upload completed
Commit: a04ca9449a7bc4a78aa89b0fef03eca0a869dc99
https://github.com/Dolibarr/dolibarr/commit/a04ca9449a7bc4a78aa89b0fef03eca0a869dc99
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
M COPYRIGHT
M htdocs/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
M
htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
M
htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
M htdocs/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
M htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.css
M htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
M htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css
M htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
M htdocs/includes/jquery/css/ui-lightness/jquery-ui-latest.custom.css
M htdocs/includes/jquery/js/jquery-latest.min.jgz
M htdocs/includes/jquery/js/jquery-latest.min.js
M htdocs/includes/jquery/js/jquery-ui-latest.custom.min.jgz
M htdocs/includes/jquery/js/jquery-ui-latest.custom.min.js
Log Message:
-----------
New: update jQuery and jQuery UI
Commit: 1f4be4cfedf5169a759bbe20b2403962cb2d6ad5
https://github.com/Dolibarr/dolibarr/commit/1f4be4cfedf5169a759bbe20b2403962cb2d6ad5
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
M htdocs/adherents/document.php
M htdocs/comm/propal/document.php
M htdocs/commande/document.php
M htdocs/compta/facture/document.php
M htdocs/fourn/commande/document.php
M htdocs/projet/document.php
M htdocs/projet/tasks/document.php
M htdocs/societe/document.php
Log Message:
-----------
Fix: stock message in session and reload the page for avoid url problem
with jQuery fileupload
Commit: aee1c3b06931141f0140c2600cc7b3a5a2140631
https://github.com/Dolibarr/dolibarr/commit/aee1c3b06931141f0140c2600cc7b3a5a2140631
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
M htdocs/core/ajax/fileupload.php
A htdocs/core/class/fileupload.class.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/ajax/fileupload_view.tpl.php
M htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
Log Message:
-----------
Fix: more clean code for new version of jQuery fileupload
Commit: 92bb9c99f5620482e05bee4030c19a0794e69d57
https://github.com/Dolibarr/dolibarr/commit/92bb9c99f5620482e05bee4030c19a0794e69d57
Author: Regis Houssin <address@hidden>
Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/filefunc.inc.php
M htdocs/install/inc.php
Log Message:
-----------
Release 3.2.1-alpha
Commit: 6f28b698049229d989ef42014c9301f74ade0691
https://github.com/Dolibarr/dolibarr/commit/6f28b698049229d989ef42014c9301f74ade0691
Author: Regis Houssin <address@hidden>
Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths:
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
A htdocs/includes/jquery/plugins/fileupload/cors/result.html
M htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
M htdocs/main.inc.php
Log Message:
-----------
Fix: add iframe transport for compatibility with all browser
Commit: 176c6013ecf7e196cc9eb81a620b90091562fe12
https://github.com/Dolibarr/dolibarr/commit/176c6013ecf7e196cc9eb81a620b90091562fe12
Author: Regis Houssin <address@hidden>
Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths:
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
Log Message:
-----------
Fix: bad option name
Commit: 1c3bf3bb221afa6d74604c2332a03b3606fa650b
https://github.com/Dolibarr/dolibarr/commit/1c3bf3bb221afa6d74604c2332a03b3606fa650b
Author: Regis Houssin <address@hidden>
Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/core/lib/files.lib.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 1b19fddbc62243ca660908d4988ea1555793ea90
https://github.com/Dolibarr/dolibarr/commit/1b19fddbc62243ca660908d4988ea1555793ea90
Author: Regis Houssin <address@hidden>
Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix: missing oldcopy during update
Commit: c51258567095fbb45bdc12d8aecf81e5d38a00ef
https://github.com/Dolibarr/dolibarr/commit/c51258567095fbb45bdc12d8aecf81e5d38a00ef
Author: Regis Houssin <address@hidden>
Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: delete or rename a document product dir
Commit: db148c4233e85fe785560c55992a40428554878e
https://github.com/Dolibarr/dolibarr/commit/db148c4233e85fe785560c55992a40428554878e
Author: Regis Houssin <address@hidden>
Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths:
M htdocs/langs/en_US/products.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/tr_TR/other.lang
M htdocs/langs/tr_TR/products.lang
M htdocs/langs/tr_TR/stocks.lang
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: c9c4ba2a72235b591ca053c4062082b01c993912
https://github.com/Dolibarr/dolibarr/commit/c9c4ba2a72235b591ca053c4062082b01c993912
Author: Regis Houssin <address@hidden>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M htdocs/comm/propal/document.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/document.php
M htdocs/contrat/fiche.php
M htdocs/core/class/fileupload.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/document.php
M htdocs/projet/fiche.php
Log Message:
-----------
Fix: problem with external modules and uniformize code
Conflicts:
htdocs/comm/propal/document.php
htdocs/core/class/fileupload.class.php
htdocs/projet/fiche.php
Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4
Commit: eef50058b11686dc4a49531d117786ad68a7db0e
https://github.com/Dolibarr/dolibarr/commit/eef50058b11686dc4a49531d117786ad68a7db0e
Author: Regis Houssin <address@hidden>
Date: 2012-06-10 (Sun, 10 Jun 2012)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/fiche.php
M test/phpunit/ContratTest.php
Log Message:
-----------
Fix: bad parameters, use global
Commit: c9be1cbb8bfb996c02f8adfa3c8a2a926ce408fe
https://github.com/Dolibarr/dolibarr/commit/c9be1cbb8bfb996c02f8adfa3c8a2a926ce408fe
Author: Regis Houssin <address@hidden>
Date: 2012-06-10 (Sun, 10 Jun 2012)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/societe/modules_societe.class.php
M htdocs/societe/soc.php
Log Message:
-----------
Fix: missing remove_file action
Fix: use object instead id and store odt filename in object for use in
triggers
Commit: fb15ea20c66c167b85712c51448dd7f3e9ed91ed
https://github.com/Dolibarr/dolibarr/commit/fb15ea20c66c167b85712c51448dd7f3e9ed91ed
Author: Regis Houssin <address@hidden>
Date: 2012-06-11 (Mon, 11 Jun 2012)
Changed paths:
M htdocs/includes/jquery/plugins/jstree/jquery.cookie.js
Log Message:
-----------
Fix: update jquery-cookie plugin
Commit: 548266d6071b9898c9740db27107ca5a4ca55f7f
https://github.com/Dolibarr/dolibarr/commit/548266d6071b9898c9740db27107ca5a4ca55f7f
Author: Regis Houssin <address@hidden>
Date: 2012-06-11 (Mon, 11 Jun 2012)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/document.php
M htdocs/core/class/fileupload.class.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/document.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
Fix: uniformize code
Commit: c4fbdbbce484ffb3f8846aee5e336ddfee2a3f8c
https://github.com/Dolibarr/dolibarr/commit/c4fbdbbce484ffb3f8846aee5e336ddfee2a3f8c
Author: Regis Houssin <address@hidden>
Date: 2012-06-12 (Tue, 12 Jun 2012)
Changed paths:
M htdocs/core/class/doleditor.class.php
M htdocs/core/js/editinplace.js
M htdocs/main.inc.php
Log Message:
-----------
Fix: mutualize ckeditor parameters
Commit: 707bffd1818656f1b27b198eafb4e1a83fb83b00
https://github.com/Dolibarr/dolibarr/commit/707bffd1818656f1b27b198eafb4e1a83fb83b00
Author: Regis Houssin <address@hidden>
Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths:
M htdocs/admin/fckeditor.php
M htdocs/core/lib/pdf.lib.php
M htdocs/langs/ca_ES/products.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/es_ES/products.lang
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 9b1047eea7d3a7f03f010f583f06f34e457b7fa7
https://github.com/Dolibarr/dolibarr/commit/9b1047eea7d3a7f03f010f583f06f34e457b7fa7
Author: Regis Houssin <address@hidden>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/comm/propal/index.php
M htdocs/commande/class/commandestats.class.php
M htdocs/commande/index.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/societe/soc.php
M htdocs/user/clicktodial.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1
Commit: d941d1efeeded6ac0582a360ff0dbe681edfc2fa
https://github.com/Dolibarr/dolibarr/commit/d941d1efeeded6ac0582a360ff0dbe681edfc2fa
Author: Regis Houssin <address@hidden>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-howto.txt
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/core/lib/json.lib.php
M htdocs/imports/class/import.class.php
M htdocs/imports/emptyexample.php
M htdocs/install/inc.php
M htdocs/master.inc.php
M htdocs/support/inc.php
M scripts/invoices/rebuild_merge_pdf.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1
Conflicts:
build/makepack-dolibarr.pl
htdocs/filefunc.inc.php
htdocs/install/inc.php
Commit: 56f7d31d112049096f04115bb4a07b1ff11a0330
https://github.com/Dolibarr/dolibarr/commit/56f7d31d112049096f04115bb4a07b1ff11a0330
Author: Regis Houssin <address@hidden>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M htdocs/master.inc.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 3164b5615caa08a6c339c9e34206f6fa6c7c33d7
https://github.com/Dolibarr/dolibarr/commit/3164b5615caa08a6c339c9e34206f6fa6c7c33d7
Author: Regis Houssin <address@hidden>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M htdocs/admin/expedition.php
M htdocs/admin/workflow.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 11f78c1913b2e47ff9ff394c5db9ced326cc3c94
https://github.com/Dolibarr/dolibarr/commit/11f78c1913b2e47ff9ff394c5db9ced326cc3c94
Author: Regis Houssin <address@hidden>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M htdocs/theme/auguria/ckeditor/config.js
M htdocs/theme/bureau2crea/ckeditor/config.js
M htdocs/theme/cameleo/ckeditor/config.js
M htdocs/theme/eldy/ckeditor/config.js
Log Message:
-----------
Fix: add ckeditor create div option with dolibarr_mailings toolbar
Commit: 87f2ec663db0cabeb486e8f8b7abe5d07403a2bb
https://github.com/Dolibarr/dolibarr/commit/87f2ec663db0cabeb486e8f8b7abe5d07403a2bb
Author: Regis Houssin <address@hidden>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M htdocs/core/modules/societe/mod_codecompta_panicum.php
A htdocs/install/lib/repair.lib.php
M htdocs/install/repair.php
M htdocs/langs/fr_FR/install.lang
M htdocs/product/fiche.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 123b45aa4b099aad17335f8982eb35cfa6c4d767
https://github.com/Dolibarr/dolibarr/commit/123b45aa4b099aad17335f8982eb35cfa6c4d767
Author: Regis Houssin <address@hidden>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M htdocs/install/lib/repair.lib.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: b632c2233bf7d7a177ee6b097df5aaa5870b420c
https://github.com/Dolibarr/dolibarr/commit/b632c2233bf7d7a177ee6b097df5aaa5870b420c
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
M build/pad/pad_doliwamp.xml
M htdocs/contact/class/contact.class.php
M htdocs/expedition/index.php
M htdocs/fourn/facture/document.php
M htdocs/index.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1
Commit: cd3df1d6e1c3ec07d9124e73429611ba66983955
https://github.com/Dolibarr/dolibarr/commit/cd3df1d6e1c3ec07d9124e73429611ba66983955
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/langs/en_US/contracts.lang
M htdocs/langs/fr_FR/contracts.lang
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 067a9b0820e9bd74dc24d358d362855e19e42af1
https://github.com/Dolibarr/dolibarr/commit/067a9b0820e9bd74dc24d358d362855e19e42af1
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/product.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1
Conflicts:
htdocs/product/class/product.class.php
Commit: 92858a7b47243f5bb58283d017e2bed1613ca253
https://github.com/Dolibarr/dolibarr/commit/92858a7b47243f5bb58283d017e2bed1613ca253
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/sendings.lib.php
M htdocs/expedition/fiche.php
M htdocs/expedition/index.php
M htdocs/livraison/class/livraison.class.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 3e30cde02eba9d66f878ea0365aab86f8b024ad6
https://github.com/Dolibarr/dolibarr/commit/3e30cde02eba9d66f878ea0365aab86f8b024ad6
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M htdocs/adherents/agenda.php
M htdocs/core/lib/security.lib.php
M htdocs/langs/ca_ES/contracts.lang
M htdocs/langs/ca_ES/install.lang
M htdocs/langs/es_ES/contracts.lang
M htdocs/langs/es_ES/install.lang
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 7f021ad5d9d259e1f18494ebc3a92be201041b90
https://github.com/Dolibarr/dolibarr/commit/7f021ad5d9d259e1f18494ebc3a92be201041b90
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M build/perl/virtualmin/dolibarr.pl
A htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/fr_FR/sendings.lang
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: b0ab71db5f260d114ed0c3f60b1038db8f974051
https://github.com/Dolibarr/dolibarr/commit/b0ab71db5f260d114ed0c3f60b1038db8f974051
Author: Regis Houssin <address@hidden>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: merge problem
Commit: ab6129a1cce9f9d4ce597b61daaa0a20a8ac3403
https://github.com/Dolibarr/dolibarr/commit/ab6129a1cce9f9d4ce597b61daaa0a20a8ac3403
Author: Regis Houssin <address@hidden>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M htdocs/core/js/editinplace.js
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: bf9fd6a2dae922493d6c7e779e1b4cb6b2483ef8
https://github.com/Dolibarr/dolibarr/commit/bf9fd6a2dae922493d6c7e779e1b4cb6b2483ef8
Author: Regis Houssin <address@hidden>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 8befcb9477a4246cf965cd56dcae7efe59f7b574
https://github.com/Dolibarr/dolibarr/commit/8befcb9477a4246cf965cd56dcae7efe59f7b574
Author: Regis Houssin <address@hidden>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
M htdocs/comm/index.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: ce7f45ab1f55a5cf603392a252c49d7f3d9b11a8
https://github.com/Dolibarr/dolibarr/commit/ce7f45ab1f55a5cf603392a252c49d7f3d9b11a8
Author: Regis Houssin <address@hidden>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
M htdocs/comm/index.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: ff048175f71f234e1e18248897c162e78112dbb7
https://github.com/Dolibarr/dolibarr/commit/ff048175f71f234e1e18248897c162e78112dbb7
Author: Regis Houssin <address@hidden>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M htdocs/product/stats/propal.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 6f919da5d9f83b7950a46da79a1f2192aeafc273
https://github.com/Dolibarr/dolibarr/commit/6f919da5d9f83b7950a46da79a1f2192aeafc273
Author: Regis Houssin <address@hidden>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: c8eb666826c028ca5abc89da1551327afea51b6f
https://github.com/Dolibarr/dolibarr/commit/c8eb666826c028ca5abc89da1551327afea51b6f
Author: Regis Houssin <address@hidden>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M htdocs/admin/perms.php
M htdocs/core/class/html.form.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/user/fiche.php
M htdocs/user/group/perms.php
M htdocs/user/perms.php
Log Message:
-----------
Fix: compatibility with multicompany
Commit: 41dcd9370a1c7dfd6890c2410b6e28db6f61057f
https://github.com/Dolibarr/dolibarr/commit/41dcd9370a1c7dfd6890c2410b6e28db6f61057f
Author: Regis Houssin <address@hidden>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 8ee06f02b1f799403b2046a6f10a4b165d0516e8
https://github.com/Dolibarr/dolibarr/commit/8ee06f02b1f799403b2046a6f10a4b165d0516e8
Author: Regis Houssin <address@hidden>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M htdocs/core/class/html.formother.class.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 250e3555c3cc8d6433c419bd25a8217556f46a78
https://github.com/Dolibarr/dolibarr/commit/250e3555c3cc8d6433c419bd25a8217556f46a78
Author: Regis Houssin <address@hidden>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/main.inc.php
M htdocs/user/class/user.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
Log Message:
-----------
Fix: more bugs with multicompany
Commit: 293e0ac83126f2ad1a9164520ba809b88ab851c1
https://github.com/Dolibarr/dolibarr/commit/293e0ac83126f2ad1a9164520ba809b88ab851c1
Author: Regis Houssin <address@hidden>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M htdocs/core/lib/security2.lib.php
M htdocs/core/login/functions_dolibarr.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2
Commit: 925bded6d949d803cff602c5f109872b441ec1a6
https://github.com/Dolibarr/dolibarr/commit/925bded6d949d803cff602c5f109872b441ec1a6
Author: Regis Houssin <address@hidden>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M htdocs/core/class/html.formother.class.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 8b832f475fbd00fc2ea36b70658073841ea904ee
https://github.com/Dolibarr/dolibarr/commit/8b832f475fbd00fc2ea36b70658073841ea904ee
Author: Regis Houssin <address@hidden>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix: getpost error
Commit: 3686fad393caa402faa6e96e7dc022b925a8f59d
https://github.com/Dolibarr/dolibarr/commit/3686fad393caa402faa6e96e7dc022b925a8f59d
Author: Regis Houssin <address@hidden>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M htdocs/user/class/usergroup.class.php
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
Log Message:
-----------
Fix: compatibility with multicompany and transverse mode
Commit: 2f9f7d401f816a4b316d7eec320a781eb858b161
https://github.com/Dolibarr/dolibarr/commit/2f9f7d401f816a4b316d7eec320a781eb858b161
Author: Regis Houssin <address@hidden>
Date: 2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
Log Message:
-----------
Merge branch '3.2' of git+ssh://github.com/Dolibarr/dolibarr into 3.2.1
Commit: 02f30aeee2a4337000274627c8fde47032701d5b
https://github.com/Dolibarr/dolibarr/commit/02f30aeee2a4337000274627c8fde47032701d5b
Author: Regis Houssin <address@hidden>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into
3.2.1
Commit: 1af4834f1016bdf58382c3f9e7820982b7a1ace4
https://github.com/Dolibarr/dolibarr/commit/1af4834f1016bdf58382c3f9e7820982b7a1ace4
Author: Regis Houssin <address@hidden>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M htdocs/user/fiche.php
M htdocs/user/group/fiche.php
Log Message:
-----------
Fix: for multicompany transverse mode
Compare:
https://github.com/Dolibarr/dolibarr/compare/58b2b91928a8...1af4834f1016
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] c43b5f: Works on jQuery fileupload upgrade (Todo: css prob...,
Regis Houssin <=