aboutsummaryrefslogtreecommitdiffstats
path: root/library/mcefixes/README
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-03-22 12:50:02 +0100
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-03-22 12:50:02 +0100
commitcea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2 (patch)
treeb88556dbafbabac5753bdec9e51fcb24ec4ca3b8 /library/mcefixes/README
parent29900febb341cfbec6e4445d4ea1c2dc782a521a (diff)
parent808180ce5f9471aa36faf8861fb84d04b412f412 (diff)
downloadvolse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.gz
volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.bz2
volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.zip
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts: boot.php database.sql include/template_processor.php update.php
Diffstat (limited to 'library/mcefixes/README')
-rw-r--r--library/mcefixes/README4
1 files changed, 4 insertions, 0 deletions
diff --git a/library/mcefixes/README b/library/mcefixes/README
new file mode 100644
index 000000000..dca70e1c3
--- /dev/null
+++ b/library/mcefixes/README
@@ -0,0 +1,4 @@
+In order to make TinyMCE work smoothly with Friendica, the files in this directory are those few files we've changed in TinyMCE. We will attempt to keep them current, but if you decide to upgrade tinymce, it is best to save current copies of the files in question from the active tinymce tree and replace them or merge them after upgrade.
+
+Except for some simple theming, the primary changes are the advanced theme icon set, which we changed the "html" icon to "[]" to represent BBcode, and major changes have been made to the bbcode plugin.
+ \ No newline at end of file