Changeset [ace5c3579a404c03521ae00d33645e9a5907360b] by dleffler
March 22nd, 2014 @ 07:00 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/expFramework.php
framework/core/forms/basetemplate.php
https://github.com/exponentcms/exponent-cms/commit/ace5c3579a404c03...
Committed by dleffler
- A external/Swift-5.1.0/CHANGES
- A external/Swift-5.1.0/LICENSE
- A external/Swift-5.1.0/README
- A external/Swift-5.1.0/VERSION
- A external/Swift-5.1.0/lib/classes/Swift.php
- A external/Swift-5.1.0/lib/classes/Swift/Attachment.php
- A external/Swift-5.1.0/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
- A external/Swift-5.1.0/lib/classes/Swift/ByteStream/ArrayByteStream.php
- A external/Swift-5.1.0/lib/classes/Swift/ByteStream/FileByteStream.php
- A external/Swift-5.1.0/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterReader.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterReader/UsAsciiReader.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterReader/Utf8Reader.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterReaderFactory.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterStream.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
- A external/Swift-5.1.0/lib/classes/Swift/CharacterStream/NgCharacterStream.php
- A external/Swift-5.1.0/lib/classes/Swift/ConfigurableSpool.php
- A external/Swift-5.1.0/lib/classes/Swift/DependencyContainer.php
- A external/Swift-5.1.0/lib/classes/Swift/DependencyException.php
- A external/Swift-5.1.0/lib/classes/Swift/EmbeddedFile.php
- A external/Swift-5.1.0/lib/classes/Swift/Encoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Encoder/Base64Encoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Encoder/QpEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Encoder/Rfc2231Encoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Encoding.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/CommandEvent.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/CommandListener.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/Event.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/EventDispatcher.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/EventListener.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/EventObject.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/ResponseEvent.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/ResponseListener.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/SendEvent.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/SendListener.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/SimpleEventDispatcher.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/TransportChangeEvent.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/TransportChangeListener.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/TransportExceptionEvent.php
- A external/Swift-5.1.0/lib/classes/Swift/Events/TransportExceptionListener.php
- A external/Swift-5.1.0/lib/classes/Swift/FailoverTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/FileSpool.php
- A external/Swift-5.1.0/lib/classes/Swift/FileStream.php
- A external/Swift-5.1.0/lib/classes/Swift/Filterable.php
- A external/Swift-5.1.0/lib/classes/Swift/Image.php
- A external/Swift-5.1.0/lib/classes/Swift/InputByteStream.php
- A external/Swift-5.1.0/lib/classes/Swift/IoException.php
- A external/Swift-5.1.0/lib/classes/Swift/KeyCache.php
- A external/Swift-5.1.0/lib/classes/Swift/KeyCache/ArrayKeyCache.php
- A external/Swift-5.1.0/lib/classes/Swift/KeyCache/DiskKeyCache.php
- A external/Swift-5.1.0/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
- A external/Swift-5.1.0/lib/classes/Swift/KeyCache/NullKeyCache.php
- A external/Swift-5.1.0/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
- A external/Swift-5.1.0/lib/classes/Swift/LoadBalancedTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/MailTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Mailer.php
- A external/Swift-5.1.0/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
- A external/Swift-5.1.0/lib/classes/Swift/Mailer/RecipientIterator.php
- A external/Swift-5.1.0/lib/classes/Swift/MemorySpool.php
- A external/Swift-5.1.0/lib/classes/Swift/Message.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Attachment.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/CharsetObserver.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ContentEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/EmbeddedFile.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/EncodingObserver.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Grammar.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Header.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/HeaderEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/HeaderFactory.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/HeaderSet.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/AbstractHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/DateHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/MailboxHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/PathHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/Message.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/MimeEntity.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/MimePart.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/ParameterizedHeader.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/SimpleHeaderFactory.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/SimpleHeaderSet.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/SimpleMessage.php
- A external/Swift-5.1.0/lib/classes/Swift/Mime/SimpleMimeEntity.php
- A external/Swift-5.1.0/lib/classes/Swift/MimePart.php
- A external/Swift-5.1.0/lib/classes/Swift/NullTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/OutputByteStream.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/AntiFloodPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Decorator/Replacements.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/DecoratorPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/ImpersonatePlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Logger.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/LoggerPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Loggers/eDebugLogger.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/MessageLogger.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/RedirectingPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Reporter.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/ReporterPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Reporters/HitReporter.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Sleeper.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/ThrottlerPlugin.php
- A external/Swift-5.1.0/lib/classes/Swift/Plugins/Timer.php
- A external/Swift-5.1.0/lib/classes/Swift/Preferences.php
- A external/Swift-5.1.0/lib/classes/Swift/ReplacementFilterFactory.php
- A external/Swift-5.1.0/lib/classes/Swift/RfcComplianceException.php
- A external/Swift-5.1.0/lib/classes/Swift/SendmailTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/SignedMessage.php
- A external/Swift-5.1.0/lib/classes/Swift/Signer.php
- A external/Swift-5.1.0/lib/classes/Swift/Signers/BodySigner.php
- A external/Swift-5.1.0/lib/classes/Swift/Signers/DKIMSigner.php
- A external/Swift-5.1.0/lib/classes/Swift/Signers/DomainKeySigner.php
- A external/Swift-5.1.0/lib/classes/Swift/Signers/HeaderSigner.php
- A external/Swift-5.1.0/lib/classes/Swift/Signers/OpenDKIMSigner.php
- A external/Swift-5.1.0/lib/classes/Swift/Signers/SMimeSigner.php
- A external/Swift-5.1.0/lib/classes/Swift/SmtpTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Spool.php
- A external/Swift-5.1.0/lib/classes/Swift/SpoolTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/StreamFilter.php
- A external/Swift-5.1.0/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
- A external/Swift-5.1.0/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
- A external/Swift-5.1.0/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
- A external/Swift-5.1.0/lib/classes/Swift/SwiftException.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/AbstractSmtpTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/Esmtp/Authenticator.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/EsmtpHandler.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/EsmtpTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/FailoverTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/IoBuffer.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/LoadBalancedTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/MailInvoker.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/MailTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/NullTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/SendmailTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/SimpleMailInvoker.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/SmtpAgent.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/SpoolTransport.php
- A external/Swift-5.1.0/lib/classes/Swift/Transport/StreamBuffer.php
- A external/Swift-5.1.0/lib/classes/Swift/TransportException.php
- A external/Swift-5.1.0/lib/classes/Swift/Validate.php
- A external/Swift-5.1.0/lib/dependency_maps/cache_deps.php
- A external/Swift-5.1.0/lib/dependency_maps/message_deps.php
- A external/Swift-5.1.0/lib/dependency_maps/mime_deps.php
- A external/Swift-5.1.0/lib/dependency_maps/transport_deps.php
- A external/Swift-5.1.0/lib/mime_types.php
- A external/Swift-5.1.0/lib/preferences.php
- A external/Swift-5.1.0/lib/swift_init.php
- A external/Swift-5.1.0/lib/swift_required.php
- A external/Swift-5.1.0/lib/swift_required_pear.php
- A external/Swift-5.1.0/lib/swiftmailer_generate_mimes_config.php
- A external/adminer/plugins/dump-bz2.php
- A framework/modules/addressbook/definitions/external_addresses.php
- A framework/modules/addressbook/models/external_address.php
- A framework/modules/addressbook/views/address/import.tpl
- A framework/modules/ecommerce/views/store/import.tpl
- A framework/modules/importexport/views/importexport/import_select.tpl
- A framework/modules/users/views/users/import.tpl
- R framework/modules/ecommerce/definitions/external_addresses.php
- R framework/modules/users/views/users/import_users.tpl
- M CHANGELOG.md
- M exponent_constants.php
- M external/ExtPrograms.csv
- M external/adminer/admin.php
- M external/adminer/adminer.css
- M external/adminer/plugins/tables-filter.php
- M external/editors/tinymce/jquery.tinymce.min.js
- M external/editors/tinymce/plugins/advlist/plugin.min.js
- M external/editors/tinymce/plugins/anchor/plugin.min.js
- M external/editors/tinymce/plugins/autolink/plugin.min.js
- M external/editors/tinymce/plugins/directionality/plugin.min.js
- M external/editors/tinymce/plugins/example/plugin.min.js
- M external/editors/tinymce/plugins/fullpage/plugin.min.js
- M external/editors/tinymce/plugins/image/plugin.min.js
- M external/editors/tinymce/plugins/insertdatetime/plugin.min.js
- M external/editors/tinymce/plugins/layer/plugin.min.js
- M external/editors/tinymce/plugins/legacyoutput/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/noneditable/plugin.min.js
- M external/editors/tinymce/plugins/pagebreak/plugin.min.js
- M external/editors/tinymce/plugins/paste/plugin.min.js
- M external/editors/tinymce/plugins/preview/plugin.min.js
- M external/editors/tinymce/plugins/print/plugin.min.js
- M external/editors/tinymce/plugins/save/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/themes/modern/theme.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/elFinder/css/navbar.css
- M external/elFinder/js/commands/download.js
- M external/elFinder/js/commands/edit.js
- M external/elFinder/js/commands/open.js
- M external/elFinder/js/commands/quicklook.js
- M external/elFinder/js/elFinder.js
- M external/elFinder/js/ui/cwd.js
- M external/elFinder/js/ui/dialog.js
- M external/elFinder/js/ui/navbar.js
- M external/elFinder/js/ui/tree.js
- M external/elFinder/php/connector.php
- M external/elFinder/php/elFinderVolumeDriver.class.php
- M framework/core/controllers/expController.php
- M framework/core/expFramework.php
- M framework/core/forms/basetemplate.php
- M framework/core/forms/controllertemplate.php
- M framework/core/forms/controls/uploadcontrol.php
- M framework/core/subsystems/expMail.php
- M framework/core/subsystems/expSettings.php
- M framework/core/subsystems/expString.php
- M framework/core/subsystems/expTemplate.php
- M framework/modules/addressbook/controllers/addressController.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/menus/ecomm.php
- M framework/modules/blog/controllers/blogController.php
- M framework/modules/common/views/scaffold/blank.tpl
- M framework/modules/common/views/scaffold/browseTags.tpl
- M framework/modules/common/views/scaffold/create.tpl
- M framework/modules/common/views/scaffold/edit.tpl
- M framework/modules/common/views/scaffold/show.tpl
- M framework/modules/common/views/scaffold/showRandom.tpl
- M framework/modules/common/views/scaffold/showall.tpl
- M framework/modules/common/views/scaffold/showall_by_tags.tpl
- M framework/modules/eaas/controllers/eaasController.php
- M framework/modules/ecommerce/controllers/billingController.php
- M framework/modules/ecommerce/controllers/ecomconfigController.php
- M framework/modules/ecommerce/controllers/eventregistrationController.php
- M framework/modules/ecommerce/controllers/shippingController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/controllers/taxController.php
- M framework/modules/ecommerce/models/external_address.php
- M framework/modules/ecommerce/views/eventregistration/view_registrants.bootstrap.tpl
- M framework/modules/ecommerce/views/eventregistration/view_registrants.tpl
- M framework/modules/ecommerce/views/store/batch_process.tpl
- M framework/modules/ecommerce/views/store/import_external_addresses.tpl
- M framework/modules/ecommerce/views/store/uploadModelAliases.tpl
- M framework/modules/file/connector/cwd.js
- M framework/modules/file/connector/elFinder.js
- M framework/modules/file/connector/elfinder.php
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/models/expFile.php
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/importexport/controllers/importexportController.php
- M framework/modules/importexport/views/importexport/export.tpl
- M framework/modules/importexport/views/importexport/import.tpl
- M framework/modules/importexport/views/importexport/manage.tpl
- M framework/modules/navigation/controllers/navigationController.php
- M framework/modules/news/controllers/newsController.php
- M framework/modules/notfound/controllers/notfoundController.php
- M framework/modules/recyclebin/controllers/recyclebinController.php
- M framework/modules/report/controllers/reportController.php
- M framework/modules/search/controllers/searchController.php
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/extensions/user_avatar.php
- M framework/plugins/function.scaffold.php
- M install/changes/2.2.4.txt
- M install/pages/upgrade-1.php
- M install/pages/welcome.php
- M install/upgrades/fix_sectionref.php
- M install/upgrades/remove_oldfiles.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