Commit Graph

113 Commits

Author SHA1 Message Date
Ethan Fraenkel 85d5abc671 Merge branch 'master' of github.com:beatriceo/polyglot 2018-09-06 18:05:13 +01:00
Ethan Fraenkel ee7af22670 changed landing page phrase 2018-09-06 18:04:50 +01:00
Beatrice Olivera 1deac6f364 last push 2018-09-06 17:52:18 +01:00
Ethan Fraenkel ef53f19617 done with scroll to bottom 2018-09-06 16:13:49 +01:00
Beatrice Olivera 42184031d7 made container in chat overflow 2018-09-06 15:39:50 +01:00
Beatrice Olivera d9a0742b01 ethan told me to push to master 2018-09-06 14:22:11 +01:00
Beatrice Olivera c7956a74a9
Merge pull request #74 from beatriceo/chat-css-fixes
chat css
2018-09-06 14:18:38 +01:00
Beatrice Olivera 84a155571a chat css 2018-09-06 14:17:24 +01:00
Rekai Musuka 26ecd1182e Completed cloudinaryv2 fix 2018-09-06 14:07:15 +01:00
Beatrice Olivera 5bbca19a21
Merge branch 'master' into scrollbar 2018-09-06 12:49:02 +01:00
Beatrice Olivera ab42239aad
Merge pull request #71 from beatriceo/send-enter
added an event listener on enter key to have it as send
2018-09-06 12:47:07 +01:00
Beatrice Olivera 110fa37c42
Merge pull request #70 from beatriceo/profile-pic-fix
Website now supports non 1:1 aspect ratio images
2018-09-06 12:46:54 +01:00
Beatrice Olivera d1a245cdbf changed chatroom css 2018-09-06 12:45:57 +01:00
Ethan Fraenkel 4899ac5ec7 added an event listener on enter key to have it as send 2018-09-06 12:33:22 +01:00
Rekai Musuka 0e151e5e1d Website now supports non 1:1 aspect ratio images 2018-09-06 12:32:44 +01:00
Beatrice Olivera ec6cc273de edited scrollbar and removed navbar from call page 2018-09-06 11:47:18 +01:00
Rekai Musuka 2ff5dd0f46 Fixed Dashboard issues and removed horizontal scroll from chat window 2018-09-06 11:08:08 +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 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 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 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 1b7a58e4bf improved responsiveness further 2018-09-01 19:30:03 +01:00
Beatrice Olivera 56d1b924a0 made settings page responsive 2018-09-01 19:12:26 +01:00