[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 9572ee: Check style
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 9572ee: Check style |
|
Date: |
Fri, 05 Apr 2013 14:00:44 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 9572eebae0538b923fe99b2a18cd9f4982814fc4
https://github.com/Dolibarr/dolibarr/commit/9572eebae0538b923fe99b2a18cd9f4982814fc4
Author: fhenry <address@hidden>
Date: 2013-04-02 (Tue, 02 Apr 2013)
Changed paths:
M htdocs/core/lib/json.lib.php
Log Message:
-----------
Check style
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde)
Commit: be01297403aa96f94210928e73c78e9fa66cf7c5
https://github.com/Dolibarr/dolibarr/commit/be01297403aa96f94210928e73c78e9fa66cf7c5
Author: fhenry <address@hidden>
Date: 2013-04-03 (Wed, 03 Apr 2013)
Changed paths:
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/propal.lang
Log Message:
-----------
Fix Ducth (nl_NL) translation
Commit: 5af232d9367aaa0a4be7aa318ab0d17847328407
https://github.com/Dolibarr/dolibarr/commit/5af232d9367aaa0a4be7aa318ab0d17847328407
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-04 (Thu, 04 Apr 2013)
Changed paths:
M htdocs/core/lib/json.lib.php
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/propal.lang
Log Message:
-----------
Merge pull request #797 from FHenry/3.3
Check style
Commit: 61b28274f7fa7ab1c491095acbdfa4749798bf0a
https://github.com/Dolibarr/dolibarr/commit/61b28274f7fa7ab1c491095acbdfa4749798bf0a
Author: juanjo <address@hidden>
Date: 2013-04-04 (Thu, 04 Apr 2013)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
[ bug #790 ] Spanish localtax RE not being correctly calculated
Commit: 992ec308d2d02bd35b83c850da15d02a58eb5f97
https://github.com/Dolibarr/dolibarr/commit/992ec308d2d02bd35b83c850da15d02a58eb5f97
Author: Simnandez <address@hidden>
Date: 2013-04-04 (Thu, 04 Apr 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update Changelog
Commit: ef5c03fc9922c217856d7066ef0dcd878c8032ae
https://github.com/Dolibarr/dolibarr/commit/ef5c03fc9922c217856d7066ef0dcd878c8032ae
Author: fhenry <address@hidden>
Date: 2013-04-04 (Thu, 04 Apr 2013)
Changed paths:
M htdocs/comm/action/fiche.php
Log Message:
-----------
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
Commit: 81b34f9918d3426b67a38ad13efe020856e12299
https://github.com/Dolibarr/dolibarr/commit/81b34f9918d3426b67a38ad13efe020856e12299
Author: fhenry <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M htdocs/comm/mailing/index.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/core/modules/mailings/contacts3.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/framboise.modules.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
Log Message:
-----------
Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page
mail
Commit: 09d1e56ca5e9d2e6d7baac708609de75581f1dd7
https://github.com/Dolibarr/dolibarr/commit/09d1e56ca5e9d2e6d7baac708609de75581f1dd7
Author: fhenry <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M htdocs/comm/prospect/list.php
Log Message:
-----------
Fix [ bug #794 ] Lost filter on zipwode in prospect list
Commit: 5736cf0144669a01c561bea4d6805b720ac4433d
https://github.com/Dolibarr/dolibarr/commit/5736cf0144669a01c561bea4d6805b720ac4433d
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #801 from simnandez/3.3
Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated
Commit: bbb0854517fe706c799f33f98fc6c16bc8f74fc4
https://github.com/Dolibarr/dolibarr/commit/bbb0854517fe706c799f33f98fc6c16bc8f74fc4
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M htdocs/comm/action/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/core/modules/mailings/contacts3.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/framboise.modules.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
Log Message:
-----------
Merge pull request #803 from FHenry/3.3
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
Commit: c10f2dd327e7cedae611e88eb02edde86191d266
https://github.com/Dolibarr/dolibarr/commit/c10f2dd327e7cedae611e88eb02edde86191d266
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M htdocs/comm/prospect/list.php
Log Message:
-----------
Merge pull request #807 from FHenry/3.3_bug794
Fix [ bug #794 ] Lost filter on zipwode in prospect list
Commit: 1cf2276584ae8752d5006b247459909a2ac5524d
https://github.com/Dolibarr/dolibarr/commit/1cf2276584ae8752d5006b247459909a2ac5524d
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-05 (Fri, 05 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/comm/action/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/prospect/list.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/core/modules/mailings/contacts3.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/framboise.modules.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/propal.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/comm/prospect/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/815bb82b0e55...1cf2276584ae