Beatrice Olivera
|
c35f1fdb83
|
Merge pull request #64 from beatriceo/chat-css
update gitignore
|
2018-09-06 02:05:31 +01:00 |
Beatrice Olivera
|
904f972d3b
|
update gitignore
|
2018-09-06 02:04:17 +01:00 |
|
Beatrice Olivera
|
46e0aaf14e
|
Merge pull request #62 from beatriceo/revert-61-chat-css
Revert "Chat css"
|
2018-09-06 01:58:48 +01:00 |
|
Beatrice Olivera
|
9028db59cc
|
Revert "Chat css"
|
2018-09-06 01:58:34 +01:00 |
|
Beatrice Olivera
|
7cf0cf7628
|
Merge pull request #61 from beatriceo/chat-css
Chat css
|
2018-09-06 01:56:57 +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
|
adb3a18650
|
key
|
2018-09-05 15:39:17 +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
|
e3c9ab2cad
|
Update .gitignore
|
2018-09-05 15:01:41 +01:00 |
|
Beatrice Olivera
|
25b3707dc9
|
Delete translation-credentials.json
|
2018-09-05 15:01:11 +01:00 |
|
Beatrice Olivera
|
cf71cee5d7
|
added translated chat
|
2018-09-05 14:59:39 +01:00 |
|
Beatrice Olivera
|
f23ccacbbf
|
Merge pull request #58 from beatriceo/remote-video-update
Change video.srcObject instead of deleting entire video element
|
2018-09-05 13:14:02 +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
|
4bfd9e9b06
|
added translation credentials
|
2018-09-05 09:46:49 +01:00 |
|
Beatrice Olivera
|
55b0f8199f
|
Merge pull request #57 from beatriceo/git-ignore
edited git ignore
|
2018-09-04 19:48:44 +01:00 |
|
Beatrice Olivera
|
b930f3ce98
|
edited git ignore
|
2018-09-04 19:47:48 +01:00 |
|
Beatrice Olivera
|
b2fe80a1d4
|
Merge pull request #56 from beatriceo/delete-api-key
Delete translation-credentials.json
|
2018-09-04 19:42:49 +01:00 |
|
Beatrice Olivera
|
145e3ff9f5
|
Delete translation-credentials.json
|
2018-09-04 19:42:40 +01:00 |
|
Beatrice Olivera
|
be138457e8
|
Merge pull request #55 from beatriceo/chat-features
Chat features
|
2018-09-04 19:33:34 +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
|
ba17995f7b
|
Merge pull request #54 from beatriceo/hangup
Romain added hangup
|
2018-09-04 14:54:12 +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
|
a42f72974a
|
Merge pull request #53 from beatriceo/revert-52-brandi
Revert "done"
|
2018-09-04 12:04:34 +01: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
|
77d92b4fdf
|
Merge pull request #51 from beatriceo/chat-room
added message sending
|
2018-09-04 11:49:41 +01:00 |
|
Beatrice Olivera
|
083ec3e747
|
added message sending
|
2018-09-04 11:49:18 +01:00 |
|
Beatrice Olivera
|
a48f955914
|
Merge pull request #50 from beatriceo/fixes-again
fixed modal (again)
|
2018-09-04 11:24:03 +01:00 |
|
Beatrice Olivera
|
5650943209
|
fixed modal (again)
|
2018-09-04 11:23:45 +01:00 |
|
Beatrice Olivera
|
482058e6bc
|
Merge pull request #49 from beatriceo/fixes
fixed issue where import triggerCalleeModalEvent broke javascript in …
|
2018-09-04 10:31:01 +01:00 |
|
Beatrice Olivera
|
e0995c7610
|
fixed issue where import triggerCalleeModalEvent broke javascript in navbar
|
2018-09-04 10:29:56 +01:00 |
|
Beatrice Olivera
|
7922a55e14
|
Merge pull request #48 from beatriceo/css-fixes
changed close class that was being overridden
|
2018-09-03 18:59:58 +01:00 |
|
Beatrice Olivera
|
b24a22d31d
|
changed close class that was being overridden
|
2018-09-03 18:59:32 +01:00 |
|
Beatrice Olivera
|
cf7b8271b2
|
Merge pull request #47 from beatriceo/front-end
added callee modal
|
2018-09-03 18:32:50 +01:00 |
|
Beatrice Olivera
|
22041b753a
|
added callee modal
|
2018-09-03 18:32:03 +01:00 |
Benjamin Myara
|
08de4ca536
|
Merge pull request #46 from beatriceo/cross
done
|
2018-09-03 15:19:12 +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 |
Ethan1710
|
03e6e0cc1a
|
Merge pull request #45 from beatriceo/responsiveness
added responsiveness to modal and edit page
|
2018-09-03 11:27:41 +01:00 |
|
Ethan Fraenkel
|
8bd06651cf
|
added responsiveness to modal and edit page
|
2018-09-03 11:25:20 +02:00 |
|
Beatrice Olivera
|
598d59319e
|
Merge pull request #44 from beatriceo/front-end
actually changed profile image size
|
2018-09-03 09:11:59 +01:00 |
|
Beatrice Olivera
|
f9ca657c1b
|
actually changed profile image size
|
2018-09-03 09:11:05 +01:00 |
|
Beatrice Olivera
|
076489ecd6
|
Merge pull request #43 from beatriceo/front-end
changed profile image size
|
2018-09-03 09:07:42 +01:00 |