[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] e801b5: FIX : Delete tasks on project
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] e801b5: FIX : Delete tasks on project delete will now trig... |
|
Date: |
Mon, 19 Mar 2018 09:58:34 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: e801b5a4313cf3b807dec7165bd4fdc484d420c0
https://github.com/Dolibarr/dolibarr/commit/e801b5a4313cf3b807dec7165bd4fdc484d420c0
Author: ATM-Nicolas <address@hidden>
Date: 2018-03-14 (Wed, 14 Mar 2018)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
FIX : Delete tasks on project delete will now trigger TASK_DELETE
Commit: f3be6045f9dcf356f678ff79002fc85f8ca71ed8
https://github.com/Dolibarr/dolibarr/commit/f3be6045f9dcf356f678ff79002fc85f8ca71ed8
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge pull request #8385 from ATM-Nicolas/fix_project_delete_task
FIX : Delete tasks on project delete will now trigger TASK_DELETE
Commit: 9f62ddaf36c89dcfe3514479b444096cb1a964f7
https://github.com/Dolibarr/dolibarr/commit/9f62ddaf36c89dcfe3514479b444096cb1a964f7
Author: Regis Houssin <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/install/step5.php
Log Message:
-----------
Fix: missing update of $conf
Commit: 6e585869c77ae5996d607e1e6552c18f17ba717e
https://github.com/Dolibarr/dolibarr/commit/6e585869c77ae5996d607e1e6552c18f17ba717e
Author: Regis Houssin <address@hidden>
Date: 2018-03-15 (Thu, 15 Mar 2018)
Changed paths:
M htdocs/install/step5.php
Log Message:
-----------
Fix: better method for avoid lost global
Commit: 32ce42610a23d03ea9e894a905677864945218a1
https://github.com/Dolibarr/dolibarr/commit/32ce42610a23d03ea9e894a905677864945218a1
Author: arnaud <address@hidden>
Date: 2018-03-16 (Fri, 16 Mar 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX show status on societe banner
Commit: c0a6ae2195b1077fc68f1a7f52fd1ece09408df8
https://github.com/Dolibarr/dolibarr/commit/c0a6ae2195b1077fc68f1a7f52fd1ece09408df8
Author: Regis Houssin <address@hidden>
Date: 2018-03-16 (Fri, 16 Mar 2018)
Changed paths:
M htdocs/install/step5.php
Log Message:
-----------
Fix: replace with dolibarr_install_syslog
Commit: 0dd33440d18b47911f2974436bdf3cd25202c6d7
https://github.com/Dolibarr/dolibarr/commit/0dd33440d18b47911f2974436bdf3cd25202c6d7
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M htdocs/install/step5.php
Log Message:
-----------
Merge pull request #8397 from hregis/7.0_bug3
Fix: missing update of $conf
Commit: f371f80de3c664567625be87a1c67ef4e4480cb4
https://github.com/Dolibarr/dolibarr/commit/f371f80de3c664567625be87a1c67ef4e4480cb4
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #8400 from atm-arnaud/6.0_fix_societe_banner_status
FIX show status on societe banner
Commit: b4881645d8ec61c9588dd4ee24622924ac5bc25a
https://github.com/Dolibarr/dolibarr/commit/b4881645d8ec61c9588dd4ee24622924ac5bc25a
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/functions.lib.php
Commit: 99ac06b0b868c3b45d1d54b4e9839db73c72a3b2
https://github.com/Dolibarr/dolibarr/commit/99ac06b0b868c3b45d1d54b4e9839db73c72a3b2
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M htdocs/install/step5.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: e55c90b0151af1d7b7d7abe72523bad136c527d7
https://github.com/Dolibarr/dolibarr/commit/e55c90b0151af1d7b7d7abe72523bad136c527d7
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/margins.lang
Log Message:
-----------
Fix translation
Commit: 8e50e63243a47dc1b35e5433c8de5185593407d1
https://github.com/Dolibarr/dolibarr/commit/8e50e63243a47dc1b35e5433c8de5185593407d1
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-18 (Sun, 18 Mar 2018)
Changed paths:
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Fix translation
Commit: 8e72ddc89bbd4e668211e41858c61f919c3934f6
https://github.com/Dolibarr/dolibarr/commit/8e72ddc89bbd4e668211e41858c61f919c3934f6
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/public/payment/newpayment.php
M htdocs/public/stripe/newpayment.php
Log Message:
-----------
FIX missing email of customer in stripe info payments
Commit: 0013e9d83bdb437b4c63e8c7eb3ea2e50d9fba6f
https://github.com/Dolibarr/dolibarr/commit/0013e9d83bdb437b4c63e8c7eb3ea2e50d9fba6f
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/core/actions_builddoc.inc.php
Log Message:
-----------
FIX Make a redirect after the remove_file action to avoid deletion done
at next action too.
Commit: 890d0b6685b424fb1a8d0a864cda9a3679467c2e
https://github.com/Dolibarr/dolibarr/commit/890d0b6685b424fb1a8d0a864cda9a3679467c2e
Author: Regis Houssin <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Fix: replace ldaps:// by ssl://
Commit: eb7886ecff7ed8ca0bb09a89ed79d7fc1c7f048c
https://github.com/Dolibarr/dolibarr/commit/eb7886ecff7ed8ca0bb09a89ed79d7fc1c7f048c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Update ldap.class.php
Commit: 13801a0d93c833b3c8213f1858290cb53f9f3277
https://github.com/Dolibarr/dolibarr/commit/13801a0d93c833b3c8213f1858290cb53f9f3277
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Merge pull request #8417 from hregis/7.0_bug3
Fix: replace ldaps:// by ssl://
Commit: 8889e7f4b2111b4fde4a861ce4a2fa4c9858b17c
https://github.com/Dolibarr/dolibarr/commit/8889e7f4b2111b4fde4a861ce4a2fa4c9858b17c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/holiday/card.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/list.php
M htdocs/holiday/view_log.php
M htdocs/langs/en_US/holiday.lang
Log Message:
-----------
FIX translation of holiday types
Commit: ac9ab7b2289138c417f8c3af570feca548d165f2
https://github.com/Dolibarr/dolibarr/commit/ac9ab7b2289138c417f8c3af570feca548d165f2
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/core/class/ldap.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: eb03fb75406e2ecdd6246ba5fbab08e3992c9b92
https://github.com/Dolibarr/dolibarr/commit/eb03fb75406e2ecdd6246ba5fbab08e3992c9b92
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/holiday/card.php
M htdocs/langs/en_US/holiday.lang
Log Message:
-----------
Fix trad/compatibility
Commit: e0164884ee285eac2bb6d4c56874075426cc15ff
https://github.com/Dolibarr/dolibarr/commit/e0164884ee285eac2bb6d4c56874075426cc15ff
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/holiday/card.php
M htdocs/hrm/index.php
Log Message:
-----------
Better management of hidden option HOLIDAY_HIDE_BALANCE
Commit: 91cc3d1b73ed567bc5f429b0312e7f6fcd6946d3
https://github.com/Dolibarr/dolibarr/commit/91cc3d1b73ed567bc5f429b0312e7f6fcd6946d3
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
FIX navigation and filters on holiday list
Commit: 73eba9175640a3588932f9a96518beed845a29c4
https://github.com/Dolibarr/dolibarr/commit/73eba9175640a3588932f9a96518beed845a29c4
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/langs/en_US/trips.lang
Log Message:
-----------
Fix translation of email message
Commit: ee3dcb724fe98c683812b0992b1b2df101f2ffdf
https://github.com/Dolibarr/dolibarr/commit/ee3dcb724fe98c683812b0992b1b2df101f2ffdf
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
FIX email use the validate user instead of approver in holiday approval
email.
Commit: 14e80948b808cdc47e248ccf73e634c44f34991c
https://github.com/Dolibarr/dolibarr/commit/14e80948b808cdc47e248ccf73e634c44f34991c
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
FIX approval date was not visible if leave was canceled after
Commit: 0c45760dd446cdb55af3005b33297f9d3011b4d3
https://github.com/Dolibarr/dolibarr/commit/0c45760dd446cdb55af3005b33297f9d3011b4d3
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/ldap.class.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/list.php
M htdocs/holiday/view_log.php
M htdocs/hrm/index.php
M htdocs/install/step5.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/en_US/trips.lang
M htdocs/projet/class/project.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7272ee806ec6...0c45760dd446