Changeset [1f65bd20a2a28900be0e8a00a8eb96ad96a701d8] by dleffler
December 9th, 2016 @ 05:43 PM
Merge branch 'develop'
Conflicts:
CHANGELOG.md
https://github.com/exponentcms/exponent-cms/commit/1f65bd20a2a28900...
Committed by dleffler
- A external/jquery/addons/images/ajax-loader.gif
- A external/jquery/addons/js/localization/messages_az.js
- A external/jquery/addons/js/localization/messages_az.min.js
- A external/jquery/addons/js/localization/messages_ur.js
- A external/jquery/addons/js/localization/messages_ur.min.js
- R external/editors/ckeditor/plugins/clipboard/dev/clipboard.html
- R external/editors/ckeditor/plugins/clipboard/dev/console.js
- R external/editors/ckeditor/plugins/clipboard/dev/dnd.html
- R external/editors/ckeditor/plugins/filetools/dev/uploaddebugger.js
- R external/editors/ckeditor/plugins/image2/dev/assets/image1.jpg
- R external/editors/ckeditor/plugins/image2/dev/assets/image2.jpg
- R external/editors/ckeditor/plugins/image2/dev/contents.css
- R external/editors/ckeditor/plugins/image2/dev/image2.html
- R external/editors/ckeditor/plugins/lineutils/dev/dnd.html
- R external/editors/ckeditor/plugins/lineutils/dev/magicfinger.html
- R external/editors/ckeditor/plugins/tableresize/dev/tableresize.html
- R external/editors/ckeditor/plugins/uploadwidget/dev/cors.html
- R external/editors/ckeditor/plugins/uploadwidget/dev/filereaderplugin.js
- R external/editors/ckeditor/plugins/uploadwidget/dev/upload.html
- R external/editors/ckeditor/plugins/widget/dev/assets/contents.css
- R external/editors/ckeditor/plugins/widget/dev/assets/sample.jpg
- R external/editors/ckeditor/plugins/widget/dev/assets/simplebox/contents.css
- R external/editors/ckeditor/plugins/widget/dev/assets/simplebox/dialogs/simplebox.js
- R external/editors/ckeditor/plugins/widget/dev/assets/simplebox/icons/simplebox.png
- R external/editors/ckeditor/plugins/widget/dev/assets/simplebox/plugin.js
- R external/editors/ckeditor/plugins/widget/dev/console.js
- R external/editors/ckeditor/plugins/widget/dev/nestedwidgets.html
- R external/editors/ckeditor/plugins/widget/dev/widgetstyles.html
- R external/editors/ckeditor/skins/moono/dev/icons16.png
- R external/editors/ckeditor/skins/moono/dev/icons16.svg
- R external/editors/ckeditor/skins/moono/dev/icons32.png
- R external/editors/ckeditor/skins/moono/dev/icons32.svg
- R external/editors/ckeditor/skins/moono/dev/locations.json
- M external/ExtPrograms.csv
- M external/editors/ckeditor/CHANGES.md
- M external/editors/ckeditor/ckeditor.js
- M external/editors/ckeditor/lang/da.js
- M external/editors/ckeditor/lang/ja.js
- M external/editors/ckeditor/lang/nb.js
- M external/editors/ckeditor/lang/nl.js
- M external/editors/ckeditor/lang/oc.js
- M external/editors/ckeditor/lang/pt-br.js
- M external/editors/ckeditor/lang/ru.js
- M external/editors/ckeditor/lang/sv.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
- M external/editors/ckeditor/plugins/clipboard/dialogs/paste.js
- M external/editors/ckeditor/plugins/copyformatting/cursors/cursor-disabled.svg
- M external/editors/ckeditor/plugins/copyformatting/cursors/cursor.svg
- M external/editors/ckeditor/plugins/copyformatting/styles/copyformatting.css
- M external/editors/ckeditor/plugins/dialog/dialogDefinition.js
- M external/editors/ckeditor/plugins/link/images/anchor.png
- M external/editors/ckeditor/plugins/link/images/hidpi/anchor.png
- M external/editors/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css
- M external/editors/ckeditor/plugins/specialchar/dialogs/lang/oc.js
- M external/editors/ckeditor/plugins/templates/templates/default.js
- M external/editors/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css
- 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/kama/icons.png
- M external/editors/ckeditor/skins/kama/icons_hidpi.png
- M external/editors/ckeditor/skins/moono-lisa/dialog.css
- M external/editors/ckeditor/skins/moono-lisa/dialog_ie.css
- M external/editors/ckeditor/skins/moono-lisa/dialog_ie8.css
- M external/editors/ckeditor/skins/moono-lisa/dialog_iequirks.css
- M external/editors/ckeditor/skins/moono-lisa/editor.css
- M external/editors/ckeditor/skins/moono-lisa/editor_gecko.css
- M external/editors/ckeditor/skins/moono-lisa/editor_ie.css
- M external/editors/ckeditor/skins/moono-lisa/editor_ie8.css
- M external/editors/ckeditor/skins/moono-lisa/editor_iequirks.css
- M external/editors/ckeditor/skins/moono-lisa/images/close.png
- M external/editors/ckeditor/skins/moono-lisa/images/hidpi/close.png
- M external/editors/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png
- M external/editors/ckeditor/skins/moono-lisa/images/hidpi/lock.png
- M external/editors/ckeditor/skins/moono-lisa/images/lock-open.png
- M external/editors/ckeditor/skins/moono-lisa/images/lock.png
- M external/editors/ckeditor/skins/moono-lisa/images/refresh.png
- 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/ckeditor/skins/moono/icons.png
- M external/editors/ckeditor/skins/moono/icons_hidpi.png
- M external/editors/ckeditor/skins/moono/images/hidpi/anchor.png
- M external/editors/ckeditor/skins/moono/images/hidpi/close.png
- M external/editors/ckeditor/skins/moono/images/hidpi/lock.png
- M external/editors/ckeditor/skins/moono/images/hidpi/refresh.png
- M external/editors/ckeditor/skins/moono/images/lock-open.png
- M external/editors/ckeditor/skins/moono/images/refresh.png
- M external/editors/ckeditor/skins/moono/skin.js
- M external/editors/tinymce/changelog.txt
- 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/autoresize/plugin.min.js
- M external/editors/tinymce/plugins/autosave/plugin.min.js
- M external/editors/tinymce/plugins/bbcode/plugin.min.js
- M external/editors/tinymce/plugins/charmap/plugin.min.js
- M external/editors/tinymce/plugins/code/plugin.min.js
- M external/editors/tinymce/plugins/colorpicker/plugin.min.js
- M external/editors/tinymce/plugins/contextmenu/plugin.min.js
- M external/editors/tinymce/plugins/directionality/plugin.min.js
- M external/editors/tinymce/plugins/emoticons/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/hr/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/importcss/plugin.min.js
- M external/editors/tinymce/plugins/insertdatetime/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/media/plugin.min.js
- M external/editors/tinymce/plugins/nonbreaking/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/tabfocus/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/toc/plugin.min.js
- M external/editors/tinymce/plugins/visualblocks/plugin.min.js
- M external/editors/tinymce/plugins/visualchars/plugin.min.js
- M external/editors/tinymce/plugins/wordcount/plugin.min.js
- M external/editors/tinymce/themes/inlite/theme.min.js
- M external/editors/tinymce/themes/modern/theme.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/font-awesome.class.php
- M external/jquery/addons/js/jquery.validate.js
- M external/jquery/addons/js/localization/messages_ar.js
- M external/jquery/addons/js/localization/messages_ar.min.js
- M external/jquery/addons/js/localization/messages_bg.js
- M external/jquery/addons/js/localization/messages_bg.min.js
- M external/jquery/addons/js/localization/messages_bn_BD.js
- M external/jquery/addons/js/localization/messages_bn_BD.min.js
- M external/jquery/addons/js/localization/messages_ca.js
- M external/jquery/addons/js/localization/messages_ca.min.js
- M external/jquery/addons/js/localization/messages_cs.js
- M external/jquery/addons/js/localization/messages_cs.min.js
- M external/jquery/addons/js/localization/messages_da.js
- M external/jquery/addons/js/localization/messages_da.min.js
- M external/jquery/addons/js/localization/messages_de.js
- M external/jquery/addons/js/localization/messages_de.min.js
- M external/jquery/addons/js/localization/messages_el.js
- M external/jquery/addons/js/localization/messages_el.min.js
- M external/jquery/addons/js/localization/messages_es.js
- M external/jquery/addons/js/localization/messages_es.min.js
- M external/jquery/addons/js/localization/messages_es_AR.js
- M external/jquery/addons/js/localization/messages_es_AR.min.js
- M external/jquery/addons/js/localization/messages_es_PE.js
- M external/jquery/addons/js/localization/messages_es_PE.min.js
- M external/jquery/addons/js/localization/messages_et.js
- M external/jquery/addons/js/localization/messages_et.min.js
- M external/jquery/addons/js/localization/messages_eu.js
- M external/jquery/addons/js/localization/messages_eu.min.js
- M external/jquery/addons/js/localization/messages_fa.js
- M external/jquery/addons/js/localization/messages_fa.min.js
- M external/jquery/addons/js/localization/messages_fi.js
- M external/jquery/addons/js/localization/messages_fi.min.js
- M external/jquery/addons/js/localization/messages_fr.js
- M external/jquery/addons/js/localization/messages_fr.min.js
- M external/jquery/addons/js/localization/messages_ge.js
- M external/jquery/addons/js/localization/messages_ge.min.js
- M external/jquery/addons/js/localization/messages_gl.js
- M external/jquery/addons/js/localization/messages_gl.min.js
- M external/jquery/addons/js/localization/messages_he.js
- M external/jquery/addons/js/localization/messages_he.min.js
- M external/jquery/addons/js/localization/messages_hr.js
- M external/jquery/addons/js/localization/messages_hr.min.js
- M external/jquery/addons/js/localization/messages_hu.js
- M external/jquery/addons/js/localization/messages_hu.min.js
- M external/jquery/addons/js/localization/messages_hy_AM.js
- M external/jquery/addons/js/localization/messages_hy_AM.min.js
- M external/jquery/addons/js/localization/messages_id.js
- M external/jquery/addons/js/localization/messages_id.min.js
- M external/jquery/addons/js/localization/messages_is.js
- M external/jquery/addons/js/localization/messages_is.min.js
- M external/jquery/addons/js/localization/messages_it.js
- M external/jquery/addons/js/localization/messages_it.min.js
- M external/jquery/addons/js/localization/messages_ja.js
- M external/jquery/addons/js/localization/messages_ja.min.js
- M external/jquery/addons/js/localization/messages_ka.js
- M external/jquery/addons/js/localization/messages_ka.min.js
- M external/jquery/addons/js/localization/messages_kk.js
- M external/jquery/addons/js/localization/messages_kk.min.js
- M external/jquery/addons/js/localization/messages_ko.js
- M external/jquery/addons/js/localization/messages_ko.min.js
- M external/jquery/addons/js/localization/messages_lt.js
- M external/jquery/addons/js/localization/messages_lt.min.js
- M external/jquery/addons/js/localization/messages_lv.js
- M external/jquery/addons/js/localization/messages_lv.min.js
- M external/jquery/addons/js/localization/messages_mk.js
- M external/jquery/addons/js/localization/messages_mk.min.js
- M external/jquery/addons/js/localization/messages_my.js
- M external/jquery/addons/js/localization/messages_my.min.js
- M external/jquery/addons/js/localization/messages_nl.js
- M external/jquery/addons/js/localization/messages_nl.min.js
- M external/jquery/addons/js/localization/messages_no.js
- M external/jquery/addons/js/localization/messages_no.min.js
- M external/jquery/addons/js/localization/messages_pl.js
- M external/jquery/addons/js/localization/messages_pl.min.js
- M external/jquery/addons/js/localization/messages_pt_BR.js
- M external/jquery/addons/js/localization/messages_pt_BR.min.js
- M external/jquery/addons/js/localization/messages_pt_PT.js
- M external/jquery/addons/js/localization/messages_pt_PT.min.js
- M external/jquery/addons/js/localization/messages_ro.js
- M external/jquery/addons/js/localization/messages_ro.min.js
- M external/jquery/addons/js/localization/messages_ru.js
- M external/jquery/addons/js/localization/messages_ru.min.js
- M external/jquery/addons/js/localization/messages_si.js
- M external/jquery/addons/js/localization/messages_si.min.js
- M external/jquery/addons/js/localization/messages_sk.js
- M external/jquery/addons/js/localization/messages_sk.min.js
- M external/jquery/addons/js/localization/messages_sl.js
- M external/jquery/addons/js/localization/messages_sl.min.js
- M external/jquery/addons/js/localization/messages_sr.js
- M external/jquery/addons/js/localization/messages_sr.min.js
- M external/jquery/addons/js/localization/messages_sr_lat.js
- M external/jquery/addons/js/localization/messages_sr_lat.min.js
- M external/jquery/addons/js/localization/messages_sv.js
- M external/jquery/addons/js/localization/messages_sv.min.js
- M external/jquery/addons/js/localization/messages_th.js
- M external/jquery/addons/js/localization/messages_th.min.js
- M external/jquery/addons/js/localization/messages_tj.js
- M external/jquery/addons/js/localization/messages_tj.min.js
- M external/jquery/addons/js/localization/messages_tr.js
- M external/jquery/addons/js/localization/messages_tr.min.js
- M external/jquery/addons/js/localization/messages_uk.js
- M external/jquery/addons/js/localization/messages_uk.min.js
- M external/jquery/addons/js/localization/messages_vi.js
- M external/jquery/addons/js/localization/messages_vi.min.js
- M external/jquery/addons/js/localization/messages_zh.js
- M external/jquery/addons/js/localization/messages_zh.min.js
- M external/jquery/addons/js/localization/messages_zh_TW.js
- M external/jquery/addons/js/localization/messages_zh_TW.min.js
- M external/jquery/addons/js/localization/methods_de.js
- M external/jquery/addons/js/localization/methods_de.min.js
- M external/jquery/addons/js/localization/methods_es_CL.js
- M external/jquery/addons/js/localization/methods_es_CL.min.js
- M external/jquery/addons/js/localization/methods_fi.js
- M external/jquery/addons/js/localization/methods_fi.min.js
- M external/jquery/addons/js/localization/methods_nl.js
- M external/jquery/addons/js/localization/methods_nl.min.js
- M external/jquery/addons/js/localization/methods_pt.js
- M external/jquery/addons/js/localization/methods_pt.min.js
- M external/jquery/addons/js/moment.js
- M external/mp3file.php
- M framework/core/assets/less/forms-bootstrap3.less
- M framework/core/subsystems/expHtmlToPDF.php
- M framework/core/subsystems/expRouter.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/administration/views/administration/configure_site.bootstrap3.tpl
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/events/views/event/showall_announcement.bootstrap3.tpl
- M framework/modules/events/views/event/showall_announcement.tpl
- M framework/modules/forms/views/forms/configure/report.tpl
- M framework/modules/forms/views/forms/configure/showall.config
- M framework/modules/forms/views/forms/configure/showall_portfolio.config
- M framework/modules/forms/views/forms/show.tpl
- M framework/modules/forms/views/forms/showall.bootstrap.tpl
- M framework/modules/forms/views/forms/showall.bootstrap3.tpl
- M framework/modules/forms/views/forms/showall.tpl
- M framework/modules/forms/views/forms/showall_portfolio.tpl
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