Changeset [30e532ae0479bd09a252d998f1dd493110d84cd8] by dleffler
March 28th, 2014 @ 02:33 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/forms/controls/autocompletecontrol.php
https://github.com/exponentcms/exponent-cms/commit/30e532ae0479bd09...
Committed by dleffler
- A external/editors/ckeditor/plugins/tableresize/dev/tableresize.html
- A external/editors/ckeditor/plugins/widget/lang/ar.js
- A external/editors/ckeditor/plugins/widget/lang/hr.js
- A install/changes/2.3.0.txt
- R external/Swift-5.0.3/CHANGES
- R external/Swift-5.0.3/LICENSE
- R external/Swift-5.0.3/README
- R external/Swift-5.0.3/VERSION
- R external/Swift-5.0.3/lib/classes/Swift.php
- R external/Swift-5.0.3/lib/classes/Swift/Attachment.php
- R external/Swift-5.0.3/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
- R external/Swift-5.0.3/lib/classes/Swift/ByteStream/ArrayByteStream.php
- R external/Swift-5.0.3/lib/classes/Swift/ByteStream/FileByteStream.php
- R external/Swift-5.0.3/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterReader.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterReader/UsAsciiReader.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterReader/Utf8Reader.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterReaderFactory.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterStream.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
- R external/Swift-5.0.3/lib/classes/Swift/CharacterStream/NgCharacterStream.php
- R external/Swift-5.0.3/lib/classes/Swift/ConfigurableSpool.php
- R external/Swift-5.0.3/lib/classes/Swift/DependencyContainer.php
- R external/Swift-5.0.3/lib/classes/Swift/DependencyException.php
- R external/Swift-5.0.3/lib/classes/Swift/EmbeddedFile.php
- R external/Swift-5.0.3/lib/classes/Swift/Encoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Encoder/Base64Encoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Encoder/QpEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Encoder/Rfc2231Encoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Encoding.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/CommandEvent.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/CommandListener.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/Event.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/EventDispatcher.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/EventListener.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/EventObject.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/ResponseEvent.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/ResponseListener.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/SendEvent.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/SendListener.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/SimpleEventDispatcher.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/TransportChangeEvent.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/TransportChangeListener.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/TransportExceptionEvent.php
- R external/Swift-5.0.3/lib/classes/Swift/Events/TransportExceptionListener.php
- R external/Swift-5.0.3/lib/classes/Swift/FailoverTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/FileSpool.php
- R external/Swift-5.0.3/lib/classes/Swift/FileStream.php
- R external/Swift-5.0.3/lib/classes/Swift/Filterable.php
- R external/Swift-5.0.3/lib/classes/Swift/Image.php
- R external/Swift-5.0.3/lib/classes/Swift/InputByteStream.php
- R external/Swift-5.0.3/lib/classes/Swift/IoException.php
- R external/Swift-5.0.3/lib/classes/Swift/KeyCache.php
- R external/Swift-5.0.3/lib/classes/Swift/KeyCache/ArrayKeyCache.php
- R external/Swift-5.0.3/lib/classes/Swift/KeyCache/DiskKeyCache.php
- R external/Swift-5.0.3/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
- R external/Swift-5.0.3/lib/classes/Swift/KeyCache/NullKeyCache.php
- R external/Swift-5.0.3/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
- R external/Swift-5.0.3/lib/classes/Swift/LoadBalancedTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/MailTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Mailer.php
- R external/Swift-5.0.3/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
- R external/Swift-5.0.3/lib/classes/Swift/Mailer/RecipientIterator.php
- R external/Swift-5.0.3/lib/classes/Swift/MemorySpool.php
- R external/Swift-5.0.3/lib/classes/Swift/Message.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Attachment.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/CharsetObserver.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ContentEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/EmbeddedFile.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/EncodingObserver.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Grammar.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Header.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/HeaderEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/HeaderFactory.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/HeaderSet.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Headers/AbstractHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Headers/DateHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Headers/MailboxHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Headers/PathHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/Message.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/MimeEntity.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/MimePart.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/ParameterizedHeader.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/SimpleHeaderFactory.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/SimpleHeaderSet.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/SimpleMessage.php
- R external/Swift-5.0.3/lib/classes/Swift/Mime/SimpleMimeEntity.php
- R external/Swift-5.0.3/lib/classes/Swift/MimePart.php
- R external/Swift-5.0.3/lib/classes/Swift/NullTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/OutputByteStream.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/AntiFloodPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Decorator/Replacements.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/DecoratorPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/ImpersonatePlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Logger.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/LoggerPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Loggers/eDebugLogger.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/MessageLogger.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/RedirectingPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Reporter.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/ReporterPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Reporters/HitReporter.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Sleeper.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/ThrottlerPlugin.php
- R external/Swift-5.0.3/lib/classes/Swift/Plugins/Timer.php
- R external/Swift-5.0.3/lib/classes/Swift/Preferences.php
- R external/Swift-5.0.3/lib/classes/Swift/ReplacementFilterFactory.php
- R external/Swift-5.0.3/lib/classes/Swift/RfcComplianceException.php
- R external/Swift-5.0.3/lib/classes/Swift/SendmailTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/SignedMessage.php
- R external/Swift-5.0.3/lib/classes/Swift/Signer.php
- R external/Swift-5.0.3/lib/classes/Swift/Signers/BodySigner.php
- R external/Swift-5.0.3/lib/classes/Swift/Signers/DKIMSigner.php
- R external/Swift-5.0.3/lib/classes/Swift/Signers/DomainKeySigner.php
- R external/Swift-5.0.3/lib/classes/Swift/Signers/HeaderSigner.php
- R external/Swift-5.0.3/lib/classes/Swift/Signers/SMimeSigner.php
- R external/Swift-5.0.3/lib/classes/Swift/SmtpTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Spool.php
- R external/Swift-5.0.3/lib/classes/Swift/SpoolTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/StreamFilter.php
- R external/Swift-5.0.3/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
- R external/Swift-5.0.3/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
- R external/Swift-5.0.3/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
- R external/Swift-5.0.3/lib/classes/Swift/SwiftException.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/AbstractSmtpTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/Esmtp/Authenticator.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/EsmtpHandler.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/EsmtpTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/FailoverTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/IoBuffer.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/LoadBalancedTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/MailInvoker.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/MailTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/NullTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/SendmailTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/SimpleMailInvoker.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/SmtpAgent.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/SpoolTransport.php
- R external/Swift-5.0.3/lib/classes/Swift/Transport/StreamBuffer.php
- R external/Swift-5.0.3/lib/classes/Swift/TransportException.php
- R external/Swift-5.0.3/lib/classes/Swift/Validate.php
- R external/Swift-5.0.3/lib/dependency_maps/cache_deps.php
- R external/Swift-5.0.3/lib/dependency_maps/message_deps.php
- R external/Swift-5.0.3/lib/dependency_maps/mime_deps.php
- R external/Swift-5.0.3/lib/dependency_maps/transport_deps.php
- R external/Swift-5.0.3/lib/mime_types.php
- R external/Swift-5.0.3/lib/preferences.php
- R external/Swift-5.0.3/lib/swift_init.php
- R external/Swift-5.0.3/lib/swift_required.php
- R external/Swift-5.0.3/lib/swift_required_pear.php
- R install/changes/2.2.4.txt
- M CHANGELOG.md
- M CREDITS.md
- M RELEASE.md
- M exponent_version.php
- M external/ExtPrograms.csv
- M external/editors/ckeditor/CHANGES.md
- M external/editors/ckeditor/ckeditor.js
- M external/editors/ckeditor/lang/ar.js
- M external/editors/ckeditor/lang/hr.js
- M external/editors/ckeditor/lang/km.js
- M external/editors/ckeditor/lang/pt.js
- M external/editors/ckeditor/lang/ru.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
- M external/editors/ckeditor/plugins/clipboard/dialogs/paste.js
- M external/editors/ckeditor/plugins/clipboard/lang/km.js
- M external/editors/ckeditor/plugins/dialog/dialogDefinition.js
- M external/editors/ckeditor/plugins/image2/lang/km.js
- M external/editors/ckeditor/plugins/specialchar/dialogs/lang/hr.js
- M external/editors/ckeditor/plugins/tableresize/plugin.js
- M external/editors/ckeditor/plugins/widget/plugin.js
- M external/jquery/addons/css/jquery.datetimepicker.css
- M external/jquery/addons/js/jquery.datetimepicker.js
- M external/normalize/normalize.css
- M framework/core/assets/less/forms-bootstrap.less
- M framework/core/controllers/expController.php
- M framework/core/forms/controls/autocompletecontrol.php
- M framework/core/forms/controls/bootstrap/checkboxcontrol.php
- M framework/core/forms/controls/bootstrap/filemanagercontrol.php
- M framework/core/forms/controls/bootstrap/genericcontrol.php
- M framework/core/forms/controls/bootstrap/radiocontrol.php
- M framework/core/forms/controls/checkboxcontrol.php
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/forms/controls/filemanagercontrol.php
- M framework/core/forms/controls/genericcontrol.php
- M framework/core/forms/controls/jquery/yuidatetimecontrol.php
- M framework/core/forms/controls/passwordcontrol.php
- M framework/core/forms/controls/popupdatetimecontrol.php
- M framework/core/forms/controls/radiocontrol.php
- M framework/core/forms/controls/rangecontrol.php
- M framework/core/forms/controls/textcontrol.php
- M framework/core/forms/controls/texteditorcontrol.php
- M framework/core/forms/controls/tinymcecontrol.php
- M framework/core/forms/controls/uploadcontrol.php
- M framework/core/forms/controls/yuicalendarcontrol.php
- M framework/core/forms/controls/yuidatetimecontrol.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/menus/upcomingevents.php
- M framework/modules/banners/views/banner/configure/banner_settings.tpl
- M framework/modules/banners/views/banner/edit.tpl
- M framework/modules/blog/views/blog/edit.tpl
- M framework/modules/common/views/configure/files.tpl
- M framework/modules/company/views/company/edit.tpl
- M framework/modules/eaas/views/eaas/configure/about_us.tpl
- M framework/modules/eaas/views/eaas/edit.tpl
- M framework/modules/ecommerce/controllers/eventregistrationController.php
- M framework/modules/ecommerce/models/external_address.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/views/donation/edit.tpl
- M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
- M framework/modules/ecommerce/products/views/giftcard/edit.tpl
- M framework/modules/ecommerce/views/eventregistration/manage.tpl
- M framework/modules/ecommerce/views/eventregistration/show.tpl
- M framework/modules/ecommerce/views/store/configure/image_display.tpl
- M framework/modules/ecommerce/views/store/edit_images.tpl
- M framework/modules/ecommerce/views/storeCategory/configure/general.tpl
- M framework/modules/ecommerce/views/storeCategory/edit.tpl
- M framework/modules/events/views/event/configure/event.tpl
- M framework/modules/events/views/event/edit.tpl
- M framework/modules/file/controllers/fileController.php
- M framework/modules/links/views/links/configure/links.tpl
- M framework/modules/links/views/links/edit.tpl
- M framework/modules/links/views/links/showall.tpl
- M framework/modules/links/views/links/showall_quicklinks.tpl
- M framework/modules/mediaplayer/views/media/configure/media.tpl
- M framework/modules/mediaplayer/views/media/edit.tpl
- M framework/modules/news/views/news/edit.tpl
- M framework/modules/photoalbum/views/photo/configure/gallery.tpl
- M framework/modules/photoalbum/views/photo/edit.tpl
- M framework/modules/photoalbum/views/photo/multi_add.tpl
- M framework/modules/portfolio/views/portfolio/edit.tpl
- M framework/modules/text/views/text/edit.tpl
- M framework/plugins/function.control.php
- M install/upgrades/remove_oldfiles.php
- M install/upgrades/update_countdown.php
- M install/upgrades/upgrade_mediaplayer2.php
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