merge conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
chatroom can be created, and only the listing's seller/buyer has access to the chatroom. About to create comments
merge
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
changed cucumber test files for 'chats' to 'chatroom'. Just naming change, no code touched
Merge branch 'chatroom' of github.com:StephanMusgrave/ProjectX into chatroom
midway through creating a comment that belongs to a chatroom. all is well, need to create associations now
chatroom works, but need page refresh every time
Merge branch 'chatroom' of github.com:StephanMusgrave/ProjectX into chatroom
second messaging scenario written and passing. sellers can access a chatroom for their listings and see a message that has been sent to them
fixed duplicate hashtags issue
created method for displaying all chatrooms a user is involved in
Merge branch 'chatroom' of github.com:StephanMusgrave/ProjectX into chatroom
scenario tests for chatroom index written. working through step definitions
trouble with capybara finding the glyphicon
chatroom has index page (accesible through glyphicon), which displays last comment and accounts for commented/notcommented/nointerests etc, still need to fix up buyer perspective
merge conflicts resolved
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
fixed links to listing from user profiles