Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
63898b205e
Clean ckeditor menu
2018-08-08 17:09:51 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Laurent Destailleur
9314dcb046
Fix regression
2017-12-12 10:13:48 +01:00
Laurent Destailleur
475db3172a
NEW Remove js library fileupload that was not used by core code.
2017-10-21 19:40:17 +02:00
Laurent Destailleur
985675d680
Clean code
2017-10-20 18:04:46 +02:00
Laurent Destailleur
8113321062
Start to work on email sender profiles
2017-10-13 12:02:26 +02:00
Laurent Destailleur
fd89535037
Debug module website
2017-07-09 22:30:19 +02:00
Laurent Destailleur
10cb7b2524
Fix remove warnings
2017-07-09 20:31:27 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
Laurent Destailleur
72aacb81ae
NEW Can use native php and dolibarr object on pages of module website.
2016-09-16 01:13:52 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
20a2282efc
Updated screenshots
2016-07-31 16:24:32 +02:00
Laurent Destailleur
fabd74169f
Fix: missing 'Maximize' button on full toolbar set of ckeditor.
2016-07-14 11:46:32 +02:00
Laurent Destailleur
f59f3032c6
NEW: Rename path for generic medias files into '/medias' instead of
...
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
a452823e1e
Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility
...
with 3.6
2015-03-13 15:20:08 +01:00
Laurent Destailleur
dba050fd43
Fix: tags h correctly supported
2015-02-20 15:55:55 +01: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
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
Laurent Destailleur
b3d4811b6f
New: Another method to allow style tags into email.
...
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
2013-03-24 19:00:58 +01: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
Laurent Destailleur
9116db986f
Fix: Restore button to edit products. Fix: the template to use for notes is dolibarr_notes.
2012-07-17 19:45:22 +02:00
Regis Houssin
1755c34208
Fix: add ckeditor create div option with dolibarr_mailings toolbar
2012-06-27 16:36:25 +02:00
Laurent Destailleur
fd0450457d
New: Can insert links into elements lines. Also reported into PDF.
2012-06-09 13:16:55 +02:00
Laurent Destailleur
0a68db4da2
Qual: Convert non UTF8 into UTF8 without BOM
...
Qual: Removed useless files
2011-09-21 17:11:14 +00:00
Laurent Destailleur
bd5478a15e
Removed latin text
2011-04-22 23:03:55 +00:00
Laurent Destailleur
9ce727bbf5
Removed latin text
2011-04-22 22:49:58 +00:00
Regis Houssin
ec426648be
Fix: add "maximize" and "font"
2011-04-09 19:31:47 +00:00
Regis Houssin
54450321b9
Fix: add "maximize" and "font"
2011-04-09 19:25:51 +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
4c36a9be36
Works on ckeditor integration
2011-01-31 21:51:10 +00:00
