[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1c2c1f: Update codesniffer to remove
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1c2c1f: Update codesniffer to remove travis errors. |
|
Date: |
Thu, 25 Dec 2014 19:17:13 -0800 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 1c2c1ff3d877d31d12d870d319a7318a9e18e4f5
https://github.com/Dolibarr/dolibarr/commit/1c2c1ff3d877d31d12d870d319a7318a9e18e4f5
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-19 (Fri, 19 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Update codesniffer to remove travis errors.
Commit: 748bef6134a5f663c71fe409f4490a2caf04f8d2
https://github.com/Dolibarr/dolibarr/commit/748bef6134a5f663c71fe409f4490a2caf04f8d2
Author: Frédéric FRANCE <address@hidden>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Translation error
Commit: 46fe2c67e0a5ce2dbf82ba4b420154e1ae4d5940
https://github.com/Dolibarr/dolibarr/commit/46fe2c67e0a5ce2dbf82ba4b420154e1ae4d5940
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
Commit: db301863867d9f1c48020a0897d9079e3e361358
https://github.com/Dolibarr/dolibarr/commit/db301863867d9f1c48020a0897d9079e3e361358
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs
Commit: 56eddeade17904ddd5eb55dc6f0b23cc4a152d39
https://github.com/Dolibarr/dolibarr/commit/56eddeade17904ddd5eb55dc6f0b23cc4a152d39
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge changelog
Commit: 3212fd2b27973d248e8ab7e36746a7ee63186a94
https://github.com/Dolibarr/dolibarr/commit/3212fd2b27973d248e8ab7e36746a7ee63186a94
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/comm/fiche.php
M htdocs/fourn/fiche.php
Log Message:
-----------
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same
thing as modify
Commit: a90a03412ab292966f8c02baa9ee2743ac3a9824
https://github.com/Dolibarr/dolibarr/commit/a90a03412ab292966f8c02baa9ee2743ac3a9824
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Fixed string not translated in linked objects of a project
Commit: 78307a748dc3c66e1855ccf3aa50258201ad6654
https://github.com/Dolibarr/dolibarr/commit/78307a748dc3c66e1855ccf3aa50258201ad6654
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M htdocs/langs/en_US/projects.lang
M htdocs/projet/tasks/index.php
Log Message:
-----------
Corrected confusing table header in task list
Commit: 743867b91b8305eed0125acb9328355ffc169a5a
https://github.com/Dolibarr/dolibarr/commit/743867b91b8305eed0125acb9328355ffc169a5a
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M htdocs/langs/es_ES/projects.lang
Log Message:
-----------
Spanish translation
Commit: 416f13c708cbfbff3e0ff0e1997867e3b37b9a0e
https://github.com/Dolibarr/dolibarr/commit/416f13c708cbfbff3e0ff0e1997867e3b37b9a0e
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/margin/agentMargins.php
Log Message:
-----------
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead
of 00H
Commit: c4a6377af53759a954309a4702444d10a182d0be
https://github.com/Dolibarr/dolibarr/commit/c4a6377af53759a954309a4702444d10a182d0be
Author: Juanjo Menent <address@hidden>
Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge pull request #2169 from marcosgdf/bug-1736
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
Commit: 82fa3a447bb7eca470dd2b7fb614703f3a7204e6
https://github.com/Dolibarr/dolibarr/commit/82fa3a447bb7eca470dd2b7fb614703f3a7204e6
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge branch '3.6' into translation
Commit: c050fe2a271d36c63cc6c6b2928d48d49679f849
https://github.com/Dolibarr/dolibarr/commit/c050fe2a271d36c63cc6c6b2928d48d49679f849
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge branch '3.6' into bug-1649
Conflicts:
ChangeLog
Commit: 33045668cd926635caee8c028f3568b29298186d
https://github.com/Dolibarr/dolibarr/commit/33045668cd926635caee8c028f3568b29298186d
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths:
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Merge pull request #2168 from frederic34/patch-5
Translation error
Commit: 224fa14e168ed9597270d44d617486e35d3bb2a2
https://github.com/Dolibarr/dolibarr/commit/224fa14e168ed9597270d44d617486e35d3bb2a2
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge branch 'bug-1731' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1731
Conflicts:
ChangeLog
Commit: 6c67df0698c592ef93cf2803479c692913c45375
https://github.com/Dolibarr/dolibarr/commit/6c67df0698c592ef93cf2803479c692913c45375
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1731' into 3.6
Commit: f3fded2a0a214b0da6711bcc2750e65cb8a86d56
https://github.com/Dolibarr/dolibarr/commit/f3fded2a0a214b0da6711bcc2750e65cb8a86d56
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/comm/fiche.php
M htdocs/fourn/fiche.php
Log Message:
-----------
Merge pull request #2171 from marcosgdf/bug-1649
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same
thing as modify
Commit: f4def9ea288c0677117087f883e1625a01b1f358
https://github.com/Dolibarr/dolibarr/commit/f4def9ea288c0677117087f883e1625a01b1f358
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains
numbers
Commit: 1d39c1acc22fdd7d2767fea7061b24b3242477d6
https://github.com/Dolibarr/dolibarr/commit/1d39c1acc22fdd7d2767fea7061b24b3242477d6
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server
in install script
Commit: 8e47fe9e1c0d6983fdffcab77d927c3528dda030
https://github.com/Dolibarr/dolibarr/commit/8e47fe9e1c0d6983fdffcab77d927c3528dda030
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/product/popuprop.php
Log Message:
-----------
Fix: [ bug #1757 ] Sorting breaks product/service statistics
Commit: b2d27a7d25d460a826469de0ddaec9c49240bd53
https://github.com/Dolibarr/dolibarr/commit/b2d27a7d25d460a826469de0ddaec9c49240bd53
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #2173 from marcosgdf/translation
Fixed string not translated in linked objects of a project
Commit: ade688b58948d62e9cb242a5706a25dbe1ed8842
https://github.com/Dolibarr/dolibarr/commit/ade688b58948d62e9cb242a5706a25dbe1ed8842
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/langs/en_US/projects.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/projet/tasks/index.php
Log Message:
-----------
Merge pull request #2174 from marcosgdf/bug-1723
Fix [ bug #1723 ] Draft tasks?
Commit: f31bf5d80e54b9c432fa6afa1cbd47e4fd589dc4
https://github.com/Dolibarr/dolibarr/commit/f31bf5d80e54b9c432fa6afa1cbd47e4fd589dc4
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/margin/agentMargins.php
Log Message:
-----------
Merge pull request #2175 from marcosgdf/bug-1752
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of
00H
Commit: 83e34a1c4e6614304cd249f22f373fbe51186951
https://github.com/Dolibarr/dolibarr/commit/83e34a1c4e6614304cd249f22f373fbe51186951
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1769' into 3.5
Commit: 4e2c321e4d2cafe193ee0c4a0882f2f3ac863f8b
https://github.com/Dolibarr/dolibarr/commit/4e2c321e4d2cafe193ee0c4a0882f2f3ac863f8b
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/margin/agentMargins.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: 38c9d39c2bddf3fda99ae0ed66bdb97adf9fead6
https://github.com/Dolibarr/dolibarr/commit/38c9d39c2bddf3fda99ae0ed66bdb97adf9fead6
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/product/popuprop.php
Log Message:
-----------
Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1757
Conflicts:
ChangeLog
Commit: 882fd9a7982bd0d4ec0e943292dbf6c423364c0d
https://github.com/Dolibarr/dolibarr/commit/882fd9a7982bd0d4ec0e943292dbf6c423364c0d
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/product/popuprop.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1757' into 3.5
Commit: 77e48f8c3e2d69aba8898f37384a69c731483686
https://github.com/Dolibarr/dolibarr/commit/77e48f8c3e2d69aba8898f37384a69c731483686
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1768
Commit: 490b0c5f3ad7eb44070b00b221e42577a13bd7ef
https://github.com/Dolibarr/dolibarr/commit/490b0c5f3ad7eb44070b00b221e42577a13bd7ef
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1768' into 3.5
Commit: d18770c1e7afe904d6cb3d5b968e57e26e5ecb0d
https://github.com/Dolibarr/dolibarr/commit/d18770c1e7afe904d6cb3d5b968e57e26e5ecb0d
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/db/pgsql.class.php
M htdocs/margin/agentMargins.php
M htdocs/product/popuprop.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: bce9e08f2588721830341c5fcd890bcf064c8e83
https://github.com/Dolibarr/dolibarr/commit/bce9e08f2588721830341c5fcd890bcf064c8e83
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/comm/fiche.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/fourn/fiche.php
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/margin/agentMargins.php
M htdocs/product/popuprop.php
M htdocs/projet/element.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/index.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/49e167e8b8ae...bce9e08f2588