List changesets

Changeset [6f8a2186fd785c3821196b5746ec1ffe7a5a9f2e] by dleffler

January 23rd, 2016 @ 03:42 PM

Merge branch 'develop'

Conflicts:

framework/modules/text/views/text/showall_inline.bootstrap3.tpl

https://github.com/exponentcms/exponent-cms/commit/6f8a2186fd785c38...

Committed by dleffler

A external/easypost-php-3.0.1/CHANGELOG
A external/easypost-php-3.0.1/LICENSE
A external/easypost-php-3.0.1/README.md
A external/easypost-php-3.0.1/VERSION
A external/easypost-php-3.0.1/lib/EasyPost/Address.php
A external/easypost-php-3.0.1/lib/EasyPost/Batch.php
A external/easypost-php-3.0.1/lib/EasyPost/CarrierAccount.php
A external/easypost-php-3.0.1/lib/EasyPost/Container.php
A external/easypost-php-3.0.1/lib/EasyPost/CustomsInfo.php
A external/easypost-php-3.0.1/lib/EasyPost/CustomsItem.php
A external/easypost-php-3.0.1/lib/EasyPost/EasyPost.php
A external/easypost-php-3.0.1/lib/EasyPost/Error.php
A external/easypost-php-3.0.1/lib/EasyPost/Event.php
A external/easypost-php-3.0.1/lib/EasyPost/Fee.php
A external/easypost-php-3.0.1/lib/EasyPost/Item.php
A external/easypost-php-3.0.1/lib/EasyPost/Object.php
A external/easypost-php-3.0.1/lib/EasyPost/Order.php
A external/easypost-php-3.0.1/lib/EasyPost/Parcel.php
A external/easypost-php-3.0.1/lib/EasyPost/Pickup.php
A external/easypost-php-3.0.1/lib/EasyPost/PostageLabel.php
A external/easypost-php-3.0.1/lib/EasyPost/Rate.php
A external/easypost-php-3.0.1/lib/EasyPost/Refund.php
A external/easypost-php-3.0.1/lib/EasyPost/Requestor.php
A external/easypost-php-3.0.1/lib/EasyPost/Resource.php
A external/easypost-php-3.0.1/lib/EasyPost/ScanForm.php
A external/easypost-php-3.0.1/lib/EasyPost/Shipment.php
A external/easypost-php-3.0.1/lib/EasyPost/Tracker.php
A external/easypost-php-3.0.1/lib/EasyPost/User.php
A external/easypost-php-3.0.1/lib/EasyPost/Util.php
A external/easypost-php-3.0.1/lib/cacert.pem
A external/easypost-php-3.0.1/lib/easypost.php
A external/editors/ckeditor/plugins/autosave/css/autosave.css
A external/editors/ckeditor/plugins/autosave/css/autosave.min.css
A external/editors/ckeditor/plugins/autosave/js/difflib.js
A external/editors/ckeditor/plugins/autosave/js/diffview.js
A external/editors/ckeditor/plugins/autosave/js/extensions.min.js
A external/editors/ckeditor/plugins/autosave/js/jsdiff.js
A external/editors/ckeditor/plugins/autosave/js/lz-string-1.3.3.js
A external/editors/ckeditor/plugins/autosave/js/moment.js
A external/editors/ckeditor/plugins/autosave/lang/ca.js
A external/editors/ckeditor/plugins/autosave/lang/cs.js
A external/editors/ckeditor/plugins/autosave/lang/de.js
A external/editors/ckeditor/plugins/autosave/lang/en.js
A external/editors/ckeditor/plugins/autosave/lang/es.js
A external/editors/ckeditor/plugins/autosave/lang/fr.js
A external/editors/ckeditor/plugins/autosave/lang/ja.js
A external/editors/ckeditor/plugins/autosave/lang/pl.js
A external/editors/ckeditor/plugins/autosave/lang/pt-br.js
A external/editors/ckeditor/plugins/autosave/lang/sv.js
A external/editors/ckeditor/plugins/autosave/lang/zh-cn.js
A external/editors/ckeditor/plugins/autosave/lang/zh.js
A external/editors/ckeditor/plugins/autosave/plugin.js
A external/editors/tinymce/plugins/localautosave/langs/de.js
A external/editors/tinymce/plugins/localautosave/langs/en.js
A external/editors/tinymce/plugins/localautosave/langs/es.js
A external/editors/tinymce/plugins/localautosave/langs/fr_FR.js
A external/editors/tinymce/plugins/localautosave/langs/it.js
A external/editors/tinymce/plugins/localautosave/langs/pt_BR.js
A external/editors/tinymce/plugins/localautosave/langs/tr.js
A external/editors/tinymce/plugins/localautosave/langs/zh_CN.js
A external/editors/tinymce/plugins/localautosave/plugin.js
A external/editors/tinymce/plugins/localautosave/plugin.min.js
A external/elFinder/js/commands/opendir.js
A external/jquery/addons/css/owl.carousel.css
A external/jquery/addons/css/owl.theme.default.css
A external/jquery/addons/css/owl.theme.green.css
A external/jquery/addons/images/owl.video.play.png
A external/jquery/addons/js/bootstrap-datetimepicker.js
A external/jquery/addons/js/moment.js
A external/jquery/addons/js/owl.carousel.js
A external/jquery/addons/less/_bootstrap-datetimepicker.less
A external/jquery/addons/less/bootstrap-datetimepicker.less
A external/jquery/js/jquery-1.12.0.min.js
A external/jquery/js/jquery-2.2.0.min.js
A framework/modules/photoalbum/views/photo/slideshow.bootstrap3.tpl
A install/upgrades/change_permissions.php
A install/upgrades/change_permissions2.php
R external/easypost-php-3.0.0/CHANGELOG
R external/easypost-php-3.0.0/LICENSE
R external/easypost-php-3.0.0/README.md
R external/easypost-php-3.0.0/VERSION
R external/easypost-php-3.0.0/lib/EasyPost/Address.php
R external/easypost-php-3.0.0/lib/EasyPost/Batch.php
R external/easypost-php-3.0.0/lib/EasyPost/CarrierAccount.php
R external/easypost-php-3.0.0/lib/EasyPost/Container.php
R external/easypost-php-3.0.0/lib/EasyPost/CustomsInfo.php
R external/easypost-php-3.0.0/lib/EasyPost/CustomsItem.php
R external/easypost-php-3.0.0/lib/EasyPost/EasyPost.php
R external/easypost-php-3.0.0/lib/EasyPost/Error.php
R external/easypost-php-3.0.0/lib/EasyPost/Event.php
R external/easypost-php-3.0.0/lib/EasyPost/Fee.php
R external/easypost-php-3.0.0/lib/EasyPost/Item.php
R external/easypost-php-3.0.0/lib/EasyPost/Object.php
R external/easypost-php-3.0.0/lib/EasyPost/Order.php
R external/easypost-php-3.0.0/lib/EasyPost/Parcel.php
R external/easypost-php-3.0.0/lib/EasyPost/Pickup.php
R external/easypost-php-3.0.0/lib/EasyPost/PostageLabel.php
R external/easypost-php-3.0.0/lib/EasyPost/Rate.php
R external/easypost-php-3.0.0/lib/EasyPost/Refund.php
R external/easypost-php-3.0.0/lib/EasyPost/Requestor.php
R external/easypost-php-3.0.0/lib/EasyPost/Resource.php
R external/easypost-php-3.0.0/lib/EasyPost/ScanForm.php
R external/easypost-php-3.0.0/lib/EasyPost/Shipment.php
R external/easypost-php-3.0.0/lib/EasyPost/Tracker.php
R external/easypost-php-3.0.0/lib/EasyPost/User.php
R external/easypost-php-3.0.0/lib/EasyPost/Util.php
R external/easypost-php-3.0.0/lib/cacert.pem
R external/easypost-php-3.0.0/lib/easypost.php
R external/jquery/js/jquery-1.11.3.min.js
R external/jquery/js/jquery-2.1.4.min.js
M ".htaccess"
M CHANGELOG.md
M exponent_constants.php
M external/ExtPrograms.csv
M external/editors/ckeditor/styles.js
M external/editors/tinymce/changelog.txt
M external/editors/tinymce/langs/cs.js
M external/editors/tinymce/langs/da.js
M external/editors/tinymce/langs/es.js
M external/editors/tinymce/langs/fi.js
M external/editors/tinymce/langs/nb_NO.js
M external/editors/tinymce/langs/nl.js
M external/editors/tinymce/plugins/autolink/plugin.min.js
M external/editors/tinymce/plugins/autoresize/plugin.min.js
M external/editors/tinymce/plugins/autosave/plugin.min.js
M external/editors/tinymce/plugins/charmap/plugin.min.js
M external/editors/tinymce/plugins/fullpage/plugin.min.js
M external/editors/tinymce/plugins/fullscreen/plugin.min.js
M external/editors/tinymce/plugins/image/plugin.min.js
M external/editors/tinymce/plugins/imagetools/plugin.min.js
M external/editors/tinymce/plugins/link/plugin.min.js
M external/editors/tinymce/plugins/lists/plugin.min.js
M external/editors/tinymce/plugins/media/plugin.min.js
M external/editors/tinymce/plugins/paste/plugin.min.js
M external/editors/tinymce/plugins/searchreplace/plugin.min.js
M external/editors/tinymce/plugins/spellchecker/plugin.min.js
M external/editors/tinymce/plugins/table/plugin.min.js
M external/editors/tinymce/plugins/template/plugin.min.js
M external/editors/tinymce/plugins/textcolor/plugin.min.js
M external/editors/tinymce/plugins/textpattern/plugin.min.js
M external/editors/tinymce/plugins/visualchars/plugin.min.js
M external/editors/tinymce/skins/lightgray/content.inline.min.css
M external/editors/tinymce/skins/lightgray/content.min.css
M external/editors/tinymce/skins/lightgray/skin.ie7.min.css
M external/editors/tinymce/skins/lightgray/skin.min.css
M external/editors/tinymce/themes/modern/theme.min.js
M external/editors/tinymce/tinymce.min.js
M external/elFinder/Changelog
M external/elFinder/README.md
M external/elFinder/css/commands.css
M external/elFinder/css/contextmenu.css
M external/elFinder/css/cwd.css
M external/elFinder/css/dialog.css
M external/elFinder/css/toolbar.css
M external/elFinder/img/toolbar.png
M external/elFinder/js/commands/paste.js
M external/elFinder/js/commands/quicklook.js
M external/elFinder/js/commands/reload.js
M external/elFinder/js/commands/rename.js
M external/elFinder/js/commands/resize.js
M external/elFinder/js/commands/rm.js
M external/elFinder/js/commands/search.js
M external/elFinder/js/commands/upload.js
M external/elFinder/js/elFinder.js
M external/elFinder/js/elFinder.options.js
M external/elFinder/js/elFinder.resources.js
M external/elFinder/js/elFinder.version.js
M external/elFinder/js/i18n/elfinder.en.js
M external/elFinder/js/i18n/elfinder.jp.js
M external/elFinder/js/jquery.elfinder.js
M external/elFinder/js/ui/cwd.js
M external/elFinder/js/ui/path.js
M external/elFinder/js/ui/places.js
M external/elFinder/js/ui/stat.js
M external/elFinder/js/ui/tree.js
M external/elFinder/php/elFinder.class.php
M external/elFinder/php/elFinderVolumeDriver.class.php
M external/elFinder/php/elFinderVolumeLocalFileSystem.class.php
M external/elFinder/php/plugins/AutoResize/plugin.php
M external/elFinder/php/plugins/Normalizer/plugin.php
M external/jquery/addons/js/bootstrap-dialog.js
M external/jquery/addons/js/migrate.js
M external/jquery/addons/less/bootstrap-dialog.less
M external/mp3file.php
M framework/conf/config.php.example
M framework/conf/data/dir_permissions.dropdown
M framework/conf/data/file_permissions.dropdown
M framework/conf/extensions/maint.defaults.php
M framework/conf/extensions/security.defaults.php
M framework/core/assets/less/common.less
M framework/core/assets/less/toggle.less
M framework/core/controllers/expController.php
M framework/core/forms/controls/bootstrap/genericcontrol.php
M framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
M framework/core/forms/controls/bootstrap3/tinymcecontrol.php
M framework/core/forms/controls/bootstrap3/yuicalendarcontrol.php
M framework/core/forms/controls/bootstrap3/yuidatetimecontrol.php
M framework/core/forms/controls/ckeditorcontrol.php
M framework/core/forms/controls/jquery/yuidatetimecontrol.php
M framework/core/forms/controls/newui/genericcontrol.php
M framework/core/forms/controls/tinymcecontrol.php
M framework/core/forms/controls/yuidatetimecontrol.php
M framework/core/subsystems/expCSS.php
M framework/core/subsystems/expHistory.php
M framework/core/subsystems/expString.php
M framework/modules/administration/controllers/administrationController.php
M framework/modules/blog/models/blog.php
M framework/modules/blog/views/blog/bloglist.tpl
M framework/modules/blog/views/blog/showall_recent.tpl
M framework/modules/common/views/configure/rss.tpl
M framework/modules/ecommerce/assets/css/ecom-bs3.css
M framework/modules/ecommerce/products/models/product.php
M framework/modules/ecommerce/shippingcalculators/easypostcalculator.php
M framework/modules/events/assets/css/default.css
M framework/modules/events/views/event/show.tpl
M framework/modules/faq/views/faq/manage.tpl
M framework/modules/faq/views/faq/showall.tpl
M framework/modules/faq/views/faq/showall_toggle.tpl
M framework/modules/file/connector/elFinder.options.js
M framework/modules/file/connector/elfinder.php
M framework/modules/file/connector/i18n/elfinder.en.js
M framework/modules/file/connector/resize.js
M framework/modules/file/controllers/fileController.php
M framework/modules/file/models/expFile.php
M framework/modules/file/views/file/adder.tpl
M framework/modules/file/views/file/deleter.tpl
M framework/modules/filedownloads/controllers/filedownloadController.php
M framework/modules/filedownloads/models/filedownload.php
M framework/modules/filedownloads/views/filedownload/configure/podcast.tpl
M framework/modules/filedownloads/views/filedownload/filedownloaditem.tpl
M framework/modules/news/models/news.php
M framework/modules/news/views/news/newslist.tpl
M framework/modules/news/views/news/showall_announcement.bootstrap3.tpl
M framework/modules/news/views/news/showall_announcement.tpl
M framework/modules/news/views/news/showall_recent.tpl
M framework/modules/photoalbum/assets/css/slideshow_bs.css
M framework/modules/photoalbum/views/photo/configure/slideshow.bootstrap.config
M framework/modules/portfolio/views/portfolio/portfolioitem.tpl
M framework/modules/portfolio/views/portfolio/portfoliolist_toggle.tpl
M framework/modules/rss/definitions/expRss.php
M framework/modules/rss/models/expRss.php
M framework/modules/text/controllers/textController.php
M framework/modules/text/views/text/showall_inline.bootstrap.tpl
M framework/modules/text/views/text/showall_inline.bootstrap3.tpl
M framework/modules/text/views/text/showall_inline.tpl
M framework/modules/twitter/assets/css/tweets.css
M framework/plugins/modifier.summarize.php
M index.php
M install/changes/2.3.6.txt
M install/changes/2.3.7.txt
M install/changes/2.3.8.txt
M install/include/sanity.php
M install/index.php
M install/pages/final.php
M install/pages/install-3.php
M install/pages/install-6.php
M install/pages/install-7.php
M install/pages/upgrade-4.php
M install/pages/welcome.php
M install/popups/sanity.php
M install/upgrades/clear_cache.php
M install/upgrades/remove_oldfiles.php
M install/upgrades/upgrade_calendar.php
M phpdoc.xml

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

Shared Ticket Bins (Sort)

↓↑ drag 337 Open tickets
↓↑ drag 775 Resolved tickets
↓↑ drag 0 This week's tickets