Changeset [8712a74b645002d4b580f1736518490f17f18d03] by dleffler
December 15th, 2013 @ 08:02 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/subsystems/expTheme.php
https://github.com/exponentcms/exponent-cms/commit/8712a74b645002d4...
Committed by dleffler
- A external/Respond-1.4.1/dest/respond.min.js
- A external/jquery/addons/css/jquery.excoloSlider.css
- A external/jquery/addons/images/next.png
- A external/jquery/addons/images/pagericon.png
- A external/jquery/addons/images/prev.png
- A external/jquery/addons/js/jquery.excoloSlider.js
- A framework/modules/photoalbum/assets/css/slideshow_touch.css
- A framework/modules/photoalbum/views/photo/configure/slideshow_touch.config
- A framework/modules/photoalbum/views/photo/slideshow_touch.tpl
- R external/Respond-1.4.0/dest/respond.min.js
- R external/editors/ckeditor/plugins/image2/icons/hidpi/image2.png
- R external/editors/ckeditor/plugins/image2/icons/image2.png
- R external/editors/ckeditor/plugins/image2/samples/contents.css
- M CHANGELOG.md
- M external/ExtPrograms.csv
- M external/adminer/admin.php
- M external/adminer/plugins/ckeditor.php
- M external/adminer/plugins/edit-calendar.php
- M external/adminer/plugins/edit-textarea.php
- M external/editors/ckeditor/CHANGES.md
- M external/editors/ckeditor/ckeditor.js
- M external/editors/ckeditor/config.js
- M external/editors/ckeditor/contents.css
- 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/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/es.js
- M external/editors/ckeditor/lang/fi.js
- M external/editors/ckeditor/lang/it.js
- M external/editors/ckeditor/lang/ja.js
- M external/editors/ckeditor/lang/km.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/pt-br.js
- M external/editors/ckeditor/lang/ru.js
- M external/editors/ckeditor/lang/sv.js
- M external/editors/ckeditor/lang/tr.js
- M external/editors/ckeditor/lang/zh-cn.js
- M external/editors/ckeditor/lang/zh.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
- M external/editors/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
- M external/editors/ckeditor/plugins/dialog/dialogDefinition.js
- M external/editors/ckeditor/plugins/dialog/plugin.js
- M external/editors/ckeditor/plugins/image2/dev/contents.css
- M external/editors/ckeditor/plugins/image2/dev/image2.html
- M external/editors/ckeditor/plugins/image2/dialogs/image2.js
- M external/editors/ckeditor/plugins/image2/lang/af.js
- M external/editors/ckeditor/plugins/image2/lang/ar.js
- M external/editors/ckeditor/plugins/image2/lang/bg.js
- M external/editors/ckeditor/plugins/image2/lang/bn.js
- M external/editors/ckeditor/plugins/image2/lang/bs.js
- M external/editors/ckeditor/plugins/image2/lang/ca.js
- M external/editors/ckeditor/plugins/image2/lang/cs.js
- M external/editors/ckeditor/plugins/image2/lang/cy.js
- M external/editors/ckeditor/plugins/image2/lang/da.js
- M external/editors/ckeditor/plugins/image2/lang/de.js
- M external/editors/ckeditor/plugins/image2/lang/el.js
- M external/editors/ckeditor/plugins/image2/lang/en-au.js
- M external/editors/ckeditor/plugins/image2/lang/en-ca.js
- M external/editors/ckeditor/plugins/image2/lang/en-gb.js
- M external/editors/ckeditor/plugins/image2/lang/eo.js
- M external/editors/ckeditor/plugins/image2/lang/es.js
- M external/editors/ckeditor/plugins/image2/lang/et.js
- M external/editors/ckeditor/plugins/image2/lang/fa.js
- M external/editors/ckeditor/plugins/image2/lang/fi.js
- M external/editors/ckeditor/plugins/image2/lang/fo.js
- M external/editors/ckeditor/plugins/image2/lang/gl.js
- M external/editors/ckeditor/plugins/image2/lang/gu.js
- M external/editors/ckeditor/plugins/image2/lang/hi.js
- M external/editors/ckeditor/plugins/image2/lang/hr.js
- M external/editors/ckeditor/plugins/image2/lang/hu.js
- M external/editors/ckeditor/plugins/image2/lang/id.js
- M external/editors/ckeditor/plugins/image2/lang/is.js
- M external/editors/ckeditor/plugins/image2/lang/it.js
- M external/editors/ckeditor/plugins/image2/lang/ka.js
- M external/editors/ckeditor/plugins/image2/lang/km.js
- M external/editors/ckeditor/plugins/image2/lang/ko.js
- M external/editors/ckeditor/plugins/image2/lang/ku.js
- M external/editors/ckeditor/plugins/image2/lang/lt.js
- M external/editors/ckeditor/plugins/image2/lang/lv.js
- M external/editors/ckeditor/plugins/image2/lang/ms.js
- M external/editors/ckeditor/plugins/image2/lang/nb.js
- M external/editors/ckeditor/plugins/image2/lang/nl.js
- M external/editors/ckeditor/plugins/image2/lang/no.js
- M external/editors/ckeditor/plugins/image2/lang/pl.js
- M external/editors/ckeditor/plugins/image2/lang/pt-br.js
- M external/editors/ckeditor/plugins/image2/lang/pt.js
- M external/editors/ckeditor/plugins/image2/lang/ro.js
- M external/editors/ckeditor/plugins/image2/lang/ru.js
- M external/editors/ckeditor/plugins/image2/lang/sk.js
- M external/editors/ckeditor/plugins/image2/lang/sl.js
- M external/editors/ckeditor/plugins/image2/lang/sq.js
- M external/editors/ckeditor/plugins/image2/lang/sr-latn.js
- M external/editors/ckeditor/plugins/image2/lang/sr.js
- M external/editors/ckeditor/plugins/image2/lang/sv.js
- M external/editors/ckeditor/plugins/image2/lang/th.js
- M external/editors/ckeditor/plugins/image2/lang/tr.js
- M external/editors/ckeditor/plugins/image2/lang/ug.js
- M external/editors/ckeditor/plugins/image2/lang/uk.js
- M external/editors/ckeditor/plugins/image2/lang/vi.js
- M external/editors/ckeditor/plugins/image2/lang/zh-cn.js
- M external/editors/ckeditor/plugins/image2/lang/zh.js
- M external/editors/ckeditor/plugins/image2/plugin.js
- M external/editors/ckeditor/plugins/image2/samples/image2.html
- M external/editors/ckeditor/plugins/scayt/dialogs/options.js
- M external/editors/ckeditor/plugins/sourcedialog/lang/el.js
- M external/editors/ckeditor/plugins/sourcedialog/lang/nl.js
- M external/editors/ckeditor/plugins/tableresize/plugin.js
- M external/editors/ckeditor/plugins/templates/templates/default.js
- M external/editors/ckeditor/plugins/widget/plugin.js
- M external/editors/ckeditor/plugins/wsc/dialogs/wsc.js
- M external/elFinder/js/commands/paste.js
- M external/elFinder/js/ui/cwd.js
- M external/jquery/addons/css/DT_bootstrap.css
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/subsystems/expCSS.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/events/views/event/day.tpl
- M framework/modules/events/views/event/monthlist.tpl
- M framework/modules/events/views/event/send_reminders.tpl
- M framework/modules/events/views/event/showall_Administration.tpl
- M framework/modules/events/views/event/showall_Featured Events.tpl
- M framework/modules/events/views/event/showall_List.tpl
- M framework/modules/events/views/event/showall_Past Events.tpl
- M framework/modules/events/views/event/showall_Upcoming Events - Headlines.tpl
- M framework/modules/events/views/event/showall_Upcoming Events.tpl
- M framework/modules/events/views/event/week.tpl
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/forms/views/forms/showall.bootstrap.tpl
- M framework/modules/photoalbum/views/photo/edit.tpl
- M framework/modules/users/views/users/_permissions.bootstrap.tpl
- M framework/modules/users/views/users/_permissions.tpl
- M framework/modules/users/views/users/manage.bootstrap.tpl
- M framework/modules/users/views/users/manage_group_memberships.bootstrap.tpl
- M framework/modules/users/views/users/manage_groups.bootstrap.tpl
- M install/changes/2.2.4.txt
- 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