[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f8e156: FIX: Email templates not comp
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f8e156: FIX: Email templates not compatible with Multicomp... |
|
Date: |
Thu, 21 Jan 2016 18:19:06 -0800 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
Commit: f8e156ea3077eddbd9bfce237c947e5b7217b6c1
https://github.com/Dolibarr/dolibarr/commit/f8e156ea3077eddbd9bfce237c947e5b7217b6c1
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: cebb996120064713c6a8975e0282883b7bfbacb7
https://github.com/Dolibarr/dolibarr/commit/cebb996120064713c6a8975e0282883b7bfbacb7
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
https://github.com/Dolibarr/dolibarr/commit/cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
Author: fmarcet <address@hidden>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: d8360a2a0169886c3c9be771202be480db12b534
https://github.com/Dolibarr/dolibarr/commit/d8360a2a0169886c3c9be771202be480db12b534
Author: fmarcet <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: 40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
https://github.com/Dolibarr/dolibarr/commit/40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4321 from fmarcet/3.7
FIX: Email templates not compatible with Multicompany
Commit: 801e2bca4b4b844c419889b03b7eba0e1d34d3bf
https://github.com/Dolibarr/dolibarr/commit/801e2bca4b4b844c419889b03b7eba0e1d34d3bf
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix #4239
Commit: 861376e4613b9cf8d7e69203536314457330c1da
https://github.com/Dolibarr/dolibarr/commit/861376e4613b9cf8d7e69203536314457330c1da
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/admin/dict.php
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7
Commit: 79992b494793747a54a0cba8d26c5fc1f1599f55
https://github.com/Dolibarr/dolibarr/commit/79992b494793747a54a0cba8d26c5fc1f1599f55
Author: fmarcet <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
FIX: The third dashboard don't consider user permissions
Commit: 947f718329b436a5190886984f1370fa9f47d25d
https://github.com/Dolibarr/dolibarr/commit/947f718329b436a5190886984f1370fa9f47d25d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
Merge pull request #4408 from fmarcet/3.7
FIX: The third dashboard don't consider user permissions
Commit: cbd01bae49eb05e927cde290d3e47dd0678780e3
https://github.com/Dolibarr/dolibarr/commit/cbd01bae49eb05e927cde290d3e47dd0678780e3
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/societe/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/56a4466b5b97...cbd01bae49eb