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 |
|
Beatrice Olivera
|
a7d4422f3a
|
added autoclick on join room
|
2018-08-31 21:24:38 +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
|
e2a520b55c
|
erm no he didnt
|
2018-08-31 16:16:33 +01:00 |
|
Beatrice Olivera
|
c847f48340
|
guy fixed it
|
2018-08-31 16:14:24 +01:00 |
|
Beatrice Olivera
|
aa109aa35d
|
Merge pull request #34 from beatriceo/fix-seb
removed hardcoded profile pic
|
2018-08-31 16:10:17 +01:00 |
|
Beatrice Olivera
|
2bd9274706
|
removed hardcoded profile pic
|
2018-08-31 16:09:45 +01:00 |
|
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
|
103f00d55a
|
Merge pull request #30 from beatriceo/del
del
|
2018-08-31 15:09:12 +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
|
5b87fd5e01
|
Merge pull request #28 from beatriceo/tab
added favicon
|
2018-08-31 12:19:05 +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
|
b2182f0322
|
Merge pull request #26 from beatriceo/modal-fix
fixed issue where modal trigger broke navbar
|
2018-08-31 12:03:09 +01:00 |
|
Beatrice Olivera
|
4eecfe6291
|
fixed issue where modal trigger broke navbar
|
2018-08-31 12:00:17 +01:00 |
|
Beatrice Olivera
|
d0803e7e72
|
Merge pull request #25 from beatriceo/modal-fixes
fixed calling modal
|
2018-08-31 11:30:05 +01:00 |
|
Beatrice Olivera
|
0b377cbe20
|
fixed calling modal
|
2018-08-31 11:29:24 +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
|
18bc693b5c
|
Merge pull request #24 from beatriceo/brand
done brand
|
2018-08-31 10:33:46 +01: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
|
56c5278624
|
Merge pull request #23 from beatriceo/request-origins
removed / from request origin url
|
2018-08-31 06:16:54 +01:00 |
|
Beatrice Olivera
|
28673600d8
|
removed / from request origin url
|
2018-08-31 06:15:39 +01:00 |
|
Beatrice Olivera
|
e59b4305d1
|
Merge pull request #22 from beatriceo/request-origins
added polyglot.live to request origins and commented out unnecessary …
|
2018-08-31 06:03:13 +01:00 |
|
Beatrice Olivera
|
c264c98444
|
added polyglot.live to request origins and commented out unnecessary information on chatroom show page
|
2018-08-31 06:02:24 +01:00 |
|
Beatrice Olivera
|
f911f91da5
|
Merge pull request #21 from beatriceo/page
Page
|
2018-08-30 20:09:19 +01:00 |
|
Beatrice Olivera
|
a900959c34
|
Merge branch 'master' into page
|
2018-08-30 20:09:00 +01:00 |
|
Beatrice Olivera
|
eca6f59ff5
|
Merge pull request #20 from beatriceo/ben-save-us
added request origin
|
2018-08-30 18:59:38 +01:00 |
|
Beatrice Olivera
|
cac4846f5f
|
added request origin
|
2018-08-30 18:59:12 +01:00 |
|
Beatrice Olivera
|
bb5e5eff15
|
Merge pull request #19 from beatriceo/actioncable
Actioncable
|
2018-08-30 18:43:32 +01:00 |
|
Beatrice Olivera
|
c3b072ba38
|
added room id in exchange parameters
|
2018-08-30 18:42:42 +01:00 |