Beatrice Olivera
|
1deac6f364
|
last push
|
2018-09-06 17:52:18 +01:00 |
|
Beatrice Olivera
|
42184031d7
|
made container in chat overflow
|
2018-09-06 15:39:50 +01:00 |
|
Beatrice Olivera
|
d9a0742b01
|
ethan told me to push to master
|
2018-09-06 14:22:11 +01:00 |
Beatrice Olivera
|
c7956a74a9
|
Merge pull request #74 from beatriceo/chat-css-fixes
chat css
|
2018-09-06 14:18:38 +01:00 |
|
Beatrice Olivera
|
84a155571a
|
chat css
|
2018-09-06 14:17:24 +01:00 |
Rekai Musuka
|
26ecd1182e
|
Completed cloudinaryv2 fix
|
2018-09-06 14:07:15 +01:00 |
|
Beatrice Olivera
|
d1a245cdbf
|
changed chatroom css
|
2018-09-06 12:45:57 +01:00 |
|
Beatrice Olivera
|
ec6cc273de
|
edited scrollbar and removed navbar from call page
|
2018-09-06 11:47:18 +01:00 |
|
Rekai Musuka
|
2ff5dd0f46
|
Fixed Dashboard issues and removed horizontal scroll from chat window
|
2018-09-06 11:08:08 +01:00 |
|
Beatrice Olivera
|
b15ea6e42e
|
Revert "Revert "Chat css""
|
2018-09-06 01:59:16 +01:00 |
|
Beatrice Olivera
|
9028db59cc
|
Revert "Chat css"
|
2018-09-06 01:58:34 +01:00 |
|
Beatrice Olivera
|
bb2a8ad1b9
|
added profile images and colors to the chat messages
|
2018-09-06 01:52:00 +01:00 |
|
Beatrice Olivera
|
9ddbd38bce
|
implemented inline form
|
2018-09-05 23:23:10 +01:00 |
|
Beatrice Olivera
|
a0ef7458aa
|
chat css
|
2018-09-05 18:17:13 +01:00 |
Ethan Fraenkel
|
95d0c2f5cd
|
Romain added hangup
|
2018-09-04 14:50:44 +02: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
|
247ece4b4b
|
changed profile image size
|
2018-09-03 09:06:52 +01:00 |
|
Beatrice Olivera
|
7559e39030
|
made login/sign up page responsive
|
2018-09-02 01:22:03 +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
|
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
|
d42e2dbac1
|
resized image to correct size for fb og
|
2018-09-01 14:10:11 +01:00 |
|
Beatrice Olivera
|
ed238f3f7e
|
Merge branch 'master' into working-version
|
2018-08-31 21:44:53 +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
|
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 |