Commit Graph

37 Commits

Author SHA1 Message Date
Beatrice Olivera 8cc007e315
Merge pull request #33 from beatriceo/contacts-video
asdf
2018-08-31 15:49:51 +01:00
Beatrice Olivera d484769f40 asdf 2018-08-31 15:49:10 +01:00
Beatrice Olivera 7f579eff3c
Merge pull request #32 from beatriceo/guy
done demo checklist
2018-08-31 15:31:57 +01:00
Beatrice Olivera ebdad02216
Merge pull request #31 from beatriceo/del
del
2018-08-31 15:16:05 +01:00
Benjamin Myara 78540284c1 del 2018-08-31 15:15:15 +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
Ethan Fraenkel 23212e9e99 done demo checklist 2018-08-31 15:32:14 +02:00
Beatrice Olivera 2d20473270
Merge pull request #29 from beatriceo/signaling-fix
Fixed serious bug in signaling-js
2018-08-31 14:26:53 +01:00
Beatrice Olivera 4b7dee3633 Fixed serious bug in signaling-js 2018-08-31 14:26:01 +01:00
Beatrice Olivera b62908598e Solve conflict 2018-08-31 12:17:16 +01:00
Beatrice Olivera b6648b5ed7 Merge branch 'master' into tab
add favicon
2018-08-31 12:11:51 +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
Ethan Fraenkel 017a45f242 added favicon 2018-08-31 11:58:20 +02:00
Ethan Fraenkel 2a4d10b590 fixed contacts and added a scrollable feature 2018-08-31 11:54:11 +02:00
Beatrice Olivera 4fdc56ca5c
Merge branch 'master' into brand 2018-08-31 10:33:38 +01:00
Benjamin Myara 81ed01010c done brand 2018-08-31 10:17:26 +01:00
Beatrice Olivera a900959c34
Merge branch 'master' into page 2018-08-30 20:09:00 +01:00
Beatrice Olivera c3b072ba38 added room id in exchange parameters 2018-08-30 18:42:42 +01:00
Beatrice Olivera 405d2cd5df added chatroom channel with room ids and notifications channel 2018-08-30 03:00:09 +01:00
Benjamin Myara 6dee298b44 Add dotenv - Protect my secret data in .env file 2018-08-29 14:53:39 +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
Ethan1710 fb0143a20b
Merge pull request #10 from beatriceo/landing_page
done landing_page
2018-08-28 15:35:27 +01:00
Ethan1710 8745a42b00
Merge pull request #9 from beatriceo/login-page
Login page
2018-08-28 15:34:59 +01:00
Benjamin Myara daec345b50 done landing_page 2018-08-28 15:00:54 +01:00
Ethan Fraenkel 6f091b96aa done with login signup 2018-08-28 15:34:52 +02:00
Beatrice Olivera acc13310f6 changed pages/home to pages/call 2018-08-28 13:48:32 +01:00
Ethan Fraenkel b44963ee4c Changed colors setup bootstrap 2018-08-28 12:39:45 +02:00
Ethan Fraenkel 644b6cb411 Basic Navbar working 2018-08-28 12:18:23 +02:00
Ethan Fraenkel 3108fcbd15 Added ';' 2018-08-28 11:06:28 +02:00
Ethan Fraenkel 5a49b0fd9a Completed basic colour setup 2018-08-28 11:05:06 +02: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