Changeset 32575

Timestamp:

05/21/11 16:25:15 (2 years ago)

Author:

coopers

Message:

Merge branch 'master' into svn

Files:

• plugins/cpJwysiwygPlugin/trunk/web (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/.gitignore (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/CHANGES.markdown (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/GPL-LICENSE.txt (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/MIT-LICENSE.txt (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/README.rst (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/controls (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/controls/wysiwyg.colorpicker.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/controls/wysiwyg.cssWrap.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/controls/wysiwyg.image.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/controls/wysiwyg.link.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/controls/wysiwyg.table.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/bin (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/bin/compile.bash (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/bin/compile.conf (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs/code_style.rst (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs/contributing.rst (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs/get_dia.rst (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs/internals.rst (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs/plugins.rst (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs/scheme.dia (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/docs/scheme.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/01-basic.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/02-full.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/03-ajax.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/04-resizable.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/05-ui-dialogs.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/06-hide-heading-buttons.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/07-enable-rtl.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/08-auto-grow.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/09-css-autoloading.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/10-custom-controls.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/11-plugins.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/12-writing-plugins.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/index.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/examples/jw_ajax.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/htmlentity (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/htmlentity/.gitignore (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/htmlentity/Gemfile (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/htmlentity/db.csv (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/htmlentity/unicode4jwysiwyg.pl (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/htmlentity/unicode4jwysiwyg.rb (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/blueprint (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/blueprint/ie.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/blueprint/print.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/blueprint/screen.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jasmine (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jasmine/MIT.LICENSE (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jasmine/jasmine-html.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jasmine/jasmine.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jasmine/jasmine.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jquery.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jquery.simplemodal.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/jquery.simplemodal.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/autoload (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/autoload/jquery.autoload.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/CHANGELOG.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/LICENSE.txt (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/README.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/css/farbtastic.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/demo (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/demo/demo1.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/demo/demo2.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/farbtastic.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/images (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/images/marker.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/images/mask.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/plugins/farbtastic/images/wheel.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-anim_basic_16x16.gif (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_flat_0_aaaaaa_40x100.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_flat_75_ffffff_40x100.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_glass_55_fbf9ee_1x400.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_glass_65_ffffff_1x400.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_glass_75_dadada_1x400.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_glass_75_e6e6e6_1x400.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_glass_95_fef1ec_1x400.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-icons_222222_256x240.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-icons_2e83ff_256x240.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-icons_454545_256x240.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-icons_888888_256x240.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/images/ui-icons_cd0a0a_256x240.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.blind.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.bounce.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.clip.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.core.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.drop.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.explode.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.fold.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.highlight.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.pulsate.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.scale.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.shake.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.slide.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.effects.transfer.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.accordion.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.accordion.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.all.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.autocomplete.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.autocomplete.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.base.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.button.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.button.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.core.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.core.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.datepicker.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.datepicker.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.dialog.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.dialog.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.draggable.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.droppable.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.mouse.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.position.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.progressbar.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.progressbar.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.resizable.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.resizable.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.selectable.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.slider.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.slider.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.sortable.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.tabs.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.tabs.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.theme.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/ui/jquery.ui.widget.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/lib/x.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/css/issue014-cg.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/css/issue145.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/images (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/images/quote02.gif (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue005.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue014-cg.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue016.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue026.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue029.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue130.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue145.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue152.xhtml (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue152_iframe.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue154.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/issue214-cg.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/154.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/159.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/controls (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/controls/html.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/functions (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/functions/insertHtml.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/helper.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/jwysiwyg.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/plugins (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/plugins.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/plugins/i18n.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/jasmine/plugins/rmFormat.spec.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/help/tests/run-jasmine-tests.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.cs.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.de.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.en.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.es.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.fr.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.it.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.ja.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.nl.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.pl.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.pt_br.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.ru.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.se.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/i18n/lang.sl.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/index.html (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.bg.png (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.gif (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.jpg (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.modal.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.no-alpha.gif (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/jquery.wysiwyg.old-school.css (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/plugins (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/plugins/wysiwyg.autoload.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/plugins/wysiwyg.fullscreen.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/plugins/wysiwyg.i18n.js (added)
• plugins/cpJwysiwygPlugin/trunk/web/jwysiwyg/plugins/wysiwyg.rmFormat.js (added)