Changeset [1cf641987771a5d9340ea6c5c554219475eee358] by rasseljandavid
May 4th, 2012 @ 07:30 PM
Merge remote-tracking branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/1cf641987771a5d9...
Committed by rasseljandavid
- A framework/modules-1/formbuilder/actions/manage_ranks.php
- A framework/modules-1/simplepollmodule/actions/manage_ranks.php
- A framework/modules/recyclebin/views/recyclebin/showall.tpl
- M CHANGELOG
- M conf/extensions/avatar.defaults.php
- M framework/core/assets/css/admin-global.css
- M framework/core/assets/js/exp-attachableitems.js
- M framework/core/assets/js/exp-ecomm.js
- M framework/core/assets/js/exp-filepicker.js
- M framework/core/assets/js/exp-tree.js
- M framework/core/assets/js/exp-upload.js
- M framework/core/controllers/expCatController.php
- M framework/core/models-1/calendar.php
- M framework/core/models-1/section.php
- M framework/core/models-1/section_template.php
- M framework/core/subsystems/expHtmlToPDF2.php
- M framework/core/subsystems/expModules.php
- M framework/core/subsystems/expPaginator.php
- M framework/core/subsystems/expSorter.php
- M framework/core/subsystems/forms/baseform.php
- M framework/core/subsystems/forms/basetemplate.php
- M framework/core/subsystems/forms/controllertemplate.php
- M framework/core/subsystems/forms/controls/autocompletecontrol.php
- M framework/core/subsystems/forms/controls/ckeditorcontrol.php
- M framework/core/subsystems/forms/controls/filemanagercontrol.php
- M framework/core/subsystems/forms/controls/listcontrol.php
- M framework/core/subsystems/forms/controls/uploadcontrol.php
- M framework/core/subsystems/forms/controls/yuidatetimecontrol.php
- M framework/core/subsystems/forms/fakeform.php
- M framework/modules-1/calendarmodule/actions/delete_form.php
- M framework/modules-1/calendarmodule/assets/css/calendar.css
- M framework/modules-1/calendarmodule/assets/js/calendar.js
- M framework/modules-1/calendarmodule/forms/calendar/_recurring.tpl
- M framework/modules-1/calendarmodule/views/Default.tpl
- M framework/modules-1/calendarmodule/views/Monthly List.tpl
- M framework/modules-1/calendarmodule/views/_recur_dates.tpl
- M framework/modules-1/calendarmodule/views/_viewday.tpl
- M framework/modules-1/calendarmodule/views/_viewweek.tpl
- M framework/modules-1/containermodule/views/Default.tpl
- M framework/modules-1/containermodule/views/Tabbed.tpl
- M framework/modules-1/containermodule/views/Three Column.tpl
- M framework/modules-1/containermodule/views/Two Column.tpl
- M framework/modules-1/containermodule/views/_form_edit.tpl
- M framework/modules-1/exporter/views/_eql_tableList.tpl
- M framework/modules-1/formbuilder/actions/confirm_form.php
- M framework/modules-1/formbuilder/actions/edit_record.php
- M framework/modules-1/formbuilder/actions/export_csv.php
- M framework/modules-1/formbuilder/actions/picked_source.php
- M framework/modules-1/formbuilder/actions/submit_form.php
- M framework/modules-1/formbuilder/actions/view_data.php
- M framework/modules-1/formbuilder/actions/view_form.php
- M framework/modules-1/formbuilder/actions/view_record.php
- M framework/modules-1/formbuilder/views/_confirm_form.tpl
- M framework/modules-1/formbuilder/views/_view_form.tpl
- M framework/modules-1/formmodule/class.php
- M framework/modules-1/importer/importers/eql/process.php
- M framework/modules-1/importer/views/_files_selectModList.tpl
- M framework/modules-1/navigationmodule/class.php
- M framework/modules-1/navigationmodule/views/_manager_hierarchy.tpl
- M framework/modules-1/navigationmodule/views/_manager_standalone.tpl
- M framework/modules-1/navigationmodule/views/_view_template.tpl
- M framework/modules-1/simplepollmodule/actions/manage_question.php
- M framework/modules-1/simplepollmodule/actions/results.php
- M framework/modules-1/simplepollmodule/actions/vote.php
- M framework/modules-1/simplepollmodule/class.php
- M framework/modules-1/simplepollmodule/views/Default.tpl
- M framework/modules-1/simplepollmodule/views/_manageQuestion.tpl
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/menus/ecomm.php
- M framework/modules/administration/views/administration/quicklinks_Administration_Links.tpl
- M framework/modules/blog/views/blog/configure/aggregation.tpl
- M framework/modules/common/views/configure/aggregation.tpl
- M framework/modules/common/views/configure/categories.tpl
- M framework/modules/common/views/configure/ealerts.tpl
- M framework/modules/common/views/configure/files.tpl
- M framework/modules/common/views/file/Showcase.tpl
- M framework/modules/countdown/views/countdown/show.tpl
- M framework/modules/ealerts/controllers/ealertController.php
- M framework/modules/ealerts/views/ealert/send_confirm.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/views/cart/show_cart_only.tpl
- M framework/modules/ecommerce/views/order/invoice.tpl
- M framework/modules/ecommerce/views/purchaseOrder/edit.tpl
- M framework/modules/ecommerce/views/store/ecom_search.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/faq/controllers/faqController.php
- M framework/modules/file/assets/js/filemanager.js
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/views/file/adder.tpl
- M framework/modules/file/views/file/deleter.tpl
- M framework/modules/file/views/file/picker_cke.tpl
- M framework/modules/file/views/file/uploader.tpl
- M framework/modules/filedownloads/controllers/filedownloadController.php
- M framework/modules/filedownloads/views/filedownload/configure/file_downloads.tpl
- M framework/modules/filedownloads/views/filedownload/filedownloaditem.tpl
- M framework/modules/filedownloads/views/filedownload/show.tpl
- M framework/modules/filedownloads/views/filedownload/showall.tpl
- M framework/modules/filedownloads/views/filedownload/showall_recent.tpl
- M framework/modules/flowplayer/views/flowplayer/showall.tpl
- M framework/modules/flowplayer/views/flowplayer/showall_playlist.tpl
- M framework/modules/help/views/help/select_version.tpl
- M framework/modules/links/controllers/linksController.php
- M framework/modules/migration/views/migration/manage_content.tpl
- M framework/modules/migration/views/migration/manage_pages.tpl
- M framework/modules/migration/views/migration/manage_users.tpl
- M framework/modules/news/views/news/edit.tpl
- M framework/modules/news/views/news/showall_headlines.tpl
- M framework/modules/notfound/views/notfound/page_not_found.tpl
- M framework/modules/photoalbum/controllers/photosController.php
- M framework/modules/photoalbum/views/photo/showall.tpl
- M framework/modules/photoalbum/views/photo/showall_galleries.tpl
- M framework/modules/pixidou/assets/js/pixidou.js
- M framework/modules/pixidou/assets/js/ui.js
- M framework/modules/pixidou/views/pixidou/editor.tpl
- M framework/modules/portfolio/controllers/portfolioController.php
- M framework/modules/portfolio/views/portfolio/showall.tpl
- M framework/modules/portfolio/views/portfolio/showall_simple_list.tpl
- M framework/modules/recyclebin/assets/css/recyclebin.css
- M framework/modules/recyclebin/controllers/recyclebinController.php
- M framework/modules/recyclebin/models/recyclebin.php
- M framework/modules/recyclebin/views/recyclebin/show.tpl
- M framework/modules/search/views/search/search.tpl
- M framework/modules/search/views/search/searchQueryReport.tpl
- M framework/modules/search/views/search/show.tpl
- M framework/modules/twitter/views/twitter/showall.tpl
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/extensions/user_avatar.php
- M framework/modules/users/views/login/showlogin_expanded.tpl
- M framework/modules/users/views/users/edituser.tpl
- M framework/modules/users/views/users/manage.tpl
- M framework/plugins/block.form.php
- M framework/plugins/function.control.php
- M framework/plugins/function.ddrerank.php
- M framework/plugins/function.editorinclude.php
- M framework/plugins/function.getchromemenu.php
- M framework/plugins/function.img.php
- M framework/plugins/function.prod_images.php
- M framework/plugins/function.rating.php
- M framework/plugins/function.scaffold.php
- M framework/plugins/function.yuilogger.php
- M install/pages/final.php
- M install/pages/install-5.php
- M install/upgrades/update_profile_paths.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