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

..

adapters

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

images

…

lang

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

plugins

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

skins

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

themes/default

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

.htaccess

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

CHANGES.html

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

ckeditor_basic_source.js

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

ckeditor_basic.js

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

ckeditor_php4.php

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

ckeditor_php5.php

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

ckeditor_source.js

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

ckeditor.asp

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

ckeditor.js

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

ckeditor.pack

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

ckeditor.php

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-13 19:33:54 +01:00

config.js

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

contents.css

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

INSTALL.html

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00

LICENSE.html

Fix: upgrade ckeditor

2012-08-29 16:31:48 +02:00