need to actually destroy dialog on close
Merge branch '5.7.0-wip' of github.com:concrete5/concrete5 into 5.7.0-wip
permission tweaks
tweaks and some bug fixes
tweaks
updating conversation messages admin page, controller, models
Merge branch '5.7.0-wip' of https://github.com/concrete5/concrete5 into 5.7.0-wip
fuck you
Merge branch '5.7.0-wip' of github.com:concrete5/concrete5 into 5.7.0-wip
Revert pubsub to a more readable format.
conversations settings single page, messages single page updates
Merge branch '5.7.0-wip' of https://github.com/concrete5/concrete5 into 5.7.0-wip
bringing add file tool up to date with new changes
xml helper
Merge branch '5.7.0-wip' of github.com:concrete5/concrete5 into 5.7.0-wip
Merge branch '5.7.0-wip' of git://github.com/concrete5/concrete5 into timeout-increased
stubbing out gathering tile templates for vimeo, twitter, adding temporary styles to bootstrap theme header
fixing helper
Merge branch '5.7.0-wip' of git://github.com/concrete5/concrete5 into timeout-increased