Commit Graph

27 Commits

Author SHA1 Message Date
Laurent Destailleur
c21b389462 Fix: Pb with focus position with ckeditor 2014-08-21 14:17:27 +02:00
Regis Houssin
977300c653 Fix: missing skin.js 2014-07-31 11:15:30 +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
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
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
Raphaël Doursenaud
a6407a3642 Removed UTF-8 BOM from included libraries 2013-03-01 14:17:36 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Regis Houssin
d6918d7a87 Fix: upgrade ckeditor 2012-08-29 16:31:48 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
2012-07-28 19:04:50 +02:00
Regis Houssin
b862b37731 New: update CKEditor to 3.6.2 2012-03-16 16:56:18 +01:00
Regis Houssin
766aee9c2f Fix: delete unused files 2011-07-06 13:50:00 +00:00
Laurent Destailleur
df35b7fcf2 Perf: ckeditor was seriously slowing everything. So now we use the ckeditor basic to load it only when required. 2011-07-06 12:44:51 +00:00
Laurent Destailleur
c4811cb9d4 More neutral color 2011-04-22 23:14:06 +00:00
Regis Houssin
e73e292d57 New: update ckeditor to 3.5.3 2011-04-22 14:45:58 +00:00
Laurent Destailleur
8850343ff6 Prepare migration to use ckeditor. There is still one missing feature: Upload an image file need fckfinder plugin. 2011-04-09 16:14:19 +00:00
Regis Houssin
c22c53d750 Fix: add compressed format 2011-02-02 07:59:32 +00:00
Regis Houssin
d3710434cb New: update fckeditor (obsolete) and ckeditor 2011-01-31 14:25:48 +00:00
Laurent Destailleur
b4553a64a7 Fix: We don't need to have data encode with htmlentities are we are now full utf8. 2010-11-16 11:51:26 +00:00
Regis Houssin
5ba5e273c4 Fix: move and update ckeditor (prepare to change fckeditor)
Fix: move jquery plugins in specific directory
2010-10-18 10:41:52 +00:00