fixed regexp for formatting hastags
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
uncommented out failing search.feature's final step, because search feature isn't completed yet
Merge branch 'chatroom' of github.com:StephanMusgrave/ProjectX into chatroom
search now works for one hashtag, and one hashtag only
rewriting chat feature scenarios
Merge branch 'chatroom' of github.com:StephanMusgrave/ProjectX into chatroom
first scenario passing for chat feature, very basic
merge issues
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom
created feature for sending chat messages. half way through making first scenario pass
jQuery for chat room works, two pending cucumber tests, need to figure out how to make capybara press 'enter'
removed chat controller, created chatrooms controller as replacement. big reworking, now pushing forward in creating chatrooms and comments models
created chatroom model. relations not currently recognised
listing index page randomizes display, chatroom still not completed
pulling chatroom
merge conflict