Changeset 5747 for branches/Release01x00/TinyMCEPlugin
- Timestamp:
- 12/07/09 09:14:12 (2 years ago)
- Location:
- branches/Release01x00/TinyMCEPlugin
- Files:
-
- 4 edited
-
. (modified) (1 prop)
-
data/System/TinyMCEPlugin.txt (modified) (2 diffs, 1 prop)
-
lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (2 diffs)
-
pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach_error_autoinc.htm (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
branches/Release01x00/TinyMCEPlugin
- Property svn:mergeinfo changed
/trunk/TinyMCEPlugin merged: 5707-5708,5710,5746
- Property svn:mergeinfo changed
-
branches/Release01x00/TinyMCEPlugin/data/System/TinyMCEPlugin.txt
- Property svn:mergeinfo changed
/trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt merged: 5708,5710,5746
r5709 r5747 66 66 theme_advanced_toolbar_align : "left", 67 67 foswikibuttons_formats : [ 68 { name: "Normal", el: " ", style: null },69 { name: "Heading 1", el: "h1", style: false},70 { name: "Heading 2", el: "h2", style: false},71 { name: "Heading 3", el: "h3", style: false},72 { name: "Heading 4", el: "h4", style: false},73 { name: "Heading 5", el: "h5", style: false},74 { name: "Heading 6", el: "h6", style: false},68 { name: "Normal", el: "div", style: null }, 69 { name: "Heading 1", el: "h1", style: null }, 70 { name: "Heading 2", el: "h2", style: null }, 71 { name: "Heading 3", el: "h3", style: null }, 72 { name: "Heading 4", el: "h4", style: null }, 73 { name: "Heading 5", el: "h5", style: null }, 74 { name: "Heading 6", el: "h6", style: null }, 75 75 { name: "VERBATIM", el: "pre", style: "TMLverbatim" }, 76 76 { name: "LITERAL", el: "span", style: "WYSIWYG_LITERAL" }, … … 157 157 | Release: | %$RELEASE% | 158 158 | Change History: | <!-- versions below in reverse order --> | 159 | 07 Dec 2009 | Foswikitask:Item2447: Fix unable to apply "Normal" format in most browsers (IE6 and Google Chrome still affected) | 159 160 | 03 Dec 2009 | Foswikitask:Item1462: Block attachments to unsaved AUTOINC topics | 160 161 | 25 Nov 2009 | Foswikitask:Item2412: Inserting images - fixed a problem where it wasn't easy (impossible unless > 1 attachments) to select the first image in the attachment list; improved layout of dialog window where preview obscures insert/cancel buttons. | - Property svn:mergeinfo changed
-
branches/Release01x00/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
r5629 r5747 19 19 20 20 our $VERSION = '$Rev$'; 21 our $RELEASE = ' 25 Nov2009';21 our $RELEASE = '07 Dec 2009'; 22 22 our $SHORTDESCRIPTION = 'Integration of the Tiny MCE WYSIWYG Editor'; 23 23 our $NO_PREFS_IN_TOPIC = 1; … … 48 48 theme_advanced_toolbar_align : "left", 49 49 foswikibuttons_formats : [ 50 { name: "Normal", el: " ", style: null },51 { name: "Heading 1", el: "h1", style: false},52 { name: "Heading 2", el: "h2", style: false},53 { name: "Heading 3", el: "h3", style: false},54 { name: "Heading 4", el: "h4", style: false},55 { name: "Heading 5", el: "h5", style: false},56 { name: "Heading 6", el: "h6", style: false},50 { name: "Normal", el: "div", style: null }, 51 { name: "Heading 1", el: "h1", style: null }, 52 { name: "Heading 2", el: "h2", style: null }, 53 { name: "Heading 3", el: "h3", style: null }, 54 { name: "Heading 4", el: "h4", style: null }, 55 { name: "Heading 5", el: "h5", style: null }, 56 { name: "Heading 6", el: "h6", style: null }, 57 57 { name: "VERBATIM", el: "pre", style: "TMLverbatim" }, 58 58 { name: "LITERAL", el: "span", style: "WYSIWYG_LITERAL" }, -
branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach_error_autoinc.htm
- Property svn:mergeinfo changed
/trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach_error_autoinc.htm (added) merged: 5466,5707-5746
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
