| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 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 | 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 | 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 | 22041b753a | added callee modal | 2018-09-03 18:32:03 +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 | ff6d17ae90 | fixed active/inactive detail on navbar | 2018-09-01 18:27:12 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | 80646d4d33 | css changes (navbar, settings page, contacts page) | 2018-09-01 17:36:46 +01:00 |  | 
			
				
					| 
							
							
								 Beatrice Olivera | 9970c384c6 | minor updates to clean up code | 2018-08-31 21:38:48 +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 | 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 |  |