Commit Graph

141 Commits

Author SHA1 Message Date
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 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
Beatrice Olivera 247ece4b4b changed profile image size 2018-09-03 09:06:52 +01:00
Beatrice Olivera 2a0f6be43a
Merge pull request #42 from beatriceo/front-end
made login/sign up page responsive
2018-09-02 01:26:11 +01:00
Beatrice Olivera 7559e39030 made login/sign up page responsive 2018-09-02 01:22:03 +01:00
Beatrice Olivera 3e92e26177
Merge pull request #41 from beatriceo/front-end
made settings page responsive and edited route from connections/new t…
2018-09-02 00:48:21 +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 2f6d020b26
Merge pull request #40 from beatriceo/front-end
Front end
2018-09-01 20:27:34 +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
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 2e8dd92f39
Merge pull request #39 from beatriceo/images
resized image to correct size for fb og
2018-09-01 14:11:10 +01:00
Beatrice Olivera d42e2dbac1 resized image to correct size for fb og 2018-09-01 14:10:11 +01:00
Beatrice Olivera eaba9c495a
Merge pull request #38 from beatriceo/add-license-1
Create LICENSE
2018-09-01 13:51:27 +01:00
Beatrice Olivera 19a5c5420e
Create LICENSE 2018-09-01 13:51:17 +01:00
Beatrice Olivera d22d651ce7
Merge pull request #37 from beatriceo/read-me
Update README.md
2018-09-01 13:46:05 +01:00
Beatrice Olivera 04fb217322
Update README.md 2018-09-01 13:45:52 +01:00
Beatrice Olivera 458d6c0dd9
Merge pull request #36 from beatriceo/error-pages
added error types to error pages
2018-09-01 13:29:28 +01:00
Beatrice Olivera fe09d2dc8e added error types to error pages 2018-09-01 13:28:51 +01:00
Beatrice Olivera 802cb86319
Merge pull request #35 from beatriceo/working-version
Working version
2018-08-31 21:45:59 +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