undefined local variable/method
ransack search deployed and working
lastname added to ransack search
messages now working - need furhter work
conflicts resolved
bit of css, worked with olly on jquery instead of ajax on the like and dislike button, changed strucutre of the index user view and structure of application html
merge conflict in config routes resolved
Merge branch 'dev' of github.com:jodykingzett/Breedr into dev
merge conflicts resolved
sorted age method - was throwing up error, added in job field in update, added in job into person div, changes to person div
css and structure done for the index users - more to do
Merge branch 'search' into dev
nothing much
search filter fixed
photo gallery operational
Merge branch 'dev' of github.com:jodykingzett/Breedr into dev
tinkering with css
conflicts resolved
something
conflicts resolved - show page only