[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7cc7e8: Fix ODT to PDF exec scripts p
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7cc7e8: Fix ODT to PDF exec scripts path |
|
Date: |
Fri, 21 Jun 2013 07:30:07 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7cc7e8392d8bdf09025724bd7a1336836c6329c4
https://github.com/Dolibarr/dolibarr/commit/7cc7e8392d8bdf09025724bd7a1336836c6329c4
Author: Florian Henry <address@hidden>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M htdocs/includes/odtphp/odf.php
Log Message:
-----------
Fix ODT to PDF exec scripts path
Commit: 83116b562776823307d91dfb1ef660b5f2567a80
https://github.com/Dolibarr/dolibarr/commit/83116b562776823307d91dfb1ef660b5f2567a80
Author: Florian Henry <address@hidden>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M htdocs/user/logout.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: dc5db0c1379903054e1ebc8462568005acbb2fea
https://github.com/Dolibarr/dolibarr/commit/dc5db0c1379903054e1ebc8462568005acbb2fea
Author: Florian Henry <address@hidden>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M htdocs/includes/odtphp/odf.php
Log Message:
-----------
fix ODT to PDF script path
Commit: cac7cbebd4e530a34873976297589d1a3eef60a9
https://github.com/Dolibarr/dolibarr/commit/cac7cbebd4e530a34873976297589d1a3eef60a9
Author: Florian Henry <address@hidden>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M htdocs/install/mysql/data/llx_const.sql
M htdocs/langs/en_US/exports.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/fr_FR/exports.lang
M htdocs/langs/fr_FR/mails.lang
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 08e0e8244a9172445cc74b20658c8a6ea06438cb
https://github.com/Dolibarr/dolibarr/commit/08e0e8244a9172445cc74b20658c8a6ea06438cb
Author: Florian Henry <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/contact/class/contact.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/search_page.php
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 835b8e9d7ed738dbcf1619be0a940c3a72bf46ef
https://github.com/Dolibarr/dolibarr/commit/835b8e9d7ed738dbcf1619be0a940c3a72bf46ef
Author: Florian Henry <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/langs/fr_FR/holiday.lang
Log Message:
-----------
Fix trad holidays
Commit: 035edc12ce48438b4ef5c1847e32ab0a572fc976
https://github.com/Dolibarr/dolibarr/commit/035edc12ce48438b4ef5c1847e32ab0a572fc976
Author: Florian Henry <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix [ bug #945 ] error adding a service
Commit: 6779724dc0e9568d7e5bb1ca2770ff77541aa52d
https://github.com/Dolibarr/dolibarr/commit/6779724dc0e9568d7e5bb1ca2770ff77541aa52d
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/includes/odtphp/odf.php
M htdocs/langs/fr_FR/holiday.lang
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #1055 from FHenry/3.4
Fix ODT to PDF exec scripts path
Commit: 9f396718869cc9ce99bfacd5696c50337be4cadb
https://github.com/Dolibarr/dolibarr/commit/9f396718869cc9ce99bfacd5696c50337be4cadb
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/langs/fr_FR/admin.lang
Log Message:
-----------
Fix: Bad translation
Commit: aaad4d3474c75bcdf5ec8408e88f462ee6b4d380
https://github.com/Dolibarr/dolibarr/commit/aaad4d3474c75bcdf5ec8408e88f462ee6b4d380
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: Menu cheque depends on bank module and not invoice.
Commit: c0b4ff36167773722115e85177d7c5b14d24206e
https://github.com/Dolibarr/dolibarr/commit/c0b4ff36167773722115e85177d7c5b14d24206e
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/includes/odtphp/odf.php
M htdocs/langs/fr_FR/holiday.lang
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: ec2e4c8a8ba855132ebc9f90858500988332b77c
https://github.com/Dolibarr/dolibarr/commit/ec2e4c8a8ba855132ebc9f90858500988332b77c
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: parenthesis at wrong place
Commit: f987fd2245ca132505eb0cce686ffc496c1bb840
https://github.com/Dolibarr/dolibarr/commit/f987fd2245ca132505eb0cce686ffc496c1bb840
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M htdocs/core/class/translate.class.php
Log Message:
-----------
Fix: Inconsistency arrays into php function
Commit: 66d02240f520b5281a06afaa7b012643097de0b2
https://github.com/Dolibarr/dolibarr/commit/66d02240f520b5281a06afaa7b012643097de0b2
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-20 (Thu, 20 Jun 2013)
Changed paths:
M htdocs/langs/en_US/opensurvey.lang
M htdocs/langs/fr_FR/opensurvey.lang
M htdocs/opensurvey/public/index.php
Log Message:
-----------
Fix: Missing translation
Commit: 4268ca0de21fa368b423f74fa5812a059d13528a
https://github.com/Dolibarr/dolibarr/commit/4268ca0de21fa368b423f74fa5812a059d13528a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-20 (Thu, 20 Jun 2013)
Changed paths:
M htdocs/opensurvey/public/create_survey.php
Log Message:
-----------
Missing space
Commit: a749e2bfaadfbfdb48d6086761aa9c5455314740
https://github.com/Dolibarr/dolibarr/commit/a749e2bfaadfbfdb48d6086761aa9c5455314740
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-20 (Thu, 20 Jun 2013)
Changed paths:
M htdocs/main.inc.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Still working on css debug. bureau2crea and cameleo are too
bugged. I disable them with jmobile to have things working correctly.
Conflicts:
htdocs/theme/bureau2crea/style.css.php
Commit: a1f9b22210d3be81e392557be6f7cff23c9e0809
https://github.com/Dolibarr/dolibarr/commit/a1f9b22210d3be81e392557be6f7cff23c9e0809
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-20 (Thu, 20 Jun 2013)
Changed paths:
A htdocs/theme/cameleo/img/menus/holiday.png
Log Message:
-----------
Fix: Missing icon
Commit: 7e748f26a671d445a14eb2d1fc05fba5b6196334
https://github.com/Dolibarr/dolibarr/commit/7e748f26a671d445a14eb2d1fc05fba5b6196334
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-20 (Thu, 20 Jun 2013)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix: all forms must react same way with option optimize_small_screen
Commit: 253ce19bc1165aa586e9e4de7201ee9fe198371c
https://github.com/Dolibarr/dolibarr/commit/253ce19bc1165aa586e9e4de7201ee9fe198371c
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-21 (Fri, 21 Jun 2013)
Changed paths:
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix: Bad position of field
Commit: 570275cd765eb9889b2370a15808317c3fb7f2b7
https://github.com/Dolibarr/dolibarr/commit/570275cd765eb9889b2370a15808317c3fb7f2b7
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-21 (Fri, 21 Jun 2013)
Changed paths:
M htdocs/core/lib/company.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/login.tpl.php
M htdocs/includes/odtphp/odf.php
M htdocs/langs/en_US/opensurvey.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/fr_FR/opensurvey.lang
M htdocs/main.inc.php
M htdocs/opensurvey/public/create_survey.php
M htdocs/opensurvey/public/index.php
M htdocs/product/class/product.class.php
A htdocs/theme/cameleo/img/menus/holiday.png
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/opensurvey.lang
htdocs/opensurvey/public/index.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/e2fe5ebcd966...570275cd765e