Commit Graph

9 Commits

Author SHA1 Message Date
Beatrice Olivera d484769f40 asdf 2018-08-31 15:49:10 +01:00
Beatrice Olivera 4eecfe6291 fixed issue where modal trigger broke navbar 2018-08-31 12:00:17 +01:00
Beatrice Olivera 0b377cbe20 fixed calling modal 2018-08-31 11:29:24 +01:00
Beatrice Olivera 4fdc56ca5c
Merge branch 'master' into brand 2018-08-31 10:33:38 +01:00
Benjamin Myara 81ed01010c done brand 2018-08-31 10:17:26 +01:00
Beatrice Olivera c3b072ba38 added room id in exchange parameters 2018-08-30 18:42:42 +01:00
Beatrice Olivera 5245f2257d created rooms and redirects users to correct room 2018-08-30 14:18:26 +01:00
Beatrice Olivera 405d2cd5df added chatroom channel with room ids and notifications channel 2018-08-30 03:00:09 +01:00
Beatrice Olivera ebd896cd31 Initial commit with devise template from https://github.com/lewagon/rails-templates 2018-08-27 15:37:06 +01:00