Laurent Destailleur
97c9d6bafc
Fix dos files
2014-09-07 12:28:58 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
789427b75d
Upgrade phpexcel lib to 1.7.8
2014-09-07 12:12:30 +02:00
Laurent Destailleur
f64cb085a7
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
Laurent Destailleur
c21b389462
Fix: Pb with focus position with ckeditor
2014-08-21 14:17:27 +02:00
Laurent Destailleur
f58da0fa73
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/langs/fr_FR/main.lang
2014-08-01 02:05:38 +02:00
Regis Houssin
977300c653
Fix: missing skin.js
2014-07-31 11:15:30 +02:00
frederic34
6645b8a454
Cannot redeclare getmypid()
2014-07-31 10:21:47 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Laurent Destailleur
bf96a78f63
Try a fix when timezone string is not standard
2014-07-04 13:07:53 +02:00
Laurent Destailleur
072aca0bd6
License violation: Missing source on min file.
2014-05-27 00:26:53 +02:00
Laurent Destailleur
7bfbc4cbf3
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/modExpedition.class.php
htdocs/projet/class/project.class.php
2014-05-07 19:30:19 +02:00
Laurent Destailleur
ac27884b88
Fix: [ bug #1366 ] Special characters are HTML encoded with WYSIWYG
...
module.
2014-05-07 19:13:02 +02:00
Raphaël Doursenaud
6cd5d2724a
Updated ADOdb Date Time Library to v0.32
...
Includes important fixes for PHP 5
2014-05-03 19:51:32 +02:00
Laurent Destailleur
6eac7e1bdc
Fix: CRLF
2014-03-15 23:17:46 +01:00
Laurent Destailleur
7e11551199
Fix: CRLF
2014-03-15 21:45:33 +01:00
Laurent Destailleur
c65d681d87
New: Update ckeditor to version 4 (part 1)
2014-03-08 12:11:01 +01:00
Raphaël Doursenaud
9a1919238f
TCPDF: Replaced missing courier monotype font by provided freemono
...
The courier font is missing from TCPDF's directory.
This leads to "TCPDF ERROR: Could not include font definition file: courier" being outputed by PHP
when the library attempts to render an element with a monotyped font.
Use freemono instead since it's a better alternative (e.g. supports more glyphs) and is already
shipped with Dolibarr.
2014-03-04 08:19:59 +01:00
Laurent Destailleur
8d8e016115
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506
Merge from 3.4
2014-01-20 02:21:30 +01:00
cam.lafit
1229842dc6
Provide a new constant about odt2pdf mangement : Don't remove odt source
...
* MAIN_ODT_AS_PDF_DEL_SOURCE by default disable
* If set then initial behaviour is conserved, odt file is removed
2014-01-06 20:07:15 +01:00
Laurent Destailleur
2e0fc364bd
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb
Fix: Removed analytics tags
2013-12-30 12:35:32 +01:00
Laurent Destailleur
358175b357
Merge remote-tracking branch 'origin/3.4' into develop
2013-11-20 23:48:06 +01:00
Florian Henry
306a51f6bd
remove useless code (the tag replacement into footer and header is
...
already done by SetVar method)
2013-11-20 13:54:53 +01:00
Laurent Destailleur
0f4ceca8ec
Fix: tons of bugs into ecm module
2013-11-17 02:59:01 +01:00
Florian Henry
fa5ff00060
Put scroolbar on autocomplete ul/li and not on main windows as before
2013-10-30 09:15:36 +01:00
Laurent Destailleur
649124e8ec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2013-10-29 23:50:25 +01:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
b1add3f9df
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/comm/propal/class/propal.class.php
htdocs/contrat/class/contrat.class.php
2013-09-13 09:32:41 +02:00
Laurent Destailleur
54976951a1
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7
Fix: Missing sources
...
Fix: packager
2013-09-12 23:47:36 +02:00
Cédric Salvador
2ec8720629
crlf to lf
2013-09-12 14:24:51 +02:00
Laurent Destailleur
6c47ee22b4
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
.travis.yml
2013-09-11 23:12:47 +02:00
Laurent Destailleur
899c209468
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-11 23:10:54 +02:00
Laurent Destailleur
6f2652f2b6
Fix: Use correct standard
2013-09-11 23:07:47 +02:00
Laurent Destailleur
301187a117
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
COPYRIGHT
dev/initdata/mysqldump_dolibarr_3.3.0.sql
htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
2013-09-11 21:54:57 +02:00
Laurent Destailleur
d6c35c1ee7
Fix: Opensource rules violation (sources must be included with lib)
2013-09-11 21:39:33 +02:00
Raphaël Doursenaud
07b321b6c3
Replaced PHP 5.5 deprecated call in external library
2013-09-11 15:00:35 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Laurent Destailleur
306f6dd839
Updrage to tcpdf 6.0.021
2013-07-19 00:14:30 +02:00
Laurent Destailleur
b5820315f9
Fix: Correct permissions on files
2013-07-13 10:34:19 +02:00
Laurent Destailleur
e7982120df
Fix bug with php 5.2.4
2013-07-05 21:17:35 +02:00
Laurent Destailleur
33ed654745
New: Upgrade jquery flot library to 0.8.1
2013-07-03 03:40:59 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Regis Houssin
930f6e4850
Fix: avoid error with crlf
2013-06-24 18:04:06 +02:00
Regis Houssin
307ae65924
Fix: crlf to lf for avoid errors with git clone
2013-06-24 17:43:27 +02:00
Regis Houssin
ae67496730
Fix: crlf to lf
2013-06-24 17:41:15 +02:00
