Ethan Fraenkel
|
23212e9e99
|
done demo checklist
|
2018-08-31 15:32:14 +02: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 |
|
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 |
|
Benjamin Myara
|
25c6c3aeb5
|
done page
|
2018-08-29 16:58:21 +01:00 |
|
Benjamin Myara
|
6dee298b44
|
Add dotenv - Protect my secret data in .env file
|
2018-08-29 14:53:39 +01:00 |
|
Beatrice Olivera
|
f0bca74f89
|
Merge pull request #18 from beatriceo/rooms
Rooms
|
2018-08-29 14:11:40 +01:00 |
|
Beatrice Olivera
|
68d55cbcd8
|
added chat room controllers
|
2018-08-29 14:09:12 +01:00 |
|
Beatrice Olivera
|
085e402c4d
|
created models for chatroom
|
2018-08-29 13:44:10 +01:00 |
|
Beatrice Olivera
|
82079d71cd
|
removed room id from connections table
|
2018-08-29 13:15:37 +01:00 |
|
Beatrice Olivera
|
97aee2c10f
|
added room id to connections table
|
2018-08-29 11:39:51 +01:00 |
|
Beatrice Olivera
|
dfb53b89b0
|
Merge pull request #17 from beatriceo/call
added css to contacts
|
2018-08-29 00:06:38 +01:00 |
|
Beatrice Olivera
|
40c2b34ca3
|
Merge pull request #16 from beatriceo/call-page
made edits to call page
|
2018-08-28 20:39:02 +01:00 |
|
Beatrice Olivera
|
cbfa5b8e7a
|
made edits to call page
|
2018-08-28 20:36:56 +01:00 |
|
Beatrice Olivera
|
3babc6540c
|
added css to contacts
|
2018-08-28 18:48:49 +01:00 |
|
Beatrice Olivera
|
aaf935eec6
|
Merge pull request #15 from beatriceo/call
added routes for call
|
2018-08-28 18:27:02 +01:00 |
|
Beatrice Olivera
|
4b1636ee78
|
added routes for call
|
2018-08-28 18:26:33 +01:00 |
|
Beatrice Olivera
|
3dfbc577b6
|
Merge pull request #14 from beatriceo/redirection
edited routes to redirect to correct pages upon sign up
|
2018-08-28 17:42:02 +01:00 |
|
Beatrice Olivera
|
89976ad750
|
edited routes to redirect to correct pages upon sign up
|
2018-08-28 17:41:10 +01:00 |
|
Beatrice Olivera
|
f8d05dd449
|
Merge pull request #13 from beatriceo/front-end
Front end
|
2018-08-28 17:25:25 +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
|
9f23553256
|
Merge pull request #11 from beatriceo/devise-fix
bugfix devise
|
2018-08-28 15:45:02 +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
|
3d44276105
|
bugfix devise
|
2018-08-28 15:46:15 +02:00 |
|
Ethan Fraenkel
|
45a6f19a9c
|
added title to tabbar
|
2018-08-28 15:36:05 +02:00 |