Changeset [9dd3e62e0f8e2696aa911bf6f60d99614687592b] by dleffler
November 27th, 2013 @ 07:38 PM
Merge branch 'develop' into revisions
https://github.com/exponentcms/exponent-cms/commit/9dd3e62e0f8e2696...
Committed by dleffler
- A external/editors/ckeditor/plugins/smiley/images/angel_smile.png
- A external/editors/ckeditor/plugins/smiley/images/angry_smile.png
- A external/editors/ckeditor/plugins/smiley/images/broken_heart.png
- A external/editors/ckeditor/plugins/smiley/images/confused_smile.png
- A external/editors/ckeditor/plugins/smiley/images/cry_smile.png
- A external/editors/ckeditor/plugins/smiley/images/devil_smile.png
- A external/editors/ckeditor/plugins/smiley/images/embarrassed_smile.png
- A external/editors/ckeditor/plugins/smiley/images/envelope.png
- A external/editors/ckeditor/plugins/smiley/images/heart.png
- A external/editors/ckeditor/plugins/smiley/images/kiss.png
- A external/editors/ckeditor/plugins/smiley/images/lightbulb.png
- A external/editors/ckeditor/plugins/smiley/images/omg_smile.png
- A external/editors/ckeditor/plugins/smiley/images/regular_smile.png
- A external/editors/ckeditor/plugins/smiley/images/sad_smile.png
- A external/editors/ckeditor/plugins/smiley/images/shades_smile.png
- A external/editors/ckeditor/plugins/smiley/images/teeth_smile.png
- A external/editors/ckeditor/plugins/smiley/images/thumbs_down.png
- A external/editors/ckeditor/plugins/smiley/images/thumbs_up.png
- A external/editors/ckeditor/plugins/smiley/images/tongue_smile.png
- A external/editors/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
- A external/editors/ckeditor/plugins/smiley/images/wink_smile.png
- A install/upgrades/fix_sectionref.php
- M exponent.js.php
- M external/ExtPrograms.csv
- M framework/conf/extensions/site.defaults.php
- M framework/core/expFramework.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/core/controllers/expTagController.php
- M framework/modules/eaas/controllers/eaasController.php
- M framework/modules/ecommerce/views/eventregistration/eventsCalendar.tpl
- M framework/modules/ecommerce/views/store/eventsCalendar.tpl
- M framework/modules/events/views/event/showall.tpl
- M framework/modules/events/views/event/showall_Day.tpl
- M framework/modules/events/views/event/showall_Week.tpl
- M framework/modules/file/controllers/fileController.php
- M framework/modules/navigation/controllers/navigationController.php
- M framework/modules/recyclebin/models/recyclebin.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