Changeset [12458646f2fde205fe4436e11970fd100aa8af70] by dleffler
August 31st, 2011 @ 08:19 PM
Merge branch 'release/v2.0.0' into develop
Conflicts:
framework/modules-1/exporter/exporters/eql/savefile.php
framework/modules/administration/views/administration/configure_site.tpl
framework/modules/twitter/models/Twitter.php
framework/modules/twitter/views/twitter/configure/twitter.tpl
framework/modules/twitter/views/twitter/showall.tpl
https://github.com/exponentcms/exponent-cms/commit/12458646f2fde205...
Committed by dleffler
- A framework/modules/twitter/views/twitter/edit.tpl
- A themes/simpletheme/class.php
- A themes/simpletheme/config.php
- A themes/simpletheme/css/0-base-styles.css
- A themes/simpletheme/css/1-nav.css
- A themes/simpletheme/css/2-search.css
- A themes/simpletheme/images/menubaritem_submenuindicator.png
- A themes/simpletheme/images/menubaritem_submenuindicator_selected.png
- A themes/simpletheme/images/menuitem_submenuindicator.png
- A themes/simpletheme/images/menuitem_submenuindicator_selected.png
- A themes/simpletheme/index.php
- A themes/simpletheme/preview.jpg
- A themes/simpletheme/sample.eql
- A themes/simpletheme/sample.tar.gz
- M CHANGELOG
- M conf/extensions/antispam.structure.php
- M exponent_version.php
- M external/phpThumb/phpthumb.class.php
- M framework/core/assets/css/button.css
- M framework/core/assets/js/exp-ecomcheckout.js
- M framework/core/assets/js/exp-slideshow.js
- M framework/core/assets/js/exp-tree.js
- M framework/core/subsystems-1/backup.php
- M framework/core/subsystems-1/forms/controls/listbuildercontrol.php
- M framework/core/subsystems-1/forms/js/AuthorizeNet.validate.js
- M framework/core/subsystems-1/forms/js/alphanum_filter.js
- M framework/core/subsystems-1/forms/js/decimal_filter.js
- M framework/core/subsystems-1/forms/js/integer_filter.js
- M framework/core/subsystems-1/forms/js/money_filter.js
- M framework/core/subsystems-1/forms/js/percent_filter.js
- M framework/core/subsystems-1/forms/js/required.js
- M framework/core/subsystems/expHistory.php
- M framework/core/subsystems/expTheme.php
- M framework/core/subsystems/expValidator.php
- M framework/core/subsystems/expVersion.php
- M framework/modules-1/administrationmodule/views/_form_EditorControl_Toolbar.tpl
- M framework/modules-1/calendarmodule/views/_form_delete.tpl
- M framework/modules-1/calendarmodule/views/_recur_dates.tpl
- M framework/modules-1/exporter/exporters/eql/start.php
- M framework/modules-1/exporter/exporters/files/export.php
- M framework/modules-1/exporter/exporters/files/start.php
- M framework/modules-1/exporter/views/_eql_tableList.tpl
- M framework/modules-1/exporter/views/_files_modList.tpl
- M framework/modules-1/formbuilder/actions/delete_control.php
- M framework/modules-1/formbuilder/actions/edit_control.php
- M framework/modules-1/formbuilder/views/_custom_report.tpl
- M framework/modules-1/formbuilder/views/_data_view.tpl
- M framework/modules-1/formbuilder/views/_default_report.tpl
- M framework/modules-1/formbuilder/views/_view_form.tpl
- M framework/modules-1/formbuilder/views/_view_response.tpl
- M framework/modules-1/importer/views/_files_selectModList.tpl
- M framework/modules-1/simplepollmodule/views/Default.tpl
- M framework/modules-1/simplepollmodule/views/_manageQuestion.tpl
- M framework/modules-1/simplepollmodule/views/_manageQuestions.tpl
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/administration/views/administration/quicklinks_Developer_Links.tpl
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/faq/controllers/faqController.php
- M framework/modules/faq/views/faq/ask_question.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/edit.tpl
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/navigation/assets/js/yui-top-nav-js.js
- M framework/modules/news/models/rssfeed.php
- M framework/modules/photoalbum/assets/js/slideshow.js
- M framework/modules/twitter/controllers/twitterController.php
- M framework/modules/twitter/models/Twitter.php
- M framework/modules/twitter/views/twitter/configure/twitter.tpl
- M framework/modules/twitter/views/twitter/showall.tpl
- M framework/modules/users/models/user.php
- M framework/modules/users/views/extensions/user_avatar.tpl
- M framework/plugins/block.paginate.php
- M framework/plugins/function.chain.php
- M framework/plugins/modifier.convertLangCode.php
- M install/index.php
- M install/pages/install-2.php
- M install/popups/db_create.php
- M install/style.css
- M install/upgrades/fix_database.php
- M install/upgrades/version_tracking.php
- M orphan_content_selector.php
- M orphan_source_selector.php
- M themes/basetheme/class.php
- M themes/basetheme/sample.eql
- M themes/coolwatertheme/class.php
- M themes/coolwatertheme/sample.eql
- M themes/retrotheme/class.php
- M themes/retrotheme/sample.eql
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