[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] faa5eb: Fix: Substitution for externa
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] faa5eb: Fix: Substitution for external module at wrong pla... |
|
Date: |
Sat, 05 Jul 2014 02:54:18 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: faa5eba2033ae5b445309eb0d75ee0545a24a0e5
https://github.com/Dolibarr/dolibarr/commit/faa5eba2033ae5b445309eb0d75ee0545a24a0e5
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
Log Message:
-----------
Fix: Substitution for external module at wrong place.
Commit: fa82cbceb9a661af0bbea51baf2a814f5d3587e5
https://github.com/Dolibarr/dolibarr/commit/fa82cbceb9a661af0bbea51baf2a814f5d3587e5
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Qual: Removed useless function
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: 292141263499ab029b16de565c678ff360390aed
https://github.com/Dolibarr/dolibarr/commit/292141263499ab029b16de565c678ff360390aed
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:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: e5d5a25433720c2041457fab4b2b6d66984fac6d
https://github.com/Dolibarr/dolibarr/commit/e5d5a25433720c2041457fab4b2b6d66984fac6d
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-05 (Sat, 05 Jul 2014)
Changed paths:
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.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.6' into develop
Conflicts:
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b4bffb902ff9...e5d5a2543372