Changeset [8f97cae91f6327fe1dd6b44f34af1dfbf7b5d565] by dakota
Revision 8f97cae91f6327fe1dd6b44f34af1dfbf7b5d565,
committed by dakota
· September 20th, 2010 @ 09:08 AM
Merge branch 'dev' of git://github.com/infinitas/infinitas into
dev
https://github.com/infinitas/infinitas/commit/8f97cae91f6327fe1dd6b...
27 changed files
-
A
core/feed/models/feeds_feed.php -
A
core/feed/views/feeds/view.ctp -
A
core/users/views/elements/login.ctp -
A
core/users/views/elements/logout.ctp -
A
core/users/views/elements/modules/login.ctp -
R
core/feed/controllers/feed_items_controller.php -
R
core/feed/models/feed_item.php -
R
core/feed/views/feed_items/admin_form.ctp -
R
core/feed/views/feed_items/admin_index.ctp -
R
core/management/views/elements/modules/login.ctp -
M
app_controller.php -
M
core/feed/controllers/feeds_controller.php -
M
core/feed/feed_app_model.php -
M
core/feed/feed_events.php -
M
core/feed/models/behaviors/feedable.php -
M
core/feed/models/feed.php -
M
core/feed/views/elements/modules/latest_news.ctp -
M
core/feed/views/feeds/admin_form.ctp -
M
core/feed/views/feeds/admin_index.ctp -
M
core/feed/views/feeds/index.ctp -
M
core/locks/controllers/components/locker.php -
M
core/locks/models/behaviors/lockable.php -
M
core/users/views/users/login.ctp -
M
core/view_counter/controllers/components/view_counter.php -
M
core/view_counter/models/behaviors/viewable.php -
M
core/view_counter/view_counter_events.php -
M
plugins/facebook