Commit Graph

57 Commits

Author SHA1 Message Date
Laurent Destailleur
e05ac34966 Fix remove var_dump 2017-08-22 18:03:37 +02:00
Laurent Destailleur
64c4f899f3 Fix charset management with ace 2017-08-22 18:00:54 +02:00
Laurent Destailleur
6421ec3139 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/doleditor.class.php
2017-07-23 19:27:40 +02:00
Laurent Destailleur
0aed9ecd7c Fix ckeditor is now ok since there is no more jmobile. 2017-07-23 18:52:30 +02:00
Laurent Destailleur
1e7aa4d9b4 Work on module website 2017-07-19 16:38:00 +02:00
Laurent Destailleur
a416ec4258 Try to fix travis 2017-07-18 14:25:07 +02:00
Laurent Destailleur
5c296c679e Enhance source code editor 2017-07-18 13:42:07 +02:00
Laurent Destailleur
6db2aeff20 Fix source code editor 2017-07-18 12:00:18 +02:00
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
8db4e91888 Debug modulebuilder 2017-07-08 15:43:36 +02:00
Laurent Destailleur
2dd2ab1003 Look and feel v6 2017-05-20 20:59:54 +02:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php
2016-11-11 15:03:05 +01:00
Regis Houssin
718adef600 Fix: external access of fkeditor image with multicompany 2016-11-04 10:21:20 +01:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02: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
68b3de5b37 NEW ckeditor accept a parameter to disable all html filtering 2016-09-15 23:23:10 +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
46e2ed2810 NEW: All variant of ckeditor config can be tested into the setup page of
module.
2016-05-01 20:36:42 +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
7f129d14d7 Better responsive design 2016-04-07 14:08:38 +02:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Laurent Destailleur
9d7a77f2e5 Doc comment 2015-09-18 12:03:35 +02:00
aspangaro
5b57231c52 Fix : error skin name by default 2015-09-15 06:14:33 +02:00
aspangaro
0055606256 Invert 2015-09-10 07:36:17 +02:00
aspangaro
b1b7966c88 ckeditor: define the default skin when constant don't exist. 2015-09-10 06:58:20 +02:00
aspangaro
a6701aeb69 New: CkEditor add possibility to choose skin 2015-08-23 15:39:55 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
0ba2ae6d32 Some fix in css 2015-05-03 21:31:09 +02:00
Laurent Destailleur
41196c01e9 Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not
accepting all html tags from templates.
2015-02-20 15:48:54 +01:00
Marcos García de La Fuente
0d6d98b395 PHPDoc and misc fixes for several folders 2015-02-10 13:17:37 +01:00
Laurent Destailleur
cc8dcacbc9 New: DolEditor can accepts percent instead of nb of cols for textarea
mode.
2014-05-05 13:41:25 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
56c7d14b9a We do not force disabling of ckeditor for phones. We let ckeditor
decide (currently ckeditor is disabled with android).
2014-03-31 13:25:40 +02:00
Laurent Destailleur
2c0f1340d5 New: Update ckeditor to version 4 (part 2) 2014-03-08 13:17:20 +01:00
Laurent Destailleur
b86eba7f34 doxygen 2013-04-14 10:50:33 +02:00
Laurent Destailleur
20c9370690 New: Support the mode readonly of ckeditor 2013-04-13 16:23:05 +02:00
Laurent Destailleur
b47765f721 Optimize for smartphones 2013-04-05 22:26:41 +02: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
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Regis Houssin
df28f09286 Fix: mutualize ckeditor parameters 2012-06-12 23:13:25 +02:00
Laurent Destailleur
f482ba18c3 Fix: We keep notes 2012-04-07 18:28:03 +02:00
Laurent Destailleur
bf9b7e9090 New: Can add more js during CKEditor creation 2012-03-22 00:22:40 +01:00
Laurent Destailleur
05ff0c7f0b New: Can add more js when creating editor. 2012-03-22 00:09:05 +01:00
Laurent Destailleur
21a1d47130 New: Can define if ckeditor is opened or not in editval
New: Can use a width of 100% in ckeditor
2012-03-17 23:27:53 +01:00