[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] fe547d: Fix: Removed duplicate lines
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] fe547d: Fix: Removed duplicate lines |
|
Date: |
Mon, 14 Jul 2014 15:08:35 -0700 |
Branch: refs/heads/3.5_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: fe547de0e3572c24a9e5c20a290daf8be0ba34ae
https://github.com/Dolibarr/dolibarr/commit/fe547de0e3572c24a9e5c20a290daf8be0ba34ae
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
Log Message:
-----------
Fix: Removed duplicate lines
Commit: dec4ff2e199621c5ac6eb8b5ddff971a6f02168d
https://github.com/Dolibarr/dolibarr/commit/dec4ff2e199621c5ac6eb8b5ddff971a6f02168d
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M scripts/members/sync_members_dolibarr2ldap.php
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
Log Message:
-----------
Fix: Duplicate confirmation
Commit: 4d9f78dc07d8df31d3ab58897cc1b7fdb8f4c9b8
https://github.com/Dolibarr/dolibarr/commit/4d9f78dc07d8df31d3ab58897cc1b7fdb8f4c9b8
Author: BENKE Charles <address@hidden>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
getlibstatut added
Add function getlibstatut and libstatut on task (fk_statut allready present on
project_task table)
Commit: 96ec3ad7f4b0e5ddbc457a3720df97773ef75b6f
https://github.com/Dolibarr/dolibarr/commit/96ec3ad7f4b0e5ddbc457a3720df97773ef75b6f
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-07 (Mon, 07 Jul 2014)
Changed paths:
M htdocs/core/class/doleditor.class.php
Log Message:
-----------
Fix: Allow percent to solve presentation pb by some pages.
Commit: 41dc0681c62dcfcbfb2c4c66efdbe5764ff381be
https://github.com/Dolibarr/dolibarr/commit/41dc0681c62dcfcbfb2c4c66efdbe5764ff381be
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge pull request #1715 from defrance69/patch-5
getlibstatut added
Commit: 6c8c23203632ddde0620c73b99f433dd069e9532
https://github.com/Dolibarr/dolibarr/commit/6c8c23203632ddde0620c73b99f433dd069e9532
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: Solve timeout pb.
Commit: 0eabf26d270a87e5c0634fe7467bed662cea90c1
https://github.com/Dolibarr/dolibarr/commit/0eabf26d270a87e5c0634fe7467bed662cea90c1
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Fix: Checkstyle
Commit: 6d83882a5d355b0c3b6a09a4e8047ff039e5505f
https://github.com/Dolibarr/dolibarr/commit/6d83882a5d355b0c3b6a09a4e8047ff039e5505f
Author: Alexis Algoud <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
FIX : Bad rank when a bill was made by multiple orders
Commit: 869bde5fb0e9daa44e9688761aff2199810183b9
https://github.com/Dolibarr/dolibarr/commit/869bde5fb0e9daa44e9688761aff2199810183b9
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: Ignore vagrant dir into CI
Conflicts:
.travis.yml
Commit: 0598bb611429f53d8cf2d05ab312f2b61f05f73b
https://github.com/Dolibarr/dolibarr/commit/0598bb611429f53d8cf2d05ab312f2b61f05f73b
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: travis file for 3.5
Commit: 3f23b116c6a5f58d4fad3b9b1f0acb8408066382
https://github.com/Dolibarr/dolibarr/commit/3f23b116c6a5f58d4fad3b9b1f0acb8408066382
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un
projet
Commit: 7d77772820307ada5407807da695f63514b00b71
https://github.com/Dolibarr/dolibarr/commit/7d77772820307ada5407807da695f63514b00b71
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
changelog
Commit: 13cc8620b2075e0845defe91a6eaf25f361b09d3
https://github.com/Dolibarr/dolibarr/commit/13cc8620b2075e0845defe91a6eaf25f361b09d3
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #1732 from FHenry/3.5
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un projet
Commit: 0cba9b8fae2a9e58f35661f393b5f09df6f971c1
https://github.com/Dolibarr/dolibarr/commit/0cba9b8fae2a9e58f35661f393b5f09df6f971c1
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #1726 from atm-alexis/3.5
FIX : Bad rank when a bill was made by multiple orders
Commit: ff5ea31452e1796ba2022cf73915e42f417d2139
https://github.com/Dolibarr/dolibarr/commit/ff5ea31452e1796ba2022cf73915e42f417d2139
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
Log Message:
-----------
Fix: Date error
Commit: b9df48d48c72558aff58d826158e42fc6cb774c3
https://github.com/Dolibarr/dolibarr/commit/b9df48d48c72558aff58d826158e42fc6cb774c3
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/core/class/cookie.class.php
Log Message:
-----------
Fix
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
Commit: 4bc8e026b69b58becd91bc924d1cf4a0755824c6
https://github.com/Dolibarr/dolibarr/commit/4bc8e026b69b58becd91bc924d1cf4a0755824c6
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-13 (Sun, 13 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
[ bug #1526 ] Thumbs of files uploaded with dots in their names do not load
correctly
Commit: b0ae2fe2aaf069a4a9893d09ae3d588742862318
https://github.com/Dolibarr/dolibarr/commit/b0ae2fe2aaf069a4a9893d09ae3d588742862318
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Fixed a bug introduced in commit 0916d2cf3b
Commit: 3930c8829ef5a8cb6e305ca2d828e4f4a019525c
https://github.com/Dolibarr/dolibarr/commit/3930c8829ef5a8cb6e305ca2d828e4f4a019525c
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: 3816e0fe1485bdbe73cdf29b340a5c40ebf0e749
https://github.com/Dolibarr/dolibarr/commit/3816e0fe1485bdbe73cdf29b340a5c40ebf0e749
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: 0bfc90ee9a14cc703fcb7e22e986a8872eca5ea0
https://github.com/Dolibarr/dolibarr/commit/0bfc90ee9a14cc703fcb7e22e986a8872eca5ea0
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #1744 from marcosgdf/bug-linkedprojects
Fixed a bug introduced in commit 0916d2cf3b
Commit: d02df05ab869dbd5b6d22ad31ccd89303f24bf3b
https://github.com/Dolibarr/dolibarr/commit/d02df05ab869dbd5b6d22ad31ccd89303f24bf3b
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1526' into 3.5
Commit: f55814e3b27e0f34f15a1189f98456338bea8e96
https://github.com/Dolibarr/dolibarr/commit/f55814e3b27e0f34f15a1189f98456338bea8e96
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/modSociete.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: 32a6d59b64160158457a79a2546aa5946439ccdd
https://github.com/Dolibarr/dolibarr/commit/32a6d59b64160158457a79a2546aa5946439ccdd
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/class/cookie.class.php
Log Message:
-----------
Merge pull request #1734 from FHenry/3.5
Fix
Commit: 2cf9a7511b5dff15775a90d4c03262c3bf456743
https://github.com/Dolibarr/dolibarr/commit/2cf9a7511b5dff15775a90d4c03262c3bf456743
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Add date of file so we know if file was correctly build before
publishing it.
Commit: 25f12590617896e2ed637b20ff44b701da7f20ad
https://github.com/Dolibarr/dolibarr/commit/25f12590617896e2ed637b20ff44b701da7f20ad
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/class/cookie.class.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 64b14a96e0f8763c80039a58d1dc3a69733979bf
https://github.com/Dolibarr/dolibarr/commit/64b14a96e0f8763c80039a58d1dc3a69733979bf
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-15 (Tue, 15 Jul 2014)
Changed paths:
M .travis.yml
M ChangeLog
M build/makepack-dolibarr.pl
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/commande/orderstoinvoice.php
M htdocs/core/class/cookie.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
M scripts/members/sync_members_dolibarr2ldap.php
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.5_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/6fe39cab8be8...64b14a96e0f8