[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] bf9ec2: Fix: Clean init data
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] bf9ec2: Fix: Clean init data |
|
Date: |
Thu, 07 Aug 2014 16:27:13 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: bf9ec22cd0f4d4fad618ce3f2dc256b586b7893e
https://github.com/Dolibarr/dolibarr/commit/bf9ec22cd0f4d4fad618ce3f2dc256b586b7893e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean init data
Commit: 544e75c2a11413e9fe603ec50fdfac356962e5c4
https://github.com/Dolibarr/dolibarr/commit/544e75c2a11413e9fe603ec50fdfac356962e5c4
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
M dev/initdata/mysqldump_dolibarr_3.5.0.sql
Log Message:
-----------
Fix: Clean init data
Commit: 98eb39bf9ce36e51f92321e395cbbd5c9c886e61
https://github.com/Dolibarr/dolibarr/commit/98eb39bf9ce36e51f92321e395cbbd5c9c886e61
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported
Commit: d694b102746a6957512a7d3b6989f307c71905b8
https://github.com/Dolibarr/dolibarr/commit/d694b102746a6957512a7d3b6989f307c71905b8
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M build/doxygen/dolibarr-doxygen-build.pl
M build/doxygen/dolibarr-doxygen.doxyfile
M build/doxygen/doxygen_header.html
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
M dev/initdata/mysqldump_dolibarr_3.5.0.sql
M htdocs/core/lib/pdf.lib.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/fiche.php
M htdocs/holiday/view_log.php
A test/phpunit/SqlTest.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 20cef1512f1d77f8cc136c61a5163b8eefbd680b
https://github.com/Dolibarr/dolibarr/commit/20cef1512f1d77f8cc136c61a5163b8eefbd680b
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: f1ca5b3eeab7721fc40af31400b18a31612a3d5f
https://github.com/Dolibarr/dolibarr/commit/f1ca5b3eeab7721fc40af31400b18a31612a3d5f
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
Log Message:
-----------
Exclude vagrant dir
Commit: 6d49259999d2e8f5c45fd4e65137ee30bddf6d2e
https://github.com/Dolibarr/dolibarr/commit/6d49259999d2e8f5c45fd4e65137ee30bddf6d2e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
Log Message:
-----------
Exclude nltechno dir
Commit: ebc11a7a9c953364e4130e44ee8adc535d4dd70b
https://github.com/Dolibarr/dolibarr/commit/ebc11a7a9c953364e4130e44ee8adc535d4dd70b
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/projet/activity/list.php
Log Message:
-----------
Fix: When disabled, all fields must be disabled. Need backport.
Commit: 1016e05fc6a1187089e1ccf47802f465e7944a48
https://github.com/Dolibarr/dolibarr/commit/1016e05fc6a1187089e1ccf47802f465e7944a48
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/projet/activity/list.php
Log Message:
-----------
Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
Commit: 1e473839e7bfd8a845a829f7fc338afde422f4fe
https://github.com/Dolibarr/dolibarr/commit/1e473839e7bfd8a845a829f7fc338afde422f4fe
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
Commit: a49bce10dec8ff7f1fa15f890519400a6e8166e7
https://github.com/Dolibarr/dolibarr/commit/a49bce10dec8ff7f1fa15f890519400a6e8166e7
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/projet/activity/list.php
Log Message:
-----------
Fix: When disabled, all fields must be disabled. Need backport.
Conflicts:
htdocs/projet/activity/list.php
Commit: 48fc945648adf06d77caa997d3d07a145ee4cfaf
https://github.com/Dolibarr/dolibarr/commit/48fc945648adf06d77caa997d3d07a145ee4cfaf
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/projet/activity/list.php
Log Message:
-----------
Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/activity/list.php
Commit: d0c3a7913f9c0d42acc2dfa1541babecc9e6d41e
https://github.com/Dolibarr/dolibarr/commit/d0c3a7913f9c0d42acc2dfa1541babecc9e6d41e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
Commit: 8c728ac63824f4f388d1447de7437d2c4e3252f4
https://github.com/Dolibarr/dolibarr/commit/8c728ac63824f4f388d1447de7437d2c4e3252f4
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix: bad regex syntax
Commit: 1239e713c910141d37aa94a16618909d5bf0adea
https://github.com/Dolibarr/dolibarr/commit/1239e713c910141d37aa94a16618909d5bf0adea
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: Missing join into request.
Commit: de76fe4951f60268eec2c1c72bebba3abc64f89e
https://github.com/Dolibarr/dolibarr/commit/de76fe4951f60268eec2c1c72bebba3abc64f89e
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: Missing join into request.
Conflicts:
htdocs/compta/facture.php
Commit: 69888aa569c1ad6c4761cbf039c294029cf93743
https://github.com/Dolibarr/dolibarr/commit/69888aa569c1ad6c4761cbf039c294029cf93743
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: get_full_tree was not working correctly.
Commit: 159d0c70578e99a0cabdb2634913fcc05eba7973
https://github.com/Dolibarr/dolibarr/commit/159d0c70578e99a0cabdb2634913fcc05eba7973
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix: get_full_tree was not working correctly.
Commit: e8ffb0dacf7ec142af7dbdbd1035dbe56ea928a7
https://github.com/Dolibarr/dolibarr/commit/e8ffb0dacf7ec142af7dbdbd1035dbe56ea928a7
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Fix: sql error on editing project with pgsql.
Fix: Error management on project edit.
Commit: c52794ce7f06c7ffadbb2ef1927117137de0f2d5
https://github.com/Dolibarr/dolibarr/commit/c52794ce7f06c7ffadbb2ef1927117137de0f2d5
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/projet/class/project.class.php
Commit: 91aabbb40e766c8809e96dce4219e26e67a549f4
https://github.com/Dolibarr/dolibarr/commit/91aabbb40e766c8809e96dce4219e26e67a549f4
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
M htdocs/core/lib/project.lib.php
M htdocs/projet/activity/list.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/main.inc.php
Commit: bceb72a9d107e59f04b3c03b37a12bd38101a07d
https://github.com/Dolibarr/dolibarr/commit/bceb72a9d107e59f04b3c03b37a12bd38101a07d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M htdocs/projet/activity/index.php
Log Message:
-----------
Fix: Missing line total
Commit: 42d992b0090cfabf6f19d0fd90cf119d9f354ee9
https://github.com/Dolibarr/dolibarr/commit/42d992b0090cfabf6f19d0fd90cf119d9f354ee9
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M ChangeLog
M build/exe/doliwamp/doliwamp.iss
M htdocs/compta/facture.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/project.lib.php
M htdocs/fourn/facture/fiche.php
M htdocs/projet/activity/index.php
M htdocs/projet/activity/list.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7d09b4b45c4a...42d992b0090c