Changeset [85342f8ae6311047a0ba0c36930456adbb1b0d4d] by dleffler
May 27th, 2011 @ 07:19 PM
Merge branch 'release/v2.0.0.beta3'
https://github.com/exponentcms/exponent-cms/commit/85342f8ae6311047...
Committed by dleffler
- A external/ckeditor/lang/ka.js
- A external/ckeditor/plugins/ajax/plugin.js
- A external/ckeditor/plugins/bbcode/plugin.js
- A external/ckeditor/plugins/devtools/lang/en.js
- A external/ckeditor/plugins/devtools/plugin.js
- A external/ckeditor/plugins/docprops/dialogs/docprops.js
- A external/ckeditor/plugins/docprops/plugin.js
- A external/ckeditor/plugins/placeholder/lang/he.js
- A external/ckeditor/plugins/stylesheetparser/plugin.js
- A external/ckeditor/plugins/xml/plugin.js
- A external/flowplayer3/flowplayer.audio-3.2.2.swf
- A framework/core/assets/images/bug.png
- A framework/core/assets/images/toggle_off.png
- A framework/core/assets/images/toggle_on.png
- A framework/core/assets/images/toggle_red.png
- A framework/core/database/definitions/version.php
- A framework/modules/administration/assets/images/admintoolbar/toggle_off.png
- A framework/modules/administration/assets/images/admintoolbar/toggle_on.png
- A framework/modules/administration/assets/images/admintoolbar/toggle_red.png
- A framework/modules/photoalbum/views/photos/configure/gallery.tpl
- A framework/modules/snippet/views/snippet/highlight.tpl
- A install/not_configured
- A install/pages/install-1.php
- A install/pages/install-2.php
- A install/pages/install-3.php
- A install/pages/install-4.php
- A install/pages/install-5.php
- A install/pages/install-6.php
- A install/pages/install-7.php
- A install/pages/upgrade-1.php
- A install/pages/upgrade-2.php
- A install/pages/upgrade-3.php
- A install/upgrades/version_tracking.php
- A modules/formbuilder/views/_edit_control.tpl
- A modules/formbuilder/views/_edit_form.tpl
- A modules/formbuilder/views/_edit_report.tpl
- A subsystems/lang/eng_US/modules/formbuilder/views/_edit_control.php
- A subsystems/lang/eng_US/modules/formbuilder/views/_edit_form.php
- A subsystems/lang/eng_US/modules/formbuilder/views/_edit_report.php
- A themes/retrotheme/config.php
- R external/ckeditor/ckeditor.asp
- R external/ckeditor/ckeditor_php4.php
- R framework/modules/photoalbum/views/photos/configure/showall.config
- R framework/modules/photoalbum/views/photos/configure/showall_slideshow.config
- R framework/modules/photoalbum/views/photos/showall_slideshow.tpl
- R install/pages/sanity.php
- R install/pages/dbconfig.php
- R install/pages/dbcheck.php
- M CHANGELOG
- M RELEASE
- M conf/extensions/display.defaults.php
- M conf/extensions/registration.structure.php
- M datatypes/formbuilder_report.php
- M exponent_common.php
- M exponent_constants.php
- M exponent_version.php
- M external/Swift/Swift.php
- M external/ckeditor/.htaccess
- M external/ckeditor/CHANGES.html
- M external/ckeditor/INSTALL.html
- M external/ckeditor/LICENSE.html
- M external/ckeditor/adapters/jquery.js
- M external/ckeditor/ckeditor.js
- M external/ckeditor/ckeditor.pack
- M external/ckeditor/ckeditor.php
- M external/ckeditor/ckeditor_basic.js
- M external/ckeditor/ckeditor_basic_source.js
- M external/ckeditor/ckeditor_php5.php
- M external/ckeditor/ckeditor_source.js
- M external/ckeditor/config.js
- M external/ckeditor/contents.css
- M external/ckeditor/images/spacer.gif
- M external/ckeditor/lang/_languages.js
- M external/ckeditor/lang/_translationstatus.txt
- M external/ckeditor/lang/af.js
- M external/ckeditor/lang/ar.js
- M external/ckeditor/lang/bg.js
- M external/ckeditor/lang/bn.js
- M external/ckeditor/lang/bs.js
- M external/ckeditor/lang/ca.js
- M external/ckeditor/lang/cs.js
- M external/ckeditor/lang/cy.js
- M external/ckeditor/lang/da.js
- M external/ckeditor/lang/de.js
- M external/ckeditor/lang/el.js
- M external/ckeditor/lang/en-au.js
- M external/ckeditor/lang/en-ca.js
- M external/ckeditor/lang/en-gb.js
- M external/ckeditor/lang/en.js
- M external/ckeditor/lang/eo.js
- M external/ckeditor/lang/es.js
- M external/ckeditor/lang/et.js
- M external/ckeditor/lang/eu.js
- M external/ckeditor/lang/fa.js
- M external/ckeditor/lang/fi.js
- M external/ckeditor/lang/fo.js
- M external/ckeditor/lang/fr-ca.js
- M external/ckeditor/lang/fr.js
- M external/ckeditor/lang/gl.js
- M external/ckeditor/lang/gu.js
- M external/ckeditor/lang/he.js
- M external/ckeditor/lang/hi.js
- M external/ckeditor/lang/hr.js
- M external/ckeditor/lang/hu.js
- M external/ckeditor/lang/is.js
- M external/ckeditor/lang/it.js
- M external/ckeditor/lang/ja.js
- M external/ckeditor/lang/km.js
- M external/ckeditor/lang/ko.js
- M external/ckeditor/lang/lt.js
- M external/ckeditor/lang/lv.js
- M external/ckeditor/lang/mn.js
- M external/ckeditor/lang/ms.js
- M external/ckeditor/lang/nb.js
- M external/ckeditor/lang/nl.js
- M external/ckeditor/lang/no.js
- M external/ckeditor/lang/pl.js
- M external/ckeditor/lang/pt-br.js
- M external/ckeditor/lang/pt.js
- M external/ckeditor/lang/ro.js
- M external/ckeditor/lang/ru.js
- M external/ckeditor/lang/sk.js
- M external/ckeditor/lang/sl.js
- M external/ckeditor/lang/sr-latn.js
- M external/ckeditor/lang/sr.js
- M external/ckeditor/lang/sv.js
- M external/ckeditor/lang/th.js
- M external/ckeditor/lang/tr.js
- M external/ckeditor/lang/uk.js
- M external/ckeditor/lang/vi.js
- M external/ckeditor/lang/zh-cn.js
- M external/ckeditor/lang/zh.js
- M external/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
- M external/ckeditor/plugins/a11yhelp/lang/en.js
- M external/ckeditor/plugins/a11yhelp/lang/he.js
- M external/ckeditor/plugins/about/dialogs/about.js
- M external/ckeditor/plugins/about/dialogs/logo_ckeditor.png
- M external/ckeditor/plugins/adobeair/plugin.js
- M external/ckeditor/plugins/autogrow/plugin.js
- M external/ckeditor/plugins/clipboard/dialogs/paste.js
- M external/ckeditor/plugins/colordialog/dialogs/colordialog.js
- M external/ckeditor/plugins/dialog/dialogDefinition.js
- M external/ckeditor/plugins/div/dialogs/div.js
- M external/ckeditor/plugins/find/dialogs/find.js
- M external/ckeditor/plugins/flash/dialogs/flash.js
- M external/ckeditor/plugins/flash/images/placeholder.png
- M external/ckeditor/plugins/forms/dialogs/button.js
- M external/ckeditor/plugins/forms/dialogs/checkbox.js
- M external/ckeditor/plugins/forms/dialogs/form.js
- M external/ckeditor/plugins/forms/dialogs/hiddenfield.js
- M external/ckeditor/plugins/forms/dialogs/radio.js
- M external/ckeditor/plugins/forms/dialogs/select.js
- M external/ckeditor/plugins/forms/dialogs/textarea.js
- M external/ckeditor/plugins/forms/dialogs/textfield.js
- M external/ckeditor/plugins/forms/images/hiddenfield.gif
- M external/ckeditor/plugins/iframe/dialogs/iframe.js
- M external/ckeditor/plugins/iframe/images/placeholder.png
- M external/ckeditor/plugins/iframedialog/plugin.js
- M external/ckeditor/plugins/image/dialogs/image.js
- M external/ckeditor/plugins/link/dialogs/anchor.js
- M external/ckeditor/plugins/link/dialogs/link.js
- M external/ckeditor/plugins/link/images/anchor.gif
- M external/ckeditor/plugins/liststyle/dialogs/liststyle.js
- M external/ckeditor/plugins/pagebreak/images/pagebreak.gif
- M external/ckeditor/plugins/pastefromword/filter/default.js
- M external/ckeditor/plugins/pastetext/dialogs/pastetext.js
- M external/ckeditor/plugins/placeholder/dialogs/placeholder.js
- M external/ckeditor/plugins/placeholder/lang/en.js
- M external/ckeditor/plugins/placeholder/placeholder.gif
- M external/ckeditor/plugins/placeholder/plugin.js
- M external/ckeditor/plugins/scayt/dialogs/options.js
- M external/ckeditor/plugins/scayt/dialogs/toolbar.css
- M external/ckeditor/plugins/showblocks/images/block_address.png
- M external/ckeditor/plugins/showblocks/images/block_blockquote.png
- M external/ckeditor/plugins/showblocks/images/block_div.png
- M external/ckeditor/plugins/showblocks/images/block_h1.png
- M external/ckeditor/plugins/showblocks/images/block_h2.png
- M external/ckeditor/plugins/showblocks/images/block_h3.png
- M external/ckeditor/plugins/showblocks/images/block_h4.png
- M external/ckeditor/plugins/showblocks/images/block_h5.png
- M external/ckeditor/plugins/showblocks/images/block_h6.png
- M external/ckeditor/plugins/showblocks/images/block_p.png
- M external/ckeditor/plugins/showblocks/images/block_pre.png
- M external/ckeditor/plugins/smiley/dialogs/smiley.js
- M external/ckeditor/plugins/smiley/images/angel_smile.gif
- M external/ckeditor/plugins/smiley/images/angry_smile.gif
- M external/ckeditor/plugins/smiley/images/broken_heart.gif
- M external/ckeditor/plugins/smiley/images/confused_smile.gif
- M external/ckeditor/plugins/smiley/images/cry_smile.gif
- M external/ckeditor/plugins/smiley/images/devil_smile.gif
- M external/ckeditor/plugins/smiley/images/embaressed_smile.gif
- M external/ckeditor/plugins/smiley/images/envelope.gif
- M external/ckeditor/plugins/smiley/images/heart.gif
- M external/ckeditor/plugins/smiley/images/kiss.gif
- M external/ckeditor/plugins/smiley/images/lightbulb.gif
- M external/ckeditor/plugins/smiley/images/omg_smile.gif
- M external/ckeditor/plugins/smiley/images/regular_smile.gif
- M external/ckeditor/plugins/smiley/images/sad_smile.gif
- M external/ckeditor/plugins/smiley/images/shades_smile.gif
- M external/ckeditor/plugins/smiley/images/teeth_smile.gif
- M external/ckeditor/plugins/smiley/images/thumbs_down.gif
- M external/ckeditor/plugins/smiley/images/thumbs_up.gif
- M external/ckeditor/plugins/smiley/images/tounge_smile.gif
- M external/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
- M external/ckeditor/plugins/smiley/images/wink_smile.gif
- M external/ckeditor/plugins/specialchar/dialogs/specialchar.js
- M external/ckeditor/plugins/specialchar/lang/en.js
- M external/ckeditor/plugins/styles/styles/default.js
- M external/ckeditor/plugins/table/dialogs/table.js
- M external/ckeditor/plugins/tableresize/plugin.js
- M external/ckeditor/plugins/tabletools/dialogs/tableCell.js
- M external/ckeditor/plugins/templates/dialogs/templates.js
- M external/ckeditor/plugins/templates/templates/default.js
- M external/ckeditor/plugins/templates/templates/images/template1.gif
- M external/ckeditor/plugins/templates/templates/images/template2.gif
- M external/ckeditor/plugins/templates/templates/images/template3.gif
- M external/ckeditor/plugins/uicolor/dialogs/uicolor.js
- M external/ckeditor/plugins/uicolor/lang/en.js
- M external/ckeditor/plugins/uicolor/lang/he.js
- M external/ckeditor/plugins/uicolor/plugin.js
- M external/ckeditor/plugins/uicolor/uicolor.gif
- M external/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
- M external/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
- M external/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
- M external/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
- M external/ckeditor/plugins/uicolor/yui/assets/yui.css
- M external/ckeditor/plugins/uicolor/yui/yui.js
- M external/ckeditor/plugins/wsc/dialogs/ciframe.html
- M external/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
- M external/ckeditor/plugins/wsc/dialogs/wsc.css
- M external/ckeditor/plugins/wsc/dialogs/wsc.js
- M external/ckeditor/skins/kama/dialog.css
- M external/ckeditor/skins/kama/editor.css
- M external/ckeditor/skins/kama/icons.png
- M external/ckeditor/skins/kama/icons_rtl.png
- M external/ckeditor/skins/kama/images/dialog_sides.gif
- M external/ckeditor/skins/kama/images/dialog_sides.png
- M external/ckeditor/skins/kama/images/dialog_sides_rtl.png
- M external/ckeditor/skins/kama/images/mini.gif
- M external/ckeditor/skins/kama/images/noimage.png
- M external/ckeditor/skins/kama/images/sprites.png
- M external/ckeditor/skins/kama/images/sprites_ie6.png
- M external/ckeditor/skins/kama/images/toolbar_start.gif
- M external/ckeditor/skins/kama/skin.js
- M external/ckeditor/skins/kama/templates.css
- M external/ckeditor/skins/office2003/dialog.css
- M external/ckeditor/skins/office2003/editor.css
- M external/ckeditor/skins/office2003/icons.png
- M external/ckeditor/skins/office2003/icons_rtl.png
- M external/ckeditor/skins/office2003/images/dialog_sides.gif
- M external/ckeditor/skins/office2003/images/dialog_sides.png
- M external/ckeditor/skins/office2003/images/dialog_sides_rtl.png
- M external/ckeditor/skins/office2003/images/mini.gif
- M external/ckeditor/skins/office2003/images/noimage.png
- M external/ckeditor/skins/office2003/images/sprites.png
- M external/ckeditor/skins/office2003/images/sprites_ie6.png
- M external/ckeditor/skins/office2003/skin.js
- M external/ckeditor/skins/office2003/templates.css
- M external/ckeditor/skins/v2/dialog.css
- M external/ckeditor/skins/v2/editor.css
- M external/ckeditor/skins/v2/icons.png
- M external/ckeditor/skins/v2/icons_rtl.png
- M external/ckeditor/skins/v2/images/dialog_sides.gif
- M external/ckeditor/skins/v2/images/dialog_sides.png
- M external/ckeditor/skins/v2/images/dialog_sides_rtl.png
- M external/ckeditor/skins/v2/images/mini.gif
- M external/ckeditor/skins/v2/images/noimage.png
- M external/ckeditor/skins/v2/images/sprites.png
- M external/ckeditor/skins/v2/images/sprites_ie6.png
- M external/ckeditor/skins/v2/images/toolbar_start.gif
- M external/ckeditor/skins/v2/skin.js
- M external/ckeditor/skins/v2/templates.css
- M external/ckeditor/themes/default/theme.js
- M external/minify/min/config.php
- M framework/core/assets/css/admin-global.css
- M framework/core/controllers/expController.php
- M framework/core/controllers/expHTMLEditorController.php
- M framework/core/database/definitions/htmleditor_ckeditor.php
- M framework/core/expFramework.php
- M framework/core/subsystems/expPaginator.php
- M framework/datatypes/snippet.php
- M framework/modules/addressbook/views/address/myaddressbook.tpl
- M framework/modules/administration/assets/css/slingbar.css
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/administration/views/administration/manage_themes.tpl
- M framework/modules/administration/views/administration/manage_unused_tables.tpl
- M framework/modules/banners/views/banner/manage.tpl
- M framework/modules/blog/views/blog/configure/blog.tpl
- M framework/modules/blog/views/blog/showall.tpl
- M framework/modules/common/views/common/pagination_table.tpl
- M framework/modules/common/views/configure/pagination.tpl
- M framework/modules/common/views/file/Gallery.tpl
- M framework/modules/common/views/file/Slideshow.tpl
- M framework/modules/common/views/file/configure/Gallery.tpl
- M framework/modules/common/views/file/configure/Slideshow.tpl
- M framework/modules/company/views/company/showall.tpl
- M framework/modules/core/views/expComment/manage.tpl
- M framework/modules/core/views/expHTMLEditor/edit.tpl
- M framework/modules/core/views/expHTMLEditor/manage.tpl
- M framework/modules/core/views/expHTMLEditor/preview.tpl
- M framework/modules/core/views/expModule/manage.tpl
- M framework/modules/core/views/expSimpleNote/manage.tpl
- M framework/modules/ealerts/views/ealert/showall.tpl
- M framework/modules/ealerts/views/ealert/subscriptions.tpl
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/products/views/product/storeListing.tpl
- M framework/modules/ecommerce/views/billing/manage.tpl
- M framework/modules/ecommerce/views/cart/selectShippingMethods.tpl
- M framework/modules/ecommerce/views/cart/show_cart_only.tpl
- M framework/modules/ecommerce/views/cart/splitShipping.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_discounts.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_groupdiscounts.tpl
- M framework/modules/ecommerce/views/ecomconfig/manage_promocodes.tpl
- M framework/modules/ecommerce/views/eventregistration/showall.tpl
- M framework/modules/ecommerce/views/eventregistration/view_registrants.tpl
- M framework/modules/ecommerce/views/order/ordersbyuser.tpl
- M framework/modules/ecommerce/views/order/show.tpl
- M framework/modules/ecommerce/views/order/showall.tpl
- M framework/modules/ecommerce/views/order_status/manage.tpl
- M framework/modules/ecommerce/views/order_status/manage_messages.tpl
- M framework/modules/ecommerce/views/order_type/manage.tpl
- M framework/modules/ecommerce/views/product_status/manage.tpl
- M framework/modules/ecommerce/views/shipping/manage.tpl
- M framework/modules/ecommerce/views/store/manage.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/ecommerce/views/store/showallUncategorized.tpl
- M framework/modules/faq/views/faq/manage.tpl
- M framework/modules/file/views/file/picker_cke.tpl
- M framework/modules/file/views/file/uploader.tpl
- M framework/modules/filedownloads/views/filedownload/configure/file_downloads.tpl
- M framework/modules/filedownloads/views/filedownload/edit.tpl
- M framework/modules/filedownloads/views/filedownload/showall.tpl
- M framework/modules/filedownloads/views/filedownload/showall_quick_download_with_description.tpl
- M framework/modules/help/views/help/edit.tpl
- M framework/modules/help/views/help/manage.tpl
- M framework/modules/help/views/help/manage_versions.tpl
- M framework/modules/links/views/links/showall.tpl
- M framework/modules/links/views/links/showall_quicklinks.tpl
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/migration/views/migration/configure.tpl
- M framework/modules/migration/views/migration/manage_content.tpl
- M framework/modules/migration/views/migration/manage_files.tpl
- M framework/modules/migration/views/migration/manage_pages.tpl
- M framework/modules/migration/views/migration/manage_users.tpl
- M framework/modules/migration/views/migration/migrate_content.tpl
- M framework/modules/migration/views/migration/migrate_files.tpl
- M framework/modules/motd/views/motd/showall.tpl
- M framework/modules/news/views/news/configure/news.tpl
- M framework/modules/news/views/news/showUnpublished.tpl
- M framework/modules/news/views/news/showall.tpl
- M framework/modules/photoalbum/assets/css/photoalbum.css
- M framework/modules/photoalbum/assets/css/yui3-slideshow.css
- M framework/modules/photoalbum/controllers/photosController.php
- M framework/modules/photoalbum/views/photos/configure/slideshow.config
- M framework/modules/photoalbum/views/photos/edit.tpl
- M framework/modules/photoalbum/views/photos/show.tpl
- M framework/modules/photoalbum/views/photos/showall.tpl
- M framework/modules/photoalbum/views/photos/slideshow.tpl
- M framework/modules/portfolio/views/portfolio/configure/portfolio.tpl
- M framework/modules/portfolio/views/portfolio/showall.tpl
- M framework/modules/snippet/controllers/snippetController.php
- M framework/modules/snippet/views/snippet/showall.tpl
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/views/users/change_password.tpl
- M framework/modules/users/views/users/edituser.tpl
- M framework/modules/users/views/users/manage.tpl
- M framework/modules/users/views/users/manage_extensions.tpl
- M framework/modules/users/views/users/manage_group_memberships.tpl
- M framework/modules/users/views/users/manage_groups.tpl
- M framework/modules/users/views/users/manage_sessions.tpl
- M index.php
- M install/index.php
- M install/pages/admin_user.php
- M install/pages/final.php
- M install/pages/upgrade.php
- M install/pages/welcome.php
- M install/popups/sanity.php
- M install/style.css
- M modules/administrationmodule/views/_form_uploadExt.tpl
- M modules/administrationmodule/views/_groupmembership.tpl
- M modules/administrationmodule/views/_modulemanager.tpl
- M modules/administrationmodule/views/_tableInstallSummary.tpl
- M modules/common/actions/savegroupperms.php
- M modules/common/actions/saveuserperms.php
- M modules/common/views/_grouppermissions.tpl
- M modules/common/views/_permissions.tpl
- M modules/common/views/_userpermissions.tpl
- M modules/formbuilder/actions/edit_control.php
- M modules/formbuilder/actions/edit_form.php
- M modules/formbuilder/actions/edit_record.php
- M modules/formbuilder/actions/edit_report.php
- M modules/formbuilder/actions/save_control.php
- M modules/formbuilder/actions/submit_form.php
- M modules/formbuilder/actions/view_data.php
- M modules/formbuilder/views/_custom_report.tpl
- M modules/formbuilder/views/_data_view.tpl
- M modules/formbuilder/views/_default_report.tpl
- M modules/formbuilder/views/_view_form.tpl
- M modules/formmodule/class.php
- M modules/formmodule/views/Default.tpl
- M modules/navigationmodule/views/_form_editContentPage.tpl
- M modules/navigationmodule/views/_manager_hierarchy.tpl
- M modules/navigationmodule/views/_manager_standalone.tpl
- M plugins/function.img.php
- M plugins/modifier.summarize.php
- M readme-ical.txt
- M readme-reminders.txt
- M subsystems/config.php
- M subsystems/config/load.php
- M subsystems/forms/controls/checkboxcontrol.php
- M subsystems/forms/controls/ckeditorcontrol.php
- M subsystems/lang/eng_US/datatypes/formbuilder_report.php
- M subsystems/lang/eng_US/install/popups/sanity.php
- M subsystems/lang/eng_US/modules/formbuilder/views/_data_view.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