feed controller change
kaminari
update in feed controller
controllers
kaminari no ajax
pagination working
Added category scaffold, added category to subscriptions and feeds tables and models
feeds conflict fixed
working on ajax, can post, but only with hard coded user_id and feed_id, not yet able to do a GET
Post migration and seeding, note category_id is not seeded in feeds
subscription.user_id passed in, working on subcription.feed_id
added category to subscriptions, also updates subscriptions table with category from feed on addition
added category selection dropdown to new feed
subscriptions list reordered to show groupe by category
merged changes from categries into subscriptions
subs controller
rectified pagination conflict
haml now has data id attribute, which js can reference for subscriptions - feed_id now being passed in, due to id being present on page
removed extra routes from js
final before merge