Changeset [67c7308c8e5deec09a70f498ac2fdc918184ff1f] by tPl0ch
Revision 67c7308c8e5deec09a70f498ac2fdc918184ff1f,
committed by tPl0ch
· January 11th, 2010 @ 09:31 PM
Merge branch 'dev' of git://github.com/infinitas/infinitas into
dev
http://github.com/infinitas/infinitas/commit/67c7308c8e5deec09a70f4...
243 changed files
-
A
config/schema/infinitas.sql -
A
extensions/libs/controllers/components/cron.php -
A
extensions/libs/controllers/components/infinitas.php -
A
extensions/libs/models/behaviors/commentable.php -
A
extensions/libs/models/behaviors/feedable.php -
A
extensions/libs/models/behaviors/lockable.php -
A
extensions/libs/models/behaviors/logable.php -
A
extensions/libs/models/behaviors/ordered.php -
A
extensions/libs/models/behaviors/publishable.php -
A
extensions/libs/models/behaviors/rateable.php -
A
extensions/libs/models/behaviors/reviewable.php -
A
extensions/libs/models/behaviors/revision.php -
A
extensions/libs/models/behaviors/sluggable.php -
A
extensions/libs/models/behaviors/viewable.php -
A
extensions/libs/views/helpers/design.php -
A
extensions/libs/views/helpers/geshi.php -
A
extensions/libs/views/helpers/gravatar.php -
A
extensions/libs/views/helpers/image.php -
A
extensions/libs/views/helpers/navigation.php -
A
extensions/libs/views/helpers/status.php -
A
extensions/libs/views/helpers/tag_cloud.php -
A
extensions/libs/views/helpers/wysiwyg.php -
A
extensions/readme.txt -
A
infinitas/backup/controllers/backups_controller.php -
A
infinitas/backup/models/backup.php -
A
infinitas/comment/controllers/comments_controller.php -
A
infinitas/comment/models/comment.php -
A
infinitas/comment/views/comments/add.ctp -
A
infinitas/comment/views/comments/admin_index.ctp -
A
infinitas/filemanager/controllers/file_manager_controller.php -
A
infinitas/filemanager/models/files.php -
A
infinitas/filemanager/models/folders.php -
A
infinitas/filemanager/views/file_manager/admin_index.ctp -
A
infinitas/theme/models/theme.php -
A
infinitas/theme/theme_app_model.php -
A
versions.txt -
A
views/elements/global/comment_add.ctp -
A
views/elements/global/feeds.ctp -
A
views/elements/global/rating_add.ctp -
A
views/layouts/front.ctp -
A
webroot/css/core.css -
A
webroot/css/form.css -
A
webroot/css/front.css -
A
webroot/css/navigation.css -
A
webroot/css/pagination.css -
A
webroot/img/a1.gif -
A
webroot/img/a10.jpg -
A
webroot/img/a16.gif -
A
webroot/img/a18.gif -
A
webroot/img/a22.gif -
A
webroot/img/a26.gif -
A
webroot/img/a33.gif -
A
webroot/img/a36.gif -
A
webroot/img/a38.gif -
A
webroot/img/a41.gif -
A
webroot/img/a47.gif -
A
webroot/img/a50.gif -
A
webroot/img/a8.gif -
A
webroot/img/abg.gif -
A
webroot/img/add-icon.gif -
A
webroot/img/arrow.gif -
A
webroot/img/bg-center-column.jpg -
A
webroot/img/bg-dotted.gif -
A
webroot/img/bg-left-header.gif -
A
webroot/img/bg-left-link.gif -
A
webroot/img/bg-orange-button.gif -
A
webroot/img/bg-select.gif -
A
webroot/img/bg-th-left.gif -
A
webroot/img/bg-th-right.gif -
A
webroot/img/button-first.png -
A
webroot/img/button-left-cap.png -
A
webroot/img/button-left.png -
A
webroot/img/button-next.png -
A
webroot/img/button-remove.png -
A
webroot/img/button-right-cap.png -
A
webroot/img/button-right.png -
A
webroot/img/core/icons/actions/filter.png -
A
webroot/img/core/icons/fatcow/16/cog.png -
A
webroot/img/core/icons/fatcow/16/comment.png -
A
webroot/img/core/icons/fatcow/16/comments.png -
A
webroot/img/core/icons/fatcow/16/page.png -
A
webroot/img/core/icons/fatcow/16/page_add.png -
A
webroot/img/core/icons/fatcow/16/page_copy.png -
A
webroot/img/edit-icon.gif -
A
webroot/img/footer-left.jpg -
A
webroot/img/footer-middle.jpg -
A
webroot/img/footer-right.jpg -
A
webroot/img/header-left.jpg -
A
webroot/img/header-middle.jpg -
A
webroot/img/header-right.jpg -
A
webroot/img/middle-left.jpg -
A
webroot/img/middle-right.jpg -
A
webroot/img/niceBox/border.png -
A
webroot/img/niceBox/crn_bl_dark.png -
A
webroot/img/niceBox/crn_br_dark.png -
A
webroot/img/niceBox/crn_tl_dark.png -
A
webroot/img/niceBox/crn_tr_dark.png -
A
webroot/img/pic1.jpg -
A
webroot/img/pic2.jpg -
A
webroot/img/spacer.gif -
A
webroot/img/tab-active-left.gif -
A
webroot/img/tab-active-right.gif -
A
webroot/img/tab-active.gif -
A
webroot/img/tab-left.gif -
A
webroot/img/tab-right.gif -
A
webroot/img/tab.gif -
A
webroot/img/upbg.gif -
R
infinitas/core/controllers/backups_controller.php -
R
infinitas/core/controllers/components/core_config.php -
R
infinitas/core/controllers/components/cron.php -
R
infinitas/core/models/backup.php -
R
infinitas/core/models/behaviors/commentable.php -
R
infinitas/core/models/behaviors/feedable.php -
R
infinitas/core/models/behaviors/lockable.php -
R
infinitas/core/models/behaviors/logable.php -
R
infinitas/core/models/behaviors/ordered.php -
R
infinitas/core/models/behaviors/publishable.php -
R
infinitas/core/models/behaviors/revision.php -
R
infinitas/core/models/behaviors/sluggable.php -
R
infinitas/core/models/behaviors/viewable.php -
R
infinitas/core/models/comment.php -
R
infinitas/core/views/elements/comments/add.ctp -
R
infinitas/core/views/helpers/geshi.php -
R
infinitas/core/views/helpers/gravatar.php -
R
infinitas/core/views/helpers/navigation.php -
R
infinitas/core/views/helpers/status.php -
R
infinitas/core/views/helpers/tag_cloud.php -
R
infinitas/core/views/helpers/wysiwyg.php -
R
infinitas/management/controllers/comments_controller.php -
R
infinitas/management/controllers/file_manager_controller.php -
R
infinitas/management/models/files.php -
R
infinitas/management/models/folders.php -
R
infinitas/management/views/comments/add.ctp -
R
infinitas/management/views/comments/admin_index.ctp -
R
infinitas/management/views/file_manager/admin_index.ctp -
R
libs/cronjobs/crontab.txt -
R
tests/fixtures/category_fixture.php -
R
tests/fixtures/content_fixture.php -
R
tests/fixtures/content_frontpage_fixture.php -
R
tests/fixtures/section_fixture.php -
R
views/helpers/design.php -
R
views/helpers/image.php -
R
views/layouts/default.ctp -
R
webroot/css/admin/core.css -
R
webroot/css/admin/form.css -
R
webroot/css/admin/navigation.css -
R
webroot/css/admin/pagination.css -
R
webroot/css/default.css -
R
webroot/img/admin/add-icon.gif -
R
webroot/img/admin/arrow.gif -
R
webroot/img/admin/bg-center-column.jpg -
R
webroot/img/admin/bg-dotted.gif -
R
webroot/img/admin/bg-left-header.gif -
R
webroot/img/admin/bg-left-link.gif -
R
webroot/img/admin/bg-orange-button.gif -
R
webroot/img/admin/bg-select.gif -
R
webroot/img/admin/bg-th-left.gif -
R
webroot/img/admin/bg-th-right.gif -
R
webroot/img/admin/button-first.png -
R
webroot/img/admin/button-left-cap.png -
R
webroot/img/admin/button-left.png -
R
webroot/img/admin/button-next.png -
R
webroot/img/admin/button-remove.png -
R
webroot/img/admin/button-right-cap.png -
R
webroot/img/admin/button-right.png -
R
webroot/img/admin/edit-icon.gif -
R
webroot/img/admin/footer-left.jpg -
R
webroot/img/admin/footer-middle.jpg -
R
webroot/img/admin/footer-right.jpg -
R
webroot/img/admin/header-left.jpg -
R
webroot/img/admin/header-middle.jpg -
R
webroot/img/admin/header-right.jpg -
R
webroot/img/admin/logo.gif -
R
webroot/img/admin/middle-left.jpg -
R
webroot/img/admin/middle-right.jpg -
R
webroot/img/admin/tab-active-left.gif -
R
webroot/img/admin/tab-active-right.gif -
R
webroot/img/admin/tab-active.gif -
R
webroot/img/admin/tab-left.gif -
R
webroot/img/admin/tab-right.gif -
R
webroot/img/admin/tab.gif -
R
webroot/img/core/niceBox/border.png -
R
webroot/img/core/niceBox/crn_bl_dark.png -
R
webroot/img/core/niceBox/crn_br_dark.png -
R
webroot/img/core/niceBox/crn_tl_dark.png -
R
webroot/img/core/niceBox/crn_tr_dark.png -
R
webroot/img/terrafirma/a1.gif -
R
webroot/img/terrafirma/a10.jpg -
R
webroot/img/terrafirma/a16.gif -
R
webroot/img/terrafirma/a18.gif -
R
webroot/img/terrafirma/a22.gif -
R
webroot/img/terrafirma/a26.gif -
R
webroot/img/terrafirma/a33.gif -
R
webroot/img/terrafirma/a36.gif -
R
webroot/img/terrafirma/a38.gif -
R
webroot/img/terrafirma/a41.gif -
R
webroot/img/terrafirma/a47.gif -
R
webroot/img/terrafirma/a50.gif -
R
webroot/img/terrafirma/a8.gif -
R
webroot/img/terrafirma/abg.gif -
R
webroot/img/terrafirma/pic1.jpg -
R
webroot/img/terrafirma/pic2.jpg -
R
webroot/img/terrafirma/spacer.gif -
R
webroot/img/terrafirma/upbg.gif -
M
.gitignore -
M
app_controller.php -
M
app_helper.php -
M
app_model.php -
M
config/bootstrap.php -
M
config/images.php -
M
extensions/filter/views/helpers/filter.php -
M
infinitas/blog/blog_app_controller.php -
M
infinitas/blog/blog_app_model.php -
M
infinitas/blog/controllers/posts_controller.php -
M
infinitas/blog/models/post.php -
M
infinitas/blog/models/tag.php -
M
infinitas/blog/views/helpers/blog.php -
M
infinitas/blog/views/helpers/comment_layout.php -
M
infinitas/blog/views/helpers/post_layout.php -
M
infinitas/blog/views/posts/admin_dashboard.ctp -
M
infinitas/blog/views/posts/comment.ctp -
M
infinitas/blog/views/posts/view.ctp -
M
infinitas/cms/controllers/categories_controller.php -
M
infinitas/cms/controllers/contents_controller.php -
M
infinitas/cms/models/category.php -
M
infinitas/cms/models/content.php -
M
infinitas/cms/models/content_frontpage.php -
M
infinitas/cms/models/feature.php -
M
infinitas/cms/views/contents/admin_index.ctp -
M
infinitas/cms/views/helpers/cms.php -
M
infinitas/installer/controllers/install_controller.php -
M
infinitas/management/models/config.php -
M
infinitas/management/views/helpers/core.php -
M
infinitas/newsletter/controllers/campaigns_controller.php -
M
infinitas/newsletter/controllers/newsletters_controller.php -
M
infinitas/newsletter/controllers/templates_controller.php -
M
infinitas/newsletter/models/template.php -
M
infinitas/newsletter/newsletter_app_model.php -
M
infinitas/newsletter/views/helpers/letter.php -
M
infinitas/newsletter/views/newsletters/admin_index.ctp -
M
vendors/zip.php -
M
views/elements/pagination/navigation.ctp -
M
webroot/css/admin.css