Changeset [835ef6f3f58b42cce146a6b0c79558fd3717d465] by Ceeram

Revision 835ef6f3f58b42cce146a6b0c79558fd3717d465, committed by Ceeram · January 3rd, 2010 @ 06:42 PM

Merge branch 'dev' of git://github.com/infinitas/infinitas into dev
http://github.com/infinitas/infinitas/commit/835ef6f3f58b42cce146a6...

294 changed files

A config/images.php
A libs/cronjobs/crontab.txt
A plugins/cms/controllers/features_controller.php
A plugins/cms/models/feature.php
A plugins/cms/views/features/admin_add.ctp
A plugins/cms/views/features/admin_index.ctp
A plugins/core/models/behaviors/logable.php
A plugins/core/models/behaviors/revision.php
A plugins/core/models/log.php
A plugins/core/webroot/css/geshi.css
A plugins/google/vendors/img/chart_cache/38ed59d53cfbca19fcf6541a08964c1517db1149.jpg
A plugins/google/vendors/img/chart_cache/41c086d9e27d57730af8e5ddf4bbb529bd51704e.jpg
A plugins/management/controllers/file_manager_controller.php
A plugins/management/models/files.php
A plugins/management/models/folders.php
A plugins/management/views/configs/admin_add.ctp
A plugins/management/views/file_manager/admin_index.ctp
A views/elements/admin/bottom.ctp
A views/helpers/design.php
A views/helpers/image.php
A webroot/css/admin/core.css
A webroot/css/admin/form.css
A webroot/css/admin/navigation.css
A webroot/css/admin/pagination.css
A webroot/css/reset.css
A webroot/img/admin/footer-left.jpg
A webroot/img/admin/footer-middle.jpg
A webroot/img/admin/footer-right.jpg
A webroot/img/admin/header-left.jpg
A webroot/img/admin/header-middle.jpg
A webroot/img/admin/header-right.jpg
A webroot/img/admin/middle-left.jpg
A webroot/img/admin/middle-right.jpg
A webroot/img/core/icons/actions/accept.png
A webroot/img/core/icons/actions/add.png
A webroot/img/core/icons/actions/addCategory.png
A webroot/img/core/icons/actions/arrow-down.png
A webroot/img/core/icons/actions/arrow-left.png
A webroot/img/core/icons/actions/arrow-right.png
A webroot/img/core/icons/actions/arrow-up.png
A webroot/img/core/icons/actions/cancle.png
A webroot/img/core/icons/actions/copy.png
A webroot/img/core/icons/actions/date.png
A webroot/img/core/icons/actions/delete.png
A webroot/img/core/icons/actions/download.png
A webroot/img/core/icons/actions/edit.png
A webroot/img/core/icons/actions/favourite.png
A webroot/img/core/icons/actions/featured.png
A webroot/img/core/icons/actions/locked.png
A webroot/img/core/icons/actions/move.png
A webroot/img/core/icons/actions/order-asc.png
A webroot/img/core/icons/actions/order-desc.png
A webroot/img/core/icons/actions/preview.png
A webroot/img/core/icons/actions/print.png
A webroot/img/core/icons/actions/reload.png
A webroot/img/core/icons/actions/remove.png
A webroot/img/core/icons/actions/save.png
A webroot/img/core/icons/actions/search.png
A webroot/img/core/icons/actions/send.png
A webroot/img/core/icons/actions/sinc.png
A webroot/img/core/icons/actions/stats.png
A webroot/img/core/icons/actions/toggle.png
A webroot/img/core/icons/actions/trash.png
A webroot/img/core/icons/actions/unlocked.png
A webroot/img/core/icons/actions/unzip.png
A webroot/img/core/icons/actions/update.png
A webroot/img/core/icons/actions/upload.png
A webroot/img/core/icons/actions/view.png
A webroot/img/core/icons/actions/zip.png
A webroot/img/core/icons/actions/zoom-in.png
A webroot/img/core/icons/actions/zoom-out.png
A webroot/img/core/icons/applications/doc.png
A webroot/img/core/icons/applications/docx.png
A webroot/img/core/icons/applications/dwt.png
A webroot/img/core/icons/applications/mirc.png
A webroot/img/core/icons/applications/ooMaths.png
A webroot/img/core/icons/applications/ooWord.png
A webroot/img/core/icons/applications/pdf.png
A webroot/img/core/icons/applications/ppt.png
A webroot/img/core/icons/applications/pptx.png
A webroot/img/core/icons/applications/ps.png
A webroot/img/core/icons/applications/psd.png
A webroot/img/core/icons/applications/txt.png
A webroot/img/core/icons/applications/xls.png
A webroot/img/core/icons/applications/xlsx.png
A webroot/img/core/icons/archives/7z.png
A webroot/img/core/icons/archives/cab.png
A webroot/img/core/icons/archives/dll.png
A webroot/img/core/icons/archives/exe.png
A webroot/img/core/icons/archives/tar.png
A webroot/img/core/icons/archives/win-rar.png
A webroot/img/core/icons/folders/config.png
A webroot/img/core/icons/folders/documents.png
A webroot/img/core/icons/folders/empty.png
A webroot/img/core/icons/folders/images.png
A webroot/img/core/icons/folders/mixed.png
A webroot/img/core/icons/folders/music.png
A webroot/img/core/icons/folders/systemLinux.png
A webroot/img/core/icons/folders/systemWin.png
A webroot/img/core/icons/folders/videos.png
A webroot/img/core/icons/folders/web.png
A webroot/img/core/icons/images/bmp.png
A webroot/img/core/icons/images/gif.png
A webroot/img/core/icons/images/jpg.png
A webroot/img/core/icons/images/png.png
A webroot/img/core/icons/images/svg.png
A webroot/img/core/icons/images/tga.png
A webroot/img/core/icons/images/tiff.png
A webroot/img/core/icons/multiMedia/3gp.png
A webroot/img/core/icons/multiMedia/dvi.png
A webroot/img/core/icons/multiMedia/mov.png
A webroot/img/core/icons/multiMedia/mp2.png
A webroot/img/core/icons/multiMedia/mp3.png
A webroot/img/core/icons/multiMedia/mp4.png
A webroot/img/core/icons/multiMedia/mpeg.png
A webroot/img/core/icons/multiMedia/ogg.png
A webroot/img/core/icons/multiMedia/qt.png
A webroot/img/core/icons/multiMedia/rm.png
A webroot/img/core/icons/multiMedia/s3m.png
A webroot/img/core/icons/multiMedia/vlc.png
A webroot/img/core/icons/multiMedia/wav.png
A webroot/img/core/icons/multiMedia/wma.png
A webroot/img/core/icons/notifications/forbidden.png
A webroot/img/core/icons/notifications/help.png
A webroot/img/core/icons/notifications/info.png
A webroot/img/core/icons/notifications/message.png
A webroot/img/core/icons/notifications/status.png
A webroot/img/core/icons/notifications/stop.png
A webroot/img/core/icons/notifications/warning.png
A webroot/img/core/icons/readme
A webroot/img/core/icons/social/icq.png
A webroot/img/core/icons/social/last-fm.png
A webroot/img/core/icons/social/msn.png
A webroot/img/core/icons/social/picasa.png
A webroot/img/core/icons/social/rss.png
A webroot/img/core/icons/social/skype.png
A webroot/img/core/icons/social/yahoo-messanger.png
A webroot/img/core/icons/unknown/readme.png
A webroot/img/core/icons/unknown/unknown.png
A webroot/img/core/icons/weather/clear-night.png
A webroot/img/core/icons/weather/clear.png
A webroot/img/core/icons/weather/cloudy.png
A webroot/img/core/icons/weather/fog.png
A webroot/img/core/icons/weather/partly-cloudy-night.png
A webroot/img/core/icons/weather/partly-cloudy.png
A webroot/img/core/icons/weather/showers.png
A webroot/img/core/icons/weather/snow.png
A webroot/img/core/icons/weather/storm.png
A webroot/img/core/icons/web/asx.png
A webroot/img/core/icons/web/css.png
A webroot/img/core/icons/web/flv.png
A webroot/img/core/icons/web/html.png
A webroot/img/core/icons/web/java.png
A webroot/img/core/icons/web/js.png
A webroot/img/core/icons/web/php.png
A webroot/img/core/icons/web/py.png
A webroot/img/core/icons/web/sql.png
A webroot/img/core/icons/web/xml.png
A webroot/img/core/niceBox/border.png
A webroot/img/core/niceBox/crn_bl_dark.png
A webroot/img/core/niceBox/crn_br_dark.png
A webroot/img/core/niceBox/crn_tl_dark.png
A webroot/img/core/niceBox/crn_tr_dark.png
R plugins/cms/controllers/sections_controller.php
R plugins/cms/models/section.php
R plugins/cms/views/content_frontpages/admin_edit.ctp
R plugins/cms/views/sections/admin_add.ctp
R plugins/cms/views/sections/admin_dashboard.ctp
R plugins/cms/views/sections/admin_edit.ctp
R plugins/cms/views/sections/admin_index.ctp
R plugins/cms/views/sections/index.ctp
R plugins/cms/views/sections/view.ctp
R plugins/core/vendors/css/geshi.css
R plugins/management/controllers/file_explorer_controller.php
R plugins/management/views/file_explorer/admin_index.ctp
R webroot/css/admin.pagination.css
R webroot/img/admin/bg-footer.gif
R webroot/img/admin/bg-header.gif
R webroot/img/admin/bg-middle.gif
R webroot/img/admin/hr.gif
R webroot/img/admin/login-icon.gif
R webroot/img/admin/save-icon.gif
R webroot/img/core/icons/actions/16/active.png
R webroot/img/core/icons/actions/16/arrow-down-no.png
R webroot/img/core/icons/actions/16/arrow-down-yes.png
R webroot/img/core/icons/actions/16/arrow-up-no.png
R webroot/img/core/icons/actions/16/arrow-up-yes.png
R webroot/img/core/icons/actions/16/config.png
R webroot/img/core/icons/actions/16/delete.png
R webroot/img/core/icons/actions/16/disabled.png
R webroot/img/core/icons/actions/16/help.png
R webroot/img/core/icons/actions/16/home-no.png
R webroot/img/core/icons/actions/16/home-yes.png
R webroot/img/core/icons/actions/16/info.png
R webroot/img/core/icons/actions/16/locked-no.png
R webroot/img/core/icons/actions/16/locked-yes.png
R webroot/img/core/icons/actions/16/reports.png
R webroot/img/core/icons/actions/16/rss.png
R webroot/img/core/icons/actions/16/search.png
R webroot/img/core/icons/actions/16/update.png
R webroot/img/core/icons/actions/16/warning.png
R webroot/img/core/icons/actions/32/locked-no.png
R webroot/img/core/icons/actions/32/locked-yes.png
R webroot/img/core/icons/file_types/16/ai.gif
R webroot/img/core/icons/file_types/16/avi.gif
R webroot/img/core/icons/file_types/16/bmp.gif
R webroot/img/core/icons/file_types/16/cs.gif
R webroot/img/core/icons/file_types/16/default.icon.gif
R webroot/img/core/icons/file_types/16/dll.gif
R webroot/img/core/icons/file_types/16/doc.gif
R webroot/img/core/icons/file_types/16/exe.gif
R webroot/img/core/icons/file_types/16/fla.gif
R webroot/img/core/icons/file_types/16/gif.gif
R webroot/img/core/icons/file_types/16/htm.gif
R webroot/img/core/icons/file_types/16/html.gif
R webroot/img/core/icons/file_types/16/jpg.gif
R webroot/img/core/icons/file_types/16/js.gif
R webroot/img/core/icons/file_types/16/mail.png
R webroot/img/core/icons/file_types/16/mdb.gif
R webroot/img/core/icons/file_types/16/mp3.gif
R webroot/img/core/icons/file_types/16/pdf.gif
R webroot/img/core/icons/file_types/16/png.gif
R webroot/img/core/icons/file_types/16/ppt.gif
R webroot/img/core/icons/file_types/16/rdp.gif
R webroot/img/core/icons/file_types/16/swf.gif
R webroot/img/core/icons/file_types/16/swt.gif
R webroot/img/core/icons/file_types/16/txt.gif
R webroot/img/core/icons/file_types/16/vsd.gif
R webroot/img/core/icons/file_types/16/xls.gif
R webroot/img/core/icons/file_types/16/xml.gif
R webroot/img/core/icons/file_types/16/zip.gif
R webroot/img/core/icons/file_types/32/ai.gif
R webroot/img/core/icons/file_types/32/avi.gif
R webroot/img/core/icons/file_types/32/bmp.gif
R webroot/img/core/icons/file_types/32/cs.gif
R webroot/img/core/icons/file_types/32/default.icon.gif
R webroot/img/core/icons/file_types/32/dll.gif
R webroot/img/core/icons/file_types/32/doc.gif
R webroot/img/core/icons/file_types/32/exe.gif
R webroot/img/core/icons/file_types/32/fla.gif
R webroot/img/core/icons/file_types/32/gif.gif
R webroot/img/core/icons/file_types/32/htm.gif
R webroot/img/core/icons/file_types/32/html.gif
R webroot/img/core/icons/file_types/32/jpg.gif
R webroot/img/core/icons/file_types/32/js.gif
R webroot/img/core/icons/file_types/32/mdb.gif
R webroot/img/core/icons/file_types/32/mp3.gif
R webroot/img/core/icons/file_types/32/pdf.gif
R webroot/img/core/icons/file_types/32/png.gif
R webroot/img/core/icons/file_types/32/ppt.gif
R webroot/img/core/icons/file_types/32/rdp.gif
R webroot/img/core/icons/file_types/32/swf.gif
R webroot/img/core/icons/file_types/32/swt.gif
R webroot/img/core/icons/file_types/32/txt.gif
R webroot/img/core/icons/file_types/32/vsd.gif
R webroot/img/core/icons/file_types/32/xls.gif
R webroot/img/core/icons/file_types/32/xml.gif
R webroot/img/core/icons/file_types/32/zip.gif
M app_controller.php
M app_helper.php
M app_model.php
M config/bootstrap.php
M config/routes.php
M plugins/blog/views/elements/actions.ctp
M plugins/blog/views/elements/right_boxes.ctp
M plugins/cms/controllers/categories_controller.php
M plugins/cms/controllers/content_frontpages_controller.php
M plugins/cms/controllers/contents_controller.php
M plugins/cms/models/category.php
M plugins/cms/models/content_frontpage.php
M plugins/cms/views/categories/admin_add.ctp
M plugins/cms/views/categories/admin_edit.ctp
M plugins/cms/views/categories/admin_index.ctp
M plugins/cms/views/content_frontpages/admin_index.ctp
M plugins/cms/views/elements/actions.ctp
M plugins/core/controllers/components/core_config.php
M plugins/core/controllers/components/cron.php
M plugins/core/models/behaviors/ordered.php
M plugins/core/views/helpers/status.php
M plugins/filter/views/helpers/filter.php
M plugins/management/controllers/comments_controller.php
M plugins/management/controllers/configs_controller.php
M plugins/management/models/config.php
M plugins/management/views/comments/admin_index.ctp
M plugins/management/views/configs/admin_edit.ctp
M plugins/management/views/elements/actions.ctp
M plugins/newsletter/controllers/campaigns_controller.php
M plugins/newsletter/controllers/newsletters_controller.php
M plugins/newsletter/controllers/templates_controller.php
M plugins/newsletter/models/newsletter.php
M plugins/newsletter/newsletter_app_controller.php
M plugins/newsletter/views/newsletters/admin_view.ctp
M views/layouts/admin.ctp
M webroot/css/admin.css