[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 565fb6: Update gitignore
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 565fb6: Update gitignore |
|
Date: |
Sat, 14 Dec 2013 17:52:30 -0800 |
Branch: refs/heads/3.4_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 565fb615bce7f32a7b6b7c6611298598ce24afa1
https://github.com/Dolibarr/dolibarr/commit/565fb615bce7f32a7b6b7c6611298598ce24afa1
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-08 (Sun, 08 Dec 2013)
Changed paths:
M htdocs/.gitignore
Log Message:
-----------
Update gitignore
Commit: a89a4ee81ab747fd2d5326b006dcdbb9fa188182
https://github.com/Dolibarr/dolibarr/commit/a89a4ee81ab747fd2d5326b006dcdbb9fa188182
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M htdocs/compta/tva/fiche.php
Log Message:
-----------
Fix: Delete vat entry when bank line was already deleted.
Commit: d226abcdfcfd162c19340180694e56c03f5fab30
https://github.com/Dolibarr/dolibarr/commit/d226abcdfcfd162c19340180694e56c03f5fab30
Author: Marcos García de La Fuente <address@hidden>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Corrected translation
Commit: 0247241277978d9a6255b2d5da3192d34b8e72a4
https://github.com/Dolibarr/dolibarr/commit/0247241277978d9a6255b2d5da3192d34b8e72a4
Author: Regis Houssin <address@hidden>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M htdocs/core/filemanagerdol/connectors/php/config.php
Log Message:
-----------
Fix: wrong path with multicompany module
Commit: 88aa0ad4dae425ddfa15b38b1f63ba2286e1370a
https://github.com/Dolibarr/dolibarr/commit/88aa0ad4dae425ddfa15b38b1f63ba2286e1370a
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M build/doxygen/doxygen_footer.html
M htdocs/admin/agenda_other.php
M htdocs/cashdesk/deconnexion.php
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/validation.php
M htdocs/cashdesk/validation_ok.php
M htdocs/cashdesk/validation_ticket.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Fix: Doxygen problems
Commit: b83f664cedd8c2053468c658082270b42aec1515
https://github.com/Dolibarr/dolibarr/commit/b83f664cedd8c2053468c658082270b42aec1515
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/core/filemanagerdol/connectors/php/config.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 1f3f6cc7b882789336e1e5dad083cdd396980f6f
https://github.com/Dolibarr/dolibarr/commit/1f3f6cc7b882789336e1e5dad083cdd396980f6f
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix: Avoid to have external package into standard distribution
Commit: 4d84fc46a4084911319df3f96b9de15f9e4fef73
https://github.com/Dolibarr/dolibarr/commit/4d84fc46a4084911319df3f96b9de15f9e4fef73
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/makepack-dolibarr.pl
Commit: ad0d79a8317071215bb70a12d8edc41a843ad98f
https://github.com/Dolibarr/dolibarr/commit/ad0d79a8317071215bb70a12d8edc41a843ad98f
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Merge pull request #1346 from marcosgdf/translation
Corrected translation
Commit: 6cc20cb731dcd7c2d1e0b384d8ce1f79d4fdb7fb
https://github.com/Dolibarr/dolibarr/commit/6cc20cb731dcd7c2d1e0b384d8ce1f79d4fdb7fb
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-14 (Sat, 14 Dec 2013)
Changed paths:
M htdocs/comm/list.php
M htdocs/comm/prospect/list.php
M htdocs/fourn/liste.php
Log Message:
-----------
Fix: Filter on third parties were wrong for external users.
Commit: 7ecb313798d8f206eb48afcd93b3b1c3c71f8d8c
https://github.com/Dolibarr/dolibarr/commit/7ecb313798d8f206eb48afcd93b3b1c3c71f8d8c
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-14 (Sat, 14 Dec 2013)
Changed paths:
M htdocs/societe/note.php
Log Message:
-----------
Fix: [ bug #1175 ] lien incorrect dans l'onglet Note d'un tiers
Commit: 8cd538cce4326ca8a0fbb3a1e7d6001ec746c0b8
https://github.com/Dolibarr/dolibarr/commit/8cd538cce4326ca8a0fbb3a1e7d6001ec746c0b8
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-14 (Sat, 14 Dec 2013)
Changed paths:
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 648bf73bac5cf8a6ed14fde9e71886b51559f6af
https://github.com/Dolibarr/dolibarr/commit/648bf73bac5cf8a6ed14fde9e71886b51559f6af
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-14 (Sat, 14 Dec 2013)
Changed paths:
M htdocs/commande/liste.php
Log Message:
-----------
Fix: [ bug #1179 ] Wrong warnings on commande/liste.php / delivery date
should be checked
Conflicts:
htdocs/commande/liste.php
Commit: db9ef992eb5c531b6bb7fa288c11727b01e2ab0e
https://github.com/Dolibarr/dolibarr/commit/db9ef992eb5c531b6bb7fa288c11727b01e2ab0e
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-14 (Sat, 14 Dec 2013)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix: Clean var
Commit: 947348981b3d4ea81122fba8f96f13c4a8471723
https://github.com/Dolibarr/dolibarr/commit/947348981b3d4ea81122fba8f96f13c4a8471723
Author: Laurent Destailleur <address@hidden>
Date: 2013-12-14 (Sat, 14 Dec 2013)
Changed paths:
M build/doxygen/doxygen_footer.html
M build/makepack-dolibarr.pl
M htdocs/admin/agenda_other.php
M htdocs/cashdesk/deconnexion.php
M htdocs/cashdesk/facturation_dhtml.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/validation.php
M htdocs/cashdesk/validation_ok.php
M htdocs/cashdesk/validation_ticket.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/list.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/comm/prospect/list.php
M htdocs/commande/liste.php
M htdocs/core/filemanagerdol/connectors/php/config.php
M htdocs/fourn/liste.php
M htdocs/langs/en_US/bills.lang
M htdocs/societe/note.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.4_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/30ffa3435cd3...947348981b3d