Changeset [7dbcabaf7649274759c155a463b7254f7c68d197] by dogmatic69
Revision 7dbcabaf7649274759c155a463b7254f7c68d197,
committed by dogmatic69
· September 19th, 2010 @ 08:16 PM
Merge branch 'dev-feeds' into dev
http://github.com/infinitas/infinitas/commit/7dbcabaf7649274759c155...
16 changed files
-
A
core/feed/models/feeds_feed.php -
A
core/feed/views/feeds/view.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 -
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