Changeset [eb80a2b28582e6217e7026b764ac7e84cd7cd781] by dleffler
September 13th, 2016 @ 08:06 PM
Merge branch 'develop'
Conflicts:
RELEASE.md
https://github.com/exponentcms/exponent-cms/commit/eb80a2b28582e621...
Committed by dleffler
- A external/editors/ckeditor/plugins/filetools/lang/es.js
- A external/editors/ckeditor/plugins/filetools/lang/pt.js
- A external/editors/ckeditor/plugins/notification/lang/es.js
- A external/editors/ckeditor/plugins/uploadwidget/lang/es.js
- A external/elFinder/css/toast.css
- A external/elFinder/js/commands/fullscreen.js
- A external/elFinder/js/ui/fullscreenbutton.js
- A external/elFinder/js/ui/toast.js
- A external/elFinder/themes/windows-10/images/16px/view-fullscreen.png
- A install/changes/2.4.0.txt
- R framework/modules/file/connector/elFinder.options.js
- M CHANGELOG.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/af.js
- M external/editors/ckeditor/lang/ar.js
- M external/editors/ckeditor/lang/bg.js
- M external/editors/ckeditor/lang/bn.js
- M external/editors/ckeditor/lang/bs.js
- M external/editors/ckeditor/lang/ca.js
- M external/editors/ckeditor/lang/cs.js
- M external/editors/ckeditor/lang/cy.js
- M external/editors/ckeditor/lang/da.js
- M external/editors/ckeditor/lang/de-ch.js
- M external/editors/ckeditor/lang/de.js
- M external/editors/ckeditor/lang/el.js
- M external/editors/ckeditor/lang/en-au.js
- M external/editors/ckeditor/lang/en-ca.js
- M external/editors/ckeditor/lang/en-gb.js
- M external/editors/ckeditor/lang/en.js
- M external/editors/ckeditor/lang/eo.js
- M external/editors/ckeditor/lang/es.js
- M external/editors/ckeditor/lang/et.js
- M external/editors/ckeditor/lang/eu.js
- M external/editors/ckeditor/lang/fa.js
- M external/editors/ckeditor/lang/fi.js
- M external/editors/ckeditor/lang/fo.js
- M external/editors/ckeditor/lang/fr-ca.js
- M external/editors/ckeditor/lang/fr.js
- M external/editors/ckeditor/lang/gl.js
- M external/editors/ckeditor/lang/gu.js
- M external/editors/ckeditor/lang/he.js
- M external/editors/ckeditor/lang/hi.js
- M external/editors/ckeditor/lang/hr.js
- M external/editors/ckeditor/lang/hu.js
- M external/editors/ckeditor/lang/id.js
- M external/editors/ckeditor/lang/is.js
- M external/editors/ckeditor/lang/it.js
- M external/editors/ckeditor/lang/ja.js
- M external/editors/ckeditor/lang/ka.js
- M external/editors/ckeditor/lang/km.js
- M external/editors/ckeditor/lang/ko.js
- M external/editors/ckeditor/lang/ku.js
- M external/editors/ckeditor/lang/lt.js
- M external/editors/ckeditor/lang/lv.js
- M external/editors/ckeditor/lang/mk.js
- M external/editors/ckeditor/lang/mn.js
- M external/editors/ckeditor/lang/ms.js
- M external/editors/ckeditor/lang/nb.js
- M external/editors/ckeditor/lang/nl.js
- M external/editors/ckeditor/lang/no.js
- M external/editors/ckeditor/lang/pl.js
- M external/editors/ckeditor/lang/pt-br.js
- M external/editors/ckeditor/lang/pt.js
- M external/editors/ckeditor/lang/ro.js
- M external/editors/ckeditor/lang/ru.js
- M external/editors/ckeditor/lang/si.js
- M external/editors/ckeditor/lang/sk.js
- M external/editors/ckeditor/lang/sl.js
- M external/editors/ckeditor/lang/sq.js
- M external/editors/ckeditor/lang/sr-latn.js
- M external/editors/ckeditor/lang/sr.js
- M external/editors/ckeditor/lang/sv.js
- M external/editors/ckeditor/lang/th.js
- M external/editors/ckeditor/lang/tr.js
- M external/editors/ckeditor/lang/tt.js
- M external/editors/ckeditor/lang/ug.js
- M external/editors/ckeditor/lang/uk.js
- M external/editors/ckeditor/lang/vi.js
- M external/editors/ckeditor/lang/zh-cn.js
- M external/editors/ckeditor/lang/zh.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
- M external/editors/ckeditor/plugins/about/dialogs/about.js
- M external/editors/ckeditor/plugins/clipboard/plugin.js
- M external/editors/ckeditor/plugins/filetools/plugin.js
- M external/editors/ckeditor/plugins/image2/plugin.js
- M external/editors/ckeditor/plugins/link/dialogs/link.js
- M external/editors/ckeditor/plugins/notification/lang/fr.js
- M external/editors/ckeditor/plugins/notification/plugin.js
- M external/editors/ckeditor/plugins/specialchar/dialogs/lang/eu.js
- M external/editors/ckeditor/plugins/specialchar/dialogs/lang/fr.js
- M external/editors/ckeditor/plugins/uploadwidget/plugin.js
- M external/editors/ckeditor/plugins/widget/lang/es.js
- M external/editors/ckeditor/plugins/widget/lang/ku.js
- M external/editors/ckeditor/plugins/widget/lang/pt-br.js
- M external/editors/ckeditor/plugins/widget/lang/uk.js
- M external/editors/ckeditor/skins/kama/editor.css
- M external/editors/ckeditor/skins/kama/editor_ie.css
- M external/editors/ckeditor/skins/kama/editor_ie7.css
- M external/editors/ckeditor/skins/kama/editor_ie8.css
- M external/editors/ckeditor/skins/kama/editor_iequirks.css
- M external/editors/ckeditor/skins/moono/editor.css
- M external/editors/ckeditor/skins/moono/editor_gecko.css
- M external/editors/ckeditor/skins/moono/editor_ie.css
- M external/editors/ckeditor/skins/moono/editor_ie7.css
- M external/editors/ckeditor/skins/moono/editor_ie8.css
- M external/editors/ckeditor/skins/moono/editor_iequirks.css
- M external/editors/tinymce/changelog.txt
- M external/editors/tinymce/plugins/lists/plugin.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/common.css
- M external/elFinder/css/contextmenu.css
- M external/elFinder/css/cwd.css
- M external/elFinder/css/dialog.css
- M external/elFinder/css/fonts.css
- M external/elFinder/css/navbar.css
- M external/elFinder/css/places.css
- M external/elFinder/css/quicklook.css
- M external/elFinder/css/theme.css
- M external/elFinder/css/toolbar.css
- M external/elFinder/img/toolbar.png
- M external/elFinder/js/commands/archive.js
- M external/elFinder/js/commands/back.js
- M external/elFinder/js/commands/chmod.js
- M external/elFinder/js/commands/copy.js
- M external/elFinder/js/commands/cut.js
- M external/elFinder/js/commands/download.js
- M external/elFinder/js/commands/duplicate.js
- M external/elFinder/js/commands/edit.js
- M external/elFinder/js/commands/forward.js
- M external/elFinder/js/commands/getfile.js
- M external/elFinder/js/commands/help.js
- M external/elFinder/js/commands/home.js
- M external/elFinder/js/commands/info.js
- M external/elFinder/js/commands/mkdir.js
- M external/elFinder/js/commands/netmount.js
- M external/elFinder/js/commands/open.js
- M external/elFinder/js/commands/paste.js
- M external/elFinder/js/commands/quicklook.js
- M external/elFinder/js/commands/quicklook.plugins.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/sort.js
- M external/elFinder/js/commands/up.js
- M external/elFinder/js/commands/upload.js
- M external/elFinder/js/elFinder.command.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.cs.js
- M external/elFinder/js/i18n/elfinder.en.js
- M external/elFinder/js/i18n/elfinder.fr.js
- M external/elFinder/js/i18n/elfinder.jp.js
- M external/elFinder/js/i18n/elfinder.pl.js
- M external/elFinder/js/i18n/elfinder.sk.js
- M external/elFinder/js/jquery.dialogelfinder.js
- M external/elFinder/js/jquery.elfinder.js
- M external/elFinder/js/proxy/elFinderSupportVer1.js
- M external/elFinder/js/ui/contextmenu.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/path.js
- M external/elFinder/js/ui/places.js
- M external/elFinder/js/ui/searchbutton.js
- M external/elFinder/js/ui/sortbutton.js
- M external/elFinder/js/ui/toolbar.js
- M external/elFinder/js/ui/tree.js
- M external/elFinder/php/autoload.php
- M external/elFinder/php/elFinder.class.php
- M external/elFinder/php/elFinderConnector.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/Watermark/plugin.php
- M external/elFinder/themes/moono/css/mainui.less
- M external/elFinder/themes/moono/css/theme.css
- M external/elFinder/themes/moono/css/toolbar-icons.less
- M external/elFinder/themes/windows-10/css/reset.css
- M external/elFinder/themes/windows-10/css/toolbar.css
- M external/feedcreator.class.php
- M external/jquery/addons/css/jquery.bootstrap-duallistbox.css
- M external/jquery/addons/css/select2-bootstrap.css
- M external/jquery/addons/css/select2.css
- M external/jquery/addons/js/bootstrap-datetimepicker.js
- M external/jquery/addons/js/bootstrap-dialog.js
- M external/jquery/addons/js/jquery.bootstrap-duallistbox.js
- M external/jquery/addons/js/jquery.dataTables.yadcf.js
- M external/jquery/addons/js/moment.js
- M external/jquery/addons/js/select2.js
- M external/jquery/addons/less/_bootstrap-datetimepicker.less
- M external/mediaelement/README.md
- M external/mediaelement/build/flashmediaelement-cdn.swf
- M external/mediaelement/build/flashmediaelement-debug.swf
- M external/mediaelement/build/flashmediaelement.swf
- M external/mediaelement/build/mediaelement-and-player.js
- M external/mediaelement/build/mediaelement-and-player.min.js
- M external/mediaelement/build/mediaelement.js
- M external/mediaelement/build/mediaelement.min.js
- M external/mediaelement/build/mediaelementplayer.css
- M external/mediaelement/build/mediaelementplayer.js
- M external/mediaelement/build/mediaelementplayer.min.css
- M external/mediaelement/build/mediaelementplayer.min.js
- M external/mediaelement/changelog.md
- M files/.htaccess
- M files/uploads/.htaccess
- M framework/core/controllers/expController.php
- M framework/core/subsystems/database/mysqli.php
- M framework/core/subsystems/expDatabase.php
- M framework/core/subsystems/expRouter.php
- M framework/core/subsystems/expString.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/blog/controllers/blogController.php
- M framework/modules/blog/views/blog/edit.bootstrap3.tpl
- M framework/modules/blog/views/blog/edit.tpl
- M framework/modules/ecommerce/views/eventregistration/eventsCalendar.bootstrap3.tpl
- M framework/modules/events/controllers/eventController.php
- M framework/modules/events/views/event/send_reminders.tpl
- M framework/modules/events/views/event/showall.bootstrap3.tpl
- M framework/modules/events/views/event/showall_Day.bootstrap3.tpl
- M framework/modules/events/views/event/showall_Monthly List.bootstrap3.tpl
- M framework/modules/events/views/event/showall_Week.bootstrap3.tpl
- M framework/modules/file/connector/help.js
- M framework/modules/file/connector/i18n/elfinder.cs.js
- M framework/modules/file/connector/i18n/elfinder.en.js
- M framework/modules/file/connector/i18n/elfinder.fr.js
- M framework/modules/file/connector/info.js
- M framework/modules/file/connector/open.js
- M framework/modules/file/connector/quicklook.plugins.js
- M framework/modules/file/connector/resize.js
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/views/file/elfinder.tpl
- M framework/modules/filedownloads/controllers/filedownloadController.php
- M framework/modules/filedownloads/views/filedownload/edit.bootstrap3.tpl
- M framework/modules/filedownloads/views/filedownload/edit.tpl
- M framework/modules/news/controllers/newsController.php
- M framework/modules/news/views/news/edit.bootstrap3.tpl
- M framework/modules/news/views/news/edit.tpl
- M install/upgrades/remove_oldfiles.php
- M phpdoc.xml
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