[geeklog-hg] geeklog: Merged with HEAD

[geeklog-cvs at lists.geeklog.net]

changeset 9433:469665aee3f7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/469665aee3f7
user: Kenji ITO <mystralkk at gmail.com>
date: Mon Jan 20 19:48:47 2014 +0900
description:
Merged with HEAD

diffstat:

 public_html/editors/ckeditor/config.js |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r c202f3eeb32e -r 469665aee3f7 public_html/editors/ckeditor/config.js
--- a/public_html/editors/ckeditor/config.js	Sat Jan 18 12:25:33 2014 +0900
+++ b/public_html/editors/ckeditor/config.js	Mon Jan 20 19:48:47 2014 +0900
@@ -8,6 +8,9 @@
 	// config.language = 'fr';
 	// config.uiColor = '#AADC6E';
 
+	// Disable Advanced Content Filter
+	config.allowedContent = true;
+
 	config.protectedSource.push(/<pre[\s\S]+?\/pre>/g);
 	config.protectedSource.push(/\[code[^:][\s\S]+?\/code\]/g);
 	config.protectedSource.push(/\[code:[a-z0-9_]+[\s\S]+?\/code:[a-z0-9_]+\]/g);