Changeset [da7768a3b581b6d4dcff5ab3fb9d30aee1508bf1] by dleffler
December 10th, 2013 @ 08:14 PM
Merge branch 'develop' into bootstrap3dave
https://github.com/exponentcms/exponent-cms/commit/da7768a3b581b6d4...
Committed by dleffler
- A external/editors/ckeditor/plugins/dialog/plugin.js
- A external/editors/ckeditor/plugins/dialog/samples/assets/my_dialog.js
- A external/editors/ckeditor/plugins/dialog/samples/dialog.html
- A external/editors/ckeditor/plugins/image2/dev/assets/image1.jpg
- A external/editors/ckeditor/plugins/image2/dev/assets/image2.jpg
- A external/editors/ckeditor/plugins/image2/dev/contents.css
- A external/editors/ckeditor/plugins/image2/dev/image2.html
- A external/editors/ckeditor/plugins/image2/dialogs/image2.js
- A external/editors/ckeditor/plugins/image2/icons/hidpi/image2.png
- A external/editors/ckeditor/plugins/image2/icons/image2.png
- A external/editors/ckeditor/plugins/image2/lang/af.js
- A external/editors/ckeditor/plugins/image2/lang/ar.js
- A external/editors/ckeditor/plugins/image2/lang/bg.js
- A external/editors/ckeditor/plugins/image2/lang/bn.js
- A external/editors/ckeditor/plugins/image2/lang/bs.js
- A external/editors/ckeditor/plugins/image2/lang/ca.js
- A external/editors/ckeditor/plugins/image2/lang/cs.js
- A external/editors/ckeditor/plugins/image2/lang/cy.js
- A external/editors/ckeditor/plugins/image2/lang/da.js
- A external/editors/ckeditor/plugins/image2/lang/de.js
- A external/editors/ckeditor/plugins/image2/lang/el.js
- A external/editors/ckeditor/plugins/image2/lang/en-au.js
- A external/editors/ckeditor/plugins/image2/lang/en-ca.js
- A external/editors/ckeditor/plugins/image2/lang/en-gb.js
- A external/editors/ckeditor/plugins/image2/lang/en.js
- A external/editors/ckeditor/plugins/image2/lang/eo.js
- A external/editors/ckeditor/plugins/image2/lang/es.js
- A external/editors/ckeditor/plugins/image2/lang/et.js
- A external/editors/ckeditor/plugins/image2/lang/eu.js
- A external/editors/ckeditor/plugins/image2/lang/fa.js
- A external/editors/ckeditor/plugins/image2/lang/fi.js
- A external/editors/ckeditor/plugins/image2/lang/fo.js
- A external/editors/ckeditor/plugins/image2/lang/fr-ca.js
- A external/editors/ckeditor/plugins/image2/lang/fr.js
- A external/editors/ckeditor/plugins/image2/lang/gl.js
- A external/editors/ckeditor/plugins/image2/lang/gu.js
- A external/editors/ckeditor/plugins/image2/lang/he.js
- A external/editors/ckeditor/plugins/image2/lang/hi.js
- A external/editors/ckeditor/plugins/image2/lang/hr.js
- A external/editors/ckeditor/plugins/image2/lang/hu.js
- A external/editors/ckeditor/plugins/image2/lang/id.js
- A external/editors/ckeditor/plugins/image2/lang/is.js
- A external/editors/ckeditor/plugins/image2/lang/it.js
- A external/editors/ckeditor/plugins/image2/lang/ja.js
- A external/editors/ckeditor/plugins/image2/lang/ka.js
- A external/editors/ckeditor/plugins/image2/lang/km.js
- A external/editors/ckeditor/plugins/image2/lang/ko.js
- A external/editors/ckeditor/plugins/image2/lang/ku.js
- A external/editors/ckeditor/plugins/image2/lang/lt.js
- A external/editors/ckeditor/plugins/image2/lang/lv.js
- A external/editors/ckeditor/plugins/image2/lang/mk.js
- A external/editors/ckeditor/plugins/image2/lang/mn.js
- A external/editors/ckeditor/plugins/image2/lang/ms.js
- A external/editors/ckeditor/plugins/image2/lang/nb.js
- A external/editors/ckeditor/plugins/image2/lang/nl.js
- A external/editors/ckeditor/plugins/image2/lang/no.js
- A external/editors/ckeditor/plugins/image2/lang/pl.js
- A external/editors/ckeditor/plugins/image2/lang/pt-br.js
- A external/editors/ckeditor/plugins/image2/lang/pt.js
- A external/editors/ckeditor/plugins/image2/lang/ro.js
- A external/editors/ckeditor/plugins/image2/lang/ru.js
- A external/editors/ckeditor/plugins/image2/lang/si.js
- A external/editors/ckeditor/plugins/image2/lang/sk.js
- A external/editors/ckeditor/plugins/image2/lang/sl.js
- A external/editors/ckeditor/plugins/image2/lang/sq.js
- A external/editors/ckeditor/plugins/image2/lang/sr-latn.js
- A external/editors/ckeditor/plugins/image2/lang/sr.js
- A external/editors/ckeditor/plugins/image2/lang/sv.js
- A external/editors/ckeditor/plugins/image2/lang/th.js
- A external/editors/ckeditor/plugins/image2/lang/tr.js
- A external/editors/ckeditor/plugins/image2/lang/ug.js
- A external/editors/ckeditor/plugins/image2/lang/uk.js
- A external/editors/ckeditor/plugins/image2/lang/vi.js
- A external/editors/ckeditor/plugins/image2/lang/zh-cn.js
- A external/editors/ckeditor/plugins/image2/lang/zh.js
- A external/editors/ckeditor/plugins/image2/plugin.js
- A external/editors/ckeditor/plugins/image2/samples/assets/image1.jpg
- A external/editors/ckeditor/plugins/image2/samples/assets/image2.jpg
- A external/editors/ckeditor/plugins/image2/samples/contents.css
- A external/editors/ckeditor/plugins/image2/samples/image2.html
- A external/editors/ckeditor/plugins/imagebrowser/LICENSE.txt
- A external/editors/ckeditor/plugins/imagebrowser/README.rst
- A external/editors/ckeditor/plugins/imagebrowser/browser/browser.css
- A external/editors/ckeditor/plugins/imagebrowser/browser/browser.html
- A external/editors/ckeditor/plugins/imagebrowser/browser/browser.js
- A external/editors/ckeditor/plugins/imagebrowser/browser/jquery-1.9.1.min.js
- A external/editors/ckeditor/plugins/lineutils/dev/dnd.html
- A external/editors/ckeditor/plugins/lineutils/dev/magicfinger.html
- A external/editors/ckeditor/plugins/lineutils/plugin.js
- A external/editors/ckeditor/plugins/specialchar/dialogs/lang/km.js
- A external/editors/ckeditor/plugins/widget/dev/console.js
- A external/editors/ckeditor/plugins/widget/images/handle.png
- A external/editors/ckeditor/plugins/widget/lang/en.js
- A external/editors/ckeditor/plugins/widget/lang/ja.js
- A external/editors/ckeditor/plugins/widget/lang/uk.js
- A external/editors/ckeditor/plugins/widget/plugin.js
- A framework/modules/navigation/assets/less/dropdown-bootstrap.less
- R framework/modules/navigation/assets/css/dropdown-bootstrap.css
- M CHANGELOG.md
- M CREDITS.md
- M INSTALLATION.md
- M README.md
- M RELEASE.md
- M TODO.md
- M external/ExtPrograms.csv
- M external/editors/ckeditor/CHANGES.md
- M external/editors/ckeditor/README.md
- M external/editors/ckeditor/build-config.js
- M external/editors/ckeditor/ckeditor.js
- M external/editors/ckeditor/contents.css
- M external/editors/ckeditor/lang/af.js
- M external/editors/ckeditor/lang/ar.js
- M external/editors/ckeditor/lang/bg.js
- M external/editors/ckeditor/lang/bn.js
- M external/editors/ckeditor/lang/bs.js
- M external/editors/ckeditor/lang/ca.js
- M external/editors/ckeditor/lang/cs.js
- M external/editors/ckeditor/lang/cy.js
- M external/editors/ckeditor/lang/da.js
- M external/editors/ckeditor/lang/de.js
- M external/editors/ckeditor/lang/el.js
- M external/editors/ckeditor/lang/en-au.js
- M external/editors/ckeditor/lang/en-ca.js
- M external/editors/ckeditor/lang/en-gb.js
- M external/editors/ckeditor/lang/en.js
- M external/editors/ckeditor/lang/eo.js
- M external/editors/ckeditor/lang/es.js
- M external/editors/ckeditor/lang/et.js
- M external/editors/ckeditor/lang/eu.js
- M external/editors/ckeditor/lang/fa.js
- M external/editors/ckeditor/lang/fi.js
- M external/editors/ckeditor/lang/fo.js
- M external/editors/ckeditor/lang/fr-ca.js
- M external/editors/ckeditor/lang/fr.js
- M external/editors/ckeditor/lang/gl.js
- M external/editors/ckeditor/lang/gu.js
- M external/editors/ckeditor/lang/he.js
- M external/editors/ckeditor/lang/hi.js
- M external/editors/ckeditor/lang/hr.js
- M external/editors/ckeditor/lang/hu.js
- M external/editors/ckeditor/lang/id.js
- M external/editors/ckeditor/lang/is.js
- M external/editors/ckeditor/lang/it.js
- M external/editors/ckeditor/lang/ja.js
- M external/editors/ckeditor/lang/ka.js
- M external/editors/ckeditor/lang/km.js
- M external/editors/ckeditor/lang/ko.js
- M external/editors/ckeditor/lang/ku.js
- M external/editors/ckeditor/lang/lt.js
- M external/editors/ckeditor/lang/lv.js
- M external/editors/ckeditor/lang/mk.js
- M external/editors/ckeditor/lang/mn.js
- M external/editors/ckeditor/lang/ms.js
- M external/editors/ckeditor/lang/nb.js
- M external/editors/ckeditor/lang/nl.js
- M external/editors/ckeditor/lang/no.js
- M external/editors/ckeditor/lang/pl.js
- M external/editors/ckeditor/lang/pt-br.js
- M external/editors/ckeditor/lang/pt.js
- M external/editors/ckeditor/lang/ro.js
- M external/editors/ckeditor/lang/ru.js
- M external/editors/ckeditor/lang/si.js
- M external/editors/ckeditor/lang/sk.js
- M external/editors/ckeditor/lang/sl.js
- M external/editors/ckeditor/lang/sq.js
- M external/editors/ckeditor/lang/sr-latn.js
- M external/editors/ckeditor/lang/sr.js
- M external/editors/ckeditor/lang/sv.js
- M external/editors/ckeditor/lang/th.js
- M external/editors/ckeditor/lang/tr.js
- M external/editors/ckeditor/lang/ug.js
- M external/editors/ckeditor/lang/uk.js
- M external/editors/ckeditor/lang/vi.js
- M external/editors/ckeditor/lang/zh-cn.js
- M external/editors/ckeditor/lang/zh.js
- M external/editors/ckeditor/plugins/div/dialogs/div.js
- M external/editors/ckeditor/plugins/forms/dialogs/form.js
- M external/editors/ckeditor/plugins/icons.png
- M external/editors/ckeditor/plugins/icons_hidpi.png
- M external/editors/ckeditor/plugins/image/dialogs/image.js
- M external/editors/ckeditor/plugins/link/dialogs/link.js
- M external/editors/ckeditor/plugins/smiley/images/angel_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/angry_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/broken_heart.gif
- M external/editors/ckeditor/plugins/smiley/images/confused_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/cry_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/devil_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/embaressed_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/embarrassed_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/envelope.gif
- M external/editors/ckeditor/plugins/smiley/images/heart.gif
- M external/editors/ckeditor/plugins/smiley/images/kiss.gif
- M external/editors/ckeditor/plugins/smiley/images/lightbulb.gif
- M external/editors/ckeditor/plugins/smiley/images/omg_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/regular_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/sad_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/shades_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/teeth_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/thumbs_down.gif
- M external/editors/ckeditor/plugins/smiley/images/thumbs_up.gif
- M external/editors/ckeditor/plugins/smiley/images/tongue_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/tounge_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
- M external/editors/ckeditor/plugins/smiley/images/wink_smile.gif
- M external/editors/ckeditor/plugins/sourcedialog/samples/sourcedialog.html
- M external/editors/ckeditor/plugins/table/dialogs/table.js
- M external/editors/ckeditor/skins/kama/dialog.css
- M external/editors/ckeditor/skins/kama/dialog_ie.css
- M external/editors/ckeditor/skins/kama/dialog_ie7.css
- M external/editors/ckeditor/skins/kama/dialog_ie8.css
- M external/editors/ckeditor/skins/kama/dialog_iequirks.css
- M external/editors/ckeditor/skins/kama/dialog_opera.css
- M external/editors/ckeditor/skins/kama/editor.css
- M external/editors/ckeditor/skins/kama/editor_ie.css
- M external/editors/ckeditor/skins/kama/editor_ie7.css
- M external/editors/ckeditor/skins/kama/editor_ie8.css
- M external/editors/ckeditor/skins/kama/editor_iequirks.css
- M external/editors/ckeditor/skins/moono/dialog.css
- M external/editors/ckeditor/skins/moono/dialog_ie.css
- M external/editors/ckeditor/skins/moono/dialog_ie7.css
- M external/editors/ckeditor/skins/moono/dialog_ie8.css
- M external/editors/ckeditor/skins/moono/dialog_iequirks.css
- M external/editors/ckeditor/skins/moono/dialog_opera.css
- M external/editors/ckeditor/skins/moono/editor.css
- M external/editors/ckeditor/skins/moono/editor_gecko.css
- M external/editors/ckeditor/skins/moono/editor_ie.css
- M external/editors/ckeditor/skins/moono/editor_ie7.css
- M external/editors/ckeditor/skins/moono/editor_ie8.css
- M external/editors/ckeditor/skins/moono/editor_iequirks.css
- M external/editors/ckeditor/skins/moono/icons.png
- M external/editors/ckeditor/skins/moono/icons_hidpi.png
- M external/jquery/addons/js/datatables.responsive.js
- M framework/core/assets/less/forms-bootstrap.less
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/forms/controls/tinymcecontrol.php
- M framework/core/subsystems/expCSS.php
- M framework/modules/administration/views/administration/toolbar.bootstrap.tpl
- M framework/modules/core/controllers/expHTMLEditorController.php
- M framework/modules/core/views/expHTMLEditor/edit.tpl
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/models/expFile.php
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/forms/views/forms/showall.bootstrap.tpl
- M framework/modules/forms/views/forms/showall.tpl
- M framework/modules/navigation/views/navigation/showall_Flydown.bootstrap.tpl
- M framework/modules/users/views/users/_permissions.bootstrap.tpl
- M framework/modules/users/views/users/_permissions.tpl
- M framework/modules/users/views/users/manage.bootstrap.tpl
- M framework/modules/users/views/users/manage.tpl
- M framework/modules/users/views/users/manage_groups.bootstrap.tpl
- M framework/modules/users/views/users/manage_groups.tpl
- M framework/plugins/compiler.switch.php
- M install/changes/2.2.4.txt
- M themes/bootstraptheme/index.php
- M themes/bootstraptheme/less/bootstraptheme.less
- M themes/bootstraptheme/subthemes/Follow Parent.php
- M themes/bootstraptheme/subthemes/Left Sectional.php
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Bug Tracker for Exponent CMS