18 Commits

Author	SHA1	Message	Date
Ethan Fraenkel	ef53f19617	done with scroll to bottom	2018-09-06 16:13:49 +01:00
Beatrice Olivera	84a155571a	chat css	2018-09-06 14:17:24 +01:00
Beatrice Olivera	d1a245cdbf	changed chatroom css	2018-09-06 12:45:57 +01:00
Beatrice Olivera	dcfeb416ec	added hover and show original/translated	2018-09-06 08:46:07 +01:00
Beatrice Olivera	b15ea6e42e	Revert "Revert "Chat css""	2018-09-06 01:59:16 +01:00
Beatrice Olivera	9028db59cc	Revert "Chat css"	2018-09-06 01:58:34 +01:00
Beatrice Olivera	bb2a8ad1b9	added profile images and colors to the chat messages	2018-09-06 01:52:00 +01:00
Beatrice Olivera	a0ef7458aa	chat css	2018-09-05 18:17:13 +01:00
Beatrice Olivera	cf71cee5d7	added translated chat	2018-09-05 14:59:39 +01:00
Beatrice Olivera	ccfba63f6c	Merge branch 'master' into chat-features	2018-09-04 19:33:26 +01:00
Beatrice Olivera	b19a000729	fixed bug where translations were also broadcasted to other client and fixed bug where the same original and target language caused a 500 error	2018-09-04 19:22:13 +01:00
Beatrice Olivera	f4467c65fd	implemented chat and built in google translate	2018-09-04 19:03:28 +01:00
Beatrice Olivera	73283b1fa3	Merge branch 'master' into hangup	2018-09-04 14:53:57 +01:00
Ethan Fraenkel	95d0c2f5cd	Romain added hangup	2018-09-04 14:50:44 +02:00
Beatrice Olivera	083ec3e747	added message sending	2018-09-04 11:49:18 +01:00
Beatrice Olivera	fbde469f45	added js package so that es7 syntax works, moved signaling-server from apps folder to pack folder, removed recurring js errors	2018-08-31 20:47:33 +01:00
Beatrice Olivera	c3b072ba38	added room id in exchange parameters	2018-08-30 18:42:42 +01:00
Beatrice Olivera	405d2cd5df	added chatroom channel with room ids and notifications channel	2018-08-30 03:00:09 +01:00