[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ff6dae: FIX #5203
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] ff6dae: FIX #5203 |
|
Date: |
Sat, 04 Jun 2016 15:29:51 -0700 |
Branch: refs/heads/3.9
Home: https://github.com/Dolibarr/dolibarr
Commit: ff6daebee68dd457544e7833854bb0be15355abb
https://github.com/Dolibarr/dolibarr/commit/ff6daebee68dd457544e7833854bb0be15355abb
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
FIX #5203
Commit: c9834117c9999c6b2c825caea83e70d8d77e4d39
https://github.com/Dolibarr/dolibarr/commit/c9834117c9999c6b2c825caea83e70d8d77e4d39
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Fix #5156
Commit: bd2fe75d08dde06f130a1e8408f0992458747b4a
https://github.com/Dolibarr/dolibarr/commit/bd2fe75d08dde06f130a1e8408f0992458747b4a
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Fix menus in dashboard links
Commit: 8ccda16ef370e86ee801d3e3790c43ead1625f29
https://github.com/Dolibarr/dolibarr/commit/8ccda16ef370e86ee801d3e3790c43ead1625f29
Author: phf <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Fix call function ldap_connect but not exists
Commit: 1552e7f41f41fabca47c0337e8e0b524a492d440
https://github.com/Dolibarr/dolibarr/commit/1552e7f41f41fabca47c0337e8e0b524a492d440
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Merge pull request #5286 from atm-ph/fix_3.7_call_function_not_exists
Fix call function ldap_connect but not exists
Commit: a62f5bd5b4d5729910368cc84e3f60a71d21fd44
https://github.com/Dolibarr/dolibarr/commit/a62f5bd5b4d5729910368cc84e3f60a71d21fd44
Author: phf <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix #2777
Commit: aebc7b12334cb5aefb07bb7baa4160f9521c6cf2
https://github.com/Dolibarr/dolibarr/commit/aebc7b12334cb5aefb07bb7baa4160f9521c6cf2
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Merge pull request #5285 from atm-maxime/fix_menus_dashboard_links
FIX #3243
Commit: acc8cca84a94d4063c9d5ca1f3577cbdd928b888
https://github.com/Dolibarr/dolibarr/commit/acc8cca84a94d4063c9d5ca1f3577cbdd928b888
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #5290 from atm-ph/fix_3.7_issue_2777
Fix #2777
Commit: abe84ef991a0ddb1e84dee192360897aa1229ace
https://github.com/Dolibarr/dolibarr/commit/abe84ef991a0ddb1e84dee192360897aa1229ace
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
Fix rights check on expense reports
Commit: a4411c7fe7f0f3ba81df4adca5356818c6f1519d
https://github.com/Dolibarr/dolibarr/commit/a4411c7fe7f0f3ba81df4adca5356818c6f1519d
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
Merge pull request #5299 from atm-maxime/fix_expensereport_rights
Fix rights check on expense reports
Commit: 7866fb9dae68ddf0218b8f20005bb4c1fd1a01a0
https://github.com/Dolibarr/dolibarr/commit/7866fb9dae68ddf0218b8f20005bb4c1fd1a01a0
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-04 (Sat, 04 Jun 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix #5153
Commit: d9553212ac776521519aaf95cd218695576ca545
https://github.com/Dolibarr/dolibarr/commit/d9553212ac776521519aaf95cd218695576ca545
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #5302 from atm-maxime/fix_sanitizefilename
FIX #5153
Commit: db2269b9dd68b2a55c0d02b1a8c92c13ad1a4b3e
https://github.com/Dolibarr/dolibarr/commit/db2269b9dd68b2a55c0d02b1a8c92c13ad1a4b3e
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/langs/en_US/admin.lang
Commit: c09dbe05b3a5c793b1206014fc22245eb5b70676
https://github.com/Dolibarr/dolibarr/commit/c09dbe05b3a5c793b1206014fc22245eb5b70676
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/expensereport/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
Commit: c07933729acfb18dfc774b1b6a609ce4193919a5
https://github.com/Dolibarr/dolibarr/commit/c07933729acfb18dfc774b1b6a609ce4193919a5
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/ecm/index.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Compare:
https://github.com/Dolibarr/dolibarr/compare/0d08231cd8bc...c07933729acf