Commit Graph

37 Commits

Author SHA1 Message Date
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 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 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 56d1b924a0 made settings page responsive 2018-09-01 19:12:26 +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 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
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 62194ffea4 removed default seb image in calling modal 2018-08-31 20:12:43 +01:00
Beatrice Olivera d484769f40 asdf 2018-08-31 15:49:10 +01:00
Beatrice Olivera d27a53feea
Merge branch 'master' into del 2018-08-31 15:09:04 +01:00
Benjamin Myara c67849c3dc del 2018-08-31 15:06:42 +01:00
Beatrice Olivera 9828142868
Merge pull request #27 from beatriceo/contacts
fixed contacts and added a scrollable feature
2018-08-31 12:05:37 +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
Ethan Fraenkel 2a4d10b590 fixed contacts and added a scrollable feature 2018-08-31 11:54:11 +02: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 cbfa5b8e7a made edits to call page 2018-08-28 20:36:56 +01:00
Beatrice Olivera 4b1636ee78 added routes for call 2018-08-28 18:26:33 +01:00
Beatrice Olivera e7b4b74c00
Merge branch 'master' into front-end 2018-08-28 17:21:12 +01:00
Beatrice Olivera e98199d013 finished basic contacts page 2018-08-28 17:18:58 +01:00
Benjamin Myara daec345b50 done landing_page 2018-08-28 15:00:54 +01:00
Beatrice Olivera acc13310f6 changed pages/home to pages/call 2018-08-28 13:48:32 +01:00
Beatrice Olivera aa3693d58c set up action able to work with webrtc in localhost 2018-08-27 19:05:57 +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