Commit Graph

Select branches

Hide Pull Requests

file-transfer

master

refactoring

ruby-translation

translation

#1

#10

#11

#12

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#8

#9

Mono Color

• 0b0a345191 removed translation-credentials refactoring Beatrice Olivera 2018-09-11 18:04:10 +01:00
• f53755bd23 deleted unused files Beatrice Olivera 2018-09-11 17:58:17 +01:00
• e74b3ac6eb last last last push Beatrice Olivera 2018-09-06 18:07:27 +01:00
• 85d5abc671 Merge branch 'master' of github.com:beatriceo/polyglot master Ethan Fraenkel 2018-09-06 18:05:13 +01:00
• ee7af22670 changed landing page phrase Ethan Fraenkel 2018-09-06 18:04:50 +01:00
• 4abeb90e67 last last push Beatrice Olivera 2018-09-06 17:55:09 +01:00
• c2fe32c4b2 Merge branch 'master' of github.com:beatriceo/polyglot Beatrice Olivera 2018-09-06 17:52:47 +01:00
• 1deac6f364 last push Beatrice Olivera 2018-09-06 17:52:18 +01:00
• 412f5c0c0e Delete translation-credentials.json Beatrice Olivera 2018-09-06 16:28:27 +01:00
• 5b684718c3 Merge pull request #76 from beatriceo/scroll Ethan1710 2018-09-06 16:14:23 +01:00
• ef53f19617 done with scroll to bottom #76 Ethan Fraenkel 2018-09-06 16:13:49 +01:00
• c4c1ea7b49 Merge pull request #75 from beatriceo/chat Beatrice Olivera 2018-09-06 15:42:49 +01:00
• 42184031d7 made container in chat overflow #75 Beatrice Olivera 2018-09-06 15:39:50 +01:00
• 168d4044d4 keeeeeeyys Beatrice Olivera 2018-09-06 14:23:36 +01:00
• d9a0742b01 ethan told me to push to master Beatrice Olivera 2018-09-06 14:22:11 +01:00
• c7956a74a9 Merge pull request #74 from beatriceo/chat-css-fixes Beatrice Olivera 2018-09-06 14:18:38 +01:00
• d7ebdeea6e Merge pull request #73 from beatriceo/cloudinary-v2 Beatrice Olivera 2018-09-06 14:18:26 +01:00
• 84a155571a chat css #74 Beatrice Olivera 2018-09-06 14:17:24 +01:00
• 26ecd1182e Completed cloudinaryv2 fix #73 Rekai Musuka 2018-09-06 14:07:15 +01:00
• 1327e86d03 Merge pull request #72 from beatriceo/scrollbar Beatrice Olivera 2018-09-06 12:49:11 +01:00
• 5bbca19a21 Merge branch 'master' into scrollbar #72 Beatrice Olivera 2018-09-06 12:49:02 +01:00
• ab42239aad Merge pull request #71 from beatriceo/send-enter Beatrice Olivera 2018-09-06 12:47:07 +01:00
• 110fa37c42 Merge pull request #70 from beatriceo/profile-pic-fix Beatrice Olivera 2018-09-06 12:46:54 +01:00
• d1a245cdbf changed chatroom css Beatrice Olivera 2018-09-06 12:45:57 +01:00
• 4899ac5ec7 added an event listener on enter key to have it as send #71 Ethan Fraenkel 2018-09-06 12:33:22 +01:00
• 0e151e5e1d Website now supports non 1:1 aspect ratio images #70 Rekai Musuka 2018-09-06 12:32:44 +01:00
• b41512eba8 Merge pull request #69 from beatriceo/scrollbar Beatrice Olivera 2018-09-06 11:50:33 +01:00
• ec6cc273de edited scrollbar and removed navbar from call page #69 Beatrice Olivera 2018-09-06 11:47:18 +01:00
• 87728fc459 Merge pull request #67 from beatriceo/dashboard-fix Beatrice Olivera 2018-09-06 11:13:55 +01:00
• 9eccf35110 Delete translation-credentials.json Beatrice Olivera 2018-09-06 11:12:37 +01:00
• 23ccdefbef Merge pull request #68 from beatriceo/creds Beatrice Olivera 2018-09-06 11:09:52 +01:00
• 2ff5dd0f46 Fixed Dashboard issues and removed horizontal scroll from chat window #67 Rekai Musuka 2018-09-06 11:08:08 +01:00
• f5cd79a88a hide key #68 Beatrice Olivera 2018-09-06 10:56:29 +01:00
• 20266cf6e3 key Beatrice Olivera 2018-09-06 10:52:23 +01:00
• 23473a5d70 key Beatrice Olivera 2018-09-06 10:16:07 +01:00
• a0672654b1 Merge pull request #66 from beatriceo/chat-features Beatrice Olivera 2018-09-06 08:47:12 +01:00
• dcfeb416ec added hover and show original/translated #66 Beatrice Olivera 2018-09-06 08:46:07 +01:00
• 5d4423ddb0 Merge pull request #65 from beatriceo/beatriceo-patch-1 Beatrice Olivera 2018-09-06 02:09:29 +01:00
• f2e48cf501 Delete translation-credentials.json #65 Beatrice Olivera 2018-09-06 02:09:20 +01:00
• cb0a4371d2 Merge pull request #63 from beatriceo/revert-62-revert-61-chat-css Beatrice Olivera 2018-09-06 02:08:17 +01:00
• c35f1fdb83 Merge pull request #64 from beatriceo/chat-css Beatrice Olivera 2018-09-06 02:05:31 +01:00
• 904f972d3b update gitignore #64 Beatrice Olivera 2018-09-06 02:04:17 +01:00
• 2c47266e60 Update .gitignore #63 Beatrice Olivera 2018-09-06 02:00:47 +01:00
• b15ea6e42e Revert "Revert "Chat css"" Beatrice Olivera 2018-09-06 01:59:16 +01:00
• 46e0aaf14e Merge pull request #62 from beatriceo/revert-61-chat-css Beatrice Olivera 2018-09-06 01:58:48 +01:00
• 9028db59cc Revert "Chat css" #62 Beatrice Olivera 2018-09-06 01:58:34 +01:00
• 7cf0cf7628 Merge pull request #61 from beatriceo/chat-css Beatrice Olivera 2018-09-06 01:56:57 +01:00
• bb2a8ad1b9 added profile images and colors to the chat messages #61 Beatrice Olivera 2018-09-06 01:52:00 +01:00
• 9ddbd38bce implemented inline form Beatrice Olivera 2018-09-05 23:23:10 +01:00
• a0ef7458aa chat css Beatrice Olivera 2018-09-05 18:17:13 +01:00
• 4cd6faec69 File Transfer Code kinda completed :/ file-transfer Rekai Musuka 2018-09-05 17:19:21 +01:00
• adb3a18650 key Beatrice Olivera 2018-09-05 15:39:17 +01:00
• f3d8397b5d Merge pull request #60 from beatriceo/translation-chat Beatrice Olivera 2018-09-05 15:02:38 +01:00
• e3c9ab2cad Update .gitignore #60 Beatrice Olivera 2018-09-05 15:01:41 +01:00
• 25b3707dc9 Delete translation-credentials.json Beatrice Olivera 2018-09-05 15:01:11 +01:00
• cf71cee5d7 added translated chat #59 Beatrice Olivera 2018-09-05 14:59:39 +01:00
• f23ccacbbf Merge pull request #58 from beatriceo/remote-video-update Beatrice Olivera 2018-09-05 13:14:02 +01:00
• f5be2763ec routes changes Beatrice Olivera 2018-09-05 13:07:43 +01:00
• a861e82322 Change video.srcObject instead of deleting entire video element #58 Rekai Musuka 2018-09-05 12:01:24 +01:00
• 4bfd9e9b06 added translation credentials Beatrice Olivera 2018-09-05 09:46:49 +01:00
• 55b0f8199f Merge pull request #57 from beatriceo/git-ignore Beatrice Olivera 2018-09-04 19:48:44 +01:00
• b930f3ce98 edited git ignore #57 Beatrice Olivera 2018-09-04 19:47:48 +01:00
• b2fe80a1d4 Merge pull request #56 from beatriceo/delete-api-key Beatrice Olivera 2018-09-04 19:42:49 +01:00
• 145e3ff9f5 Delete translation-credentials.json #56 Beatrice Olivera 2018-09-04 19:42:40 +01:00
• be138457e8 Merge pull request #55 from beatriceo/chat-features Beatrice Olivera 2018-09-04 19:33:34 +01:00
• ccfba63f6c Merge branch 'master' into chat-features #55 Beatrice Olivera 2018-09-04 19:33:26 +01:00
• 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 Beatrice Olivera 2018-09-04 19:21:25 +01:00
• f4467c65fd implemented chat and built in google translate Beatrice Olivera 2018-09-04 19:03:28 +01:00
• ba17995f7b Merge pull request #54 from beatriceo/hangup Beatrice Olivera 2018-09-04 14:54:12 +01:00
• 73283b1fa3 Merge branch 'master' into hangup #54 Beatrice Olivera 2018-09-04 14:53:57 +01:00
• 95d0c2f5cd Romain added hangup Ethan Fraenkel 2018-09-04 14:50:44 +02:00
• a42f72974a Merge pull request #53 from beatriceo/revert-52-brandi Beatrice Olivera 2018-09-04 12:04:34 +01:00
• 7e728b6fbd Revert "done" #53 Beatrice Olivera 2018-09-04 12:04:22 +01:00
• 64acc6fe35 Merge pull request #52 from beatriceo/brandi Beatrice Olivera 2018-09-04 11:53:10 +01:00
• 656af7c680 done #52 Benjamin Myara 2018-09-04 11:52:10 +01:00
• 77d92b4fdf Merge pull request #51 from beatriceo/chat-room Beatrice Olivera 2018-09-04 11:49:41 +01:00
• 083ec3e747 added message sending #51 Beatrice Olivera 2018-09-04 11:49:18 +01:00
• a48f955914 Merge pull request #50 from beatriceo/fixes-again Beatrice Olivera 2018-09-04 11:24:03 +01:00
• 5650943209 fixed modal (again) #50 Beatrice Olivera 2018-09-04 11:23:45 +01:00
• 4cc4fb91bb Working but broken communication with nodejs server translation Rekai Musuka 2018-09-04 11:18:39 +01:00
• 482058e6bc Merge pull request #49 from beatriceo/fixes Beatrice Olivera 2018-09-04 10:31:01 +01:00
• e0995c7610 fixed issue where import triggerCalleeModalEvent broke javascript in navbar #49 Beatrice Olivera 2018-09-04 10:29:56 +01:00
• 7922a55e14 Merge pull request #48 from beatriceo/css-fixes Beatrice Olivera 2018-09-03 18:59:58 +01:00
• b24a22d31d changed close class that was being overridden #48 Beatrice Olivera 2018-09-03 18:59:32 +01:00
• cf7b8271b2 Merge pull request #47 from beatriceo/front-end Beatrice Olivera 2018-09-03 18:32:50 +01:00
• 22041b753a added callee modal #47 Beatrice Olivera 2018-09-03 18:32:03 +01:00
• 523125bea0 ruby implementation ruby-translation Beatrice Olivera 2018-09-03 16:24:43 +01:00
• 08de4ca536 Merge pull request #46 from beatriceo/cross Benjamin Myara 2018-09-03 15:19:12 +01:00
• e6828b3bb4 Merge branch 'master' into cross #46 Benjamin Myara 2018-09-03 15:19:04 +01:00
• 480fbbdbfb done Benjamin Myara 2018-09-03 14:10:45 +01:00
• 03e6e0cc1a Merge pull request #45 from beatriceo/responsiveness Ethan1710 2018-09-03 11:27:41 +01:00
• 8bd06651cf added responsiveness to modal and edit page #45 Ethan Fraenkel 2018-09-03 11:25:20 +02:00
• 598d59319e Merge pull request #44 from beatriceo/front-end Beatrice Olivera 2018-09-03 09:11:59 +01:00
• f9ca657c1b actually changed profile image size #44 Beatrice Olivera 2018-09-03 09:11:05 +01:00
• 076489ecd6 Merge pull request #43 from beatriceo/front-end Beatrice Olivera 2018-09-03 09:07:42 +01:00
• 247ece4b4b changed profile image size #43 Beatrice Olivera 2018-09-03 09:06:52 +01:00
• 2a0f6be43a Merge pull request #42 from beatriceo/front-end Beatrice Olivera 2018-09-02 01:26:11 +01:00
• 7559e39030 made login/sign up page responsive #42 Beatrice Olivera 2018-09-02 01:22:03 +01:00
• 3e92e26177 Merge pull request #41 from beatriceo/front-end Beatrice Olivera 2018-09-02 00:48:21 +01:00
• da9e799436 made settings page responsive and edited route from connections/new to add_contact #41 Beatrice Olivera 2018-09-02 00:47:41 +01:00