Changeset [f62cca73033092795f4e956aa178805dcb7702a2] by dleffler
February 6th, 2013 @ 06:11 PM
Merge branch 'develop' into feature/container2
Conflicts:
cron/generateSiteMap.php cron/generateXMLFeed.php
https://github.com/exponentcms/exponent-cms/commit/f62cca7303309279...
Committed by dleffler
- A external/bingapi.php
- A external/editors/ckeditor/lang/en-gb.js
- A external/jquery/js/jquery-1.9.1.js
- A external/jquery/js/jquery-1.9.1.min.js
- A external/jquery/js/jquery-migrate-1.1.0.js
- A external/jquery/js/jquery-migrate-1.1.0.min.js
- A framework/modules/pixidou/includes/class.upload/bg.gif
- A framework/modules/pixidou/includes/class.upload/lang/class.upload.da_DK.php
- A framework/modules/pixidou/includes/class.upload/lang/class.upload.ja_JP.php
- A framework/modules/pixidou/includes/class.upload/lang/class.upload.mk_MK.php
- A framework/modules/pixidou/includes/class.upload/test.png
- A framework/modules/pixidou/includes/class.upload/watermark.png
- A framework/modules/pixidou/includes/class.upload/watermark_large.png
- R external/jquery/js/jquery-1.9.0.min.js
- R external/jquery/js/jquery-1.9.0.js
- R framework/modules/pixidou/assets/images/bg.gif
- R framework/modules/pixidou/assets/images/test.png
- R framework/modules/pixidou/assets/images/watermark.png
- R framework/modules/pixidou/assets/images/watermark_large.png
- M README.md
- M cron/generateSiteMap.php
- M cron/generateXMLFeed.php
- M cron/lang_extract.php
- M cron/lang_translate.php
- M exponent_constants.php
- M external/ExtPrograms.csv
- M framework/core/assets/css/forms.css
- M framework/core/assets/css/forms2col.css
- M framework/core/subsystems/expDatabase.php
- M framework/core/subsystems/expLang.php
- M framework/core/subsystems/expVersion.php
- M framework/core/subsystems/forms/controls/formcontrol.php
- M framework/modules-1/formbuilder/actions/submit_form.php
- M framework/modules-1/formmodule/class.php
- M framework/modules/ecommerce/controllers/storeCategoryController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/events/controllers/eventController.php
- M framework/modules/events/views/event/showall_Upcoming Events - Headlines.tpl
- M framework/modules/events/views/event/showall_Upcoming Events.tpl
- M framework/modules/file/models/expFile.php
- M framework/modules/file/views/file/picker_cke.tpl
- M framework/modules/file/views/file/uploader.tpl
- M framework/modules/flowplayer/views/flowplayer/edit.tpl
- M framework/modules/forms/controllers/formsController.php
- M framework/modules/help/views/help/select_version.tpl
- M framework/modules/photoalbum/views/photo/multi_add.tpl
- M framework/modules/photoalbum/views/photo/showall_galleries.tpl
- M framework/modules/pixidou/includes/class.upload/LICENSE
- M framework/modules/pixidou/includes/class.upload/class.upload.php
- M framework/modules/pixidou/includes/class.upload/index.html
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.de_DE.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.el_GR.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.es_ES.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.et_EE.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.fr_FR.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.lt_LT.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.nl_NL.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.no_NO.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.pl_PL.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.pt_BR.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.ru_RU.windows-1251.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.sk_SK.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.sv_SE.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.tr_TR.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.vn_VN.php
- M framework/modules/pixidou/includes/class.upload/lang/class.upload.zh_CN.php
- M framework/modules/pixidou/includes/class.upload/upload.php
- M framework/modules/search/controllers/searchController.php
- M framework/modules/users/assets/css/login.css
- M framework/modules/users/models/group.php
- M framework/modules/users/views/login/showlogin_expanded.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