Changeset 4892
- Timestamp:
- 01/06/10 12:41:16 (3 years ago)
- Location:
- CKEditor/tags/3.1
- Files:
-
- 8 edited
-
. (modified) (1 prop)
-
CHANGES.html (modified) (1 diff)
-
_dev/releaser/ckreleaser.release (modified) (1 prop)
-
_dev/releaser/release.bat (modified) (1 prop)
-
_samples/sharedspaces.html (modified) (1 diff)
-
_source/plugins/div/dialogs/div.js (modified) (1 prop)
-
_source/plugins/div/plugin.js (modified) (1 prop)
-
_source/plugins/showborders/plugin.js (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
CKEditor/tags/3.1
- Property svn:mergeinfo changed
/CKEditor/branches/versions/3.1.x (added) merged: 4890 /CKEditor/trunk merged: 4885,4889
- Property svn:mergeinfo changed
-
CKEditor/tags/3.1/CHANGES.html
r4882 r4892 42 42 <li><a href="http://dev.fckeditor.net/ticket/4067">#4067</a> : Introduced the full page editing support (from <html> to </html>).</li> 43 43 <li><a href="http://dev.fckeditor.net/ticket/4228">#4228</a> : Introduced the Shared Spaces feature.</li> 44 <li><a href="http://dev.fckeditor.net/ticket/4379">#4379</a> : Introduced the new powerful pasting system and word cleanup procedure, including enhancements to the paste as plain text feature.</li> 45 <li><a href="http://dev.fckeditor.net/ticket/2872">#2872</a> : Introduced the new native PHP API, the first standardized server side support.</li> 44 46 <li><a href="http://dev.fckeditor.net/ticket/4210">#4210</a> : Added CKEditor plugin for jQuery.</li> 45 47 <li><a href="http://dev.fckeditor.net/ticket/2885">#2885</a> : Added 'div' dialog and corresponding context menu options.</li> -
CKEditor/tags/3.1/_dev/releaser/ckreleaser.release
- Property svn:mergeinfo changed
/CKEditor/branches/versions/3.1.x/_dev/releaser/ckreleaser.release (added) merged: 4890
- Property svn:mergeinfo changed
-
CKEditor/tags/3.1/_dev/releaser/release.bat
- Property svn:mergeinfo changed
/CKEditor/branches/versions/3.1.x/_dev/releaser/release.bat (added) merged: 4890
- Property svn:mergeinfo changed
-
CKEditor/tags/3.1/_samples/sharedspaces.html
r4884 r4892 102 102 } ); 103 103 104 CKEDITOR.replace( 'editor2', 104 CKEDITOR.replace( 'editor2', 105 { 106 sharedSpaces : 105 107 { 106 sharedSpaces : 107 { 108 top : 'topSpace', 109 bottom : 'bottomSpace' 110 }, 108 top : 'topSpace', 109 bottom : 'bottomSpace' 110 }, 111 111 112 // Removes the maximize plugin as it's not usable113 // in a shared toolbar.114 // Removes the resizer as it's not usable in a115 // shared elements path.116 removePlugins : 'maximize,resize'117 } );112 // Removes the maximize plugin as it's not usable 113 // in a shared toolbar. 114 // Removes the resizer as it's not usable in a 115 // shared elements path. 116 removePlugins : 'maximize,resize' 117 } ); 118 118 119 CKEDITOR.replace( 'editor3', 119 CKEDITOR.replace( 'editor3', 120 { 121 sharedSpaces : 120 122 { 121 sharedSpaces : 122 { 123 top : 'topSpace' 124 }, 123 top : 'topSpace' 124 }, 125 125 126 // Removes the maximize plugin as it's not usable127 // in a shared toolbar.128 removePlugins : 'maximize'129 } );126 // Removes the maximize plugin as it's not usable 127 // in a shared toolbar. 128 removePlugins : 'maximize' 129 } ); 130 130 131 CKEDITOR.replace( 'editor4' );131 CKEDITOR.replace( 'editor4' ); 132 132 //]]> 133 133 </script> -
CKEditor/tags/3.1/_source/plugins/div/dialogs/div.js
- Property svn:mergeinfo changed
/CKEditor/branches/versions/3.1.x/_source/plugins/div/dialogs/div.js (added) merged: 4890
- Property svn:mergeinfo changed
-
CKEditor/tags/3.1/_source/plugins/div/plugin.js
- Property svn:mergeinfo changed
/CKEditor/branches/versions/3.1.x/_source/plugins/div/plugin.js (added) merged: 4890
- Property svn:mergeinfo changed
-
CKEditor/tags/3.1/_source/plugins/showborders/plugin.js
- Property svn:mergeinfo changed
/CKEditor/branches/versions/3.1.x/_source/plugins/showborders/plugin.js (added) merged: 4890
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
