81 Commits

Author	SHA1	Message	Date
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	9ddbd38bce	implemented inline form	2018-09-05 23:23:10 +01:00
Beatrice Olivera	a0ef7458aa	chat css	2018-09-05 18:17:13 +01:00
Beatrice Olivera	f3d8397b5d	Merge pull request #60 from beatriceo/translation-chat ... Translation chat	2018-09-05 15:02:38 +01:00
Beatrice Olivera	cf71cee5d7	added translated chat	2018-09-05 14:59:39 +01:00
Beatrice Olivera	f5be2763ec	routes changes	2018-09-05 13:07:43 +01:00
Rekai Musuka	a861e82322	Change video.srcObject instead of deleting entire video element	2018-09-05 12:01:24 +01:00
Beatrice Olivera	ccfba63f6c	Merge branch 'master' into chat-features	2018-09-04 19:33:26 +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	7e728b6fbd	Revert "done"	2018-09-04 12:04:22 +01:00
Beatrice Olivera	64acc6fe35	Merge pull request #52 from beatriceo/brandi ... done	2018-09-04 11:53:10 +01:00
Benjamin Myara	656af7c680	done	2018-09-04 11:52:10 +01:00
Beatrice Olivera	083ec3e747	added message sending	2018-09-04 11:49:18 +01:00
Beatrice Olivera	5650943209	fixed modal (again)	2018-09-04 11:23:45 +01:00
Beatrice Olivera	e0995c7610	fixed issue where import triggerCalleeModalEvent broke javascript in navbar	2018-09-04 10:29:56 +01:00
Beatrice Olivera	b24a22d31d	changed close class that was being overridden	2018-09-03 18:59:32 +01:00
Beatrice Olivera	22041b753a	added callee modal	2018-09-03 18:32:03 +01:00
Benjamin Myara	e6828b3bb4	Merge branch 'master' into cross	2018-09-03 15:19:04 +01:00
Benjamin Myara	480fbbdbfb	done	2018-09-03 14:10:45 +01:00
Ethan Fraenkel	8bd06651cf	added responsiveness to modal and edit page	2018-09-03 11:25:20 +02:00
Beatrice Olivera	f9ca657c1b	actually changed profile image size	2018-09-03 09:11:05 +01:00
Beatrice Olivera	247ece4b4b	changed profile image size	2018-09-03 09:06:52 +01:00
Beatrice Olivera	7559e39030	made login/sign up page responsive	2018-09-02 01:22:03 +01:00
Beatrice Olivera	da9e799436	made settings page responsive and edited route from connections/new to add_contact	2018-09-02 00:47:41 +01:00
Beatrice Olivera	6a1992a29f	fixed issue where calling modal was only appeared for the first contact in list	2018-09-01 20:23:53 +01:00
Beatrice Olivera	56d1b924a0	made settings page responsive	2018-09-01 19:12:26 +01:00
Beatrice Olivera	3935b3067c	changed fonts and minor css changes	2018-09-01 18:45:52 +01:00
Beatrice Olivera	ff6d17ae90	fixed active/inactive detail on navbar	2018-09-01 18:27:12 +01:00
Beatrice Olivera	c0ef870956	made contacts page responsive	2018-09-01 18:03:32 +01:00
Beatrice Olivera	80646d4d33	css changes (navbar, settings page, contacts page)	2018-09-01 17:36:46 +01:00
Beatrice Olivera	ed238f3f7e	Merge branch 'master' into working-version	2018-08-31 21:44:53 +01:00
Beatrice Olivera	8c833e47d9	added mute to html of local video	2018-08-31 21:42:33 +01:00
Beatrice Olivera	9970c384c6	minor updates to clean up code	2018-08-31 21:38:48 +01:00
Beatrice Olivera	157d056708	used first name and last name for contact details if available	2018-08-31 21:32:35 +01:00
Beatrice Olivera	a7d4422f3a	added autoclick on join room	2018-08-31 21:24:38 +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	62194ffea4	removed default seb image in calling modal	2018-08-31 20:12:43 +01:00
Beatrice Olivera	aa109aa35d	Merge pull request #34 from beatriceo/fix-seb ... removed hardcoded profile pic	2018-08-31 16:10:17 +01:00
Beatrice Olivera	2bd9274706	removed hardcoded profile pic	2018-08-31 16:09:45 +01:00
Beatrice Olivera	8cc007e315	Merge pull request #33 from beatriceo/contacts-video ... asdf	2018-08-31 15:49:51 +01:00
Beatrice Olivera	d484769f40	asdf	2018-08-31 15:49:10 +01:00
Beatrice Olivera	7f579eff3c	Merge pull request #32 from beatriceo/guy ... done demo checklist	2018-08-31 15:31:57 +01:00
Beatrice Olivera	ebdad02216	Merge pull request #31 from beatriceo/del ... del	2018-08-31 15:16:05 +01:00
Benjamin Myara	78540284c1	del	2018-08-31 15:15:15 +01:00
Beatrice Olivera	d27a53feea	Merge branch 'master' into del	2018-08-31 15:09:04 +01:00