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 |
|
Ethan Fraenkel
|
6f091b96aa
|
done with login signup
|
2018-08-28 15:34:52 +02:00 |
|
Beatrice Olivera
|
e73df2ed65
|
Merge pull request #8 from beatriceo/front-end
changed pages/home to pages/call
|
2018-08-28 13:49:11 +01:00 |
|
Beatrice Olivera
|
acc13310f6
|
changed pages/home to pages/call
|
2018-08-28 13:48:32 +01:00 |
|
Beatrice Olivera
|
d12fa2a46b
|
Merge pull request #7 from beatriceo/frontend-setup
Frontend setup
|
2018-08-28 12:38:41 +01:00 |
|
Ethan Fraenkel
|
b44963ee4c
|
Changed colors setup bootstrap
|
2018-08-28 12:39:45 +02:00 |
|
Beatrice Olivera
|
4e1d0559ed
|
Merge pull request #6 from beatriceo/redis-fix
interpolated redis url
|
2018-08-28 11:31:53 +01:00 |
|
Beatrice Olivera
|
970c38ce68
|
interpolated redis url
|
2018-08-28 11:31:24 +01:00 |
|
Beatrice Olivera
|
d419ad9201
|
Merge pull request #5 from beatriceo/redis-env
hid key
|
2018-08-28 11:24:01 +01:00 |
|
Beatrice Olivera
|
a820f417c1
|
hid key
|
2018-08-28 11:23:39 +01:00 |
|
Ethan Fraenkel
|
644b6cb411
|
Basic Navbar working
|
2018-08-28 12:18:23 +02:00 |
|
Beatrice Olivera
|
a80497139d
|
Merge pull request #4 from beatriceo/redis-fix
added redis url
|
2018-08-28 11:05:55 +01:00 |
|
Beatrice Olivera
|
bc42c644e6
|
added redis url
|
2018-08-28 11:05:27 +01:00 |
|
Beatrice Olivera
|
62aba9332c
|
Merge pull request #3 from beatriceo/action-cable
Action cable
|
2018-08-28 10:57:24 +01:00 |
|
Beatrice Olivera
|
7777c01d3b
|
set up redis and heroku config
|
2018-08-28 10:56:54 +01:00 |
|
Beatrice Olivera
|
31eeee305e
|
added uglifier and redis
|
2018-08-28 10:41:54 +01: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
|
919019e939
|
Merge pull request #2 from beatriceo/action-cable
set up action able to work with webrtc in localhost
|
2018-08-27 19:08:07 +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
|
e15bc9165c
|
Merge pull request #1 from beatriceo/action-cable
created channel for action cable and friendship relationship in database
|
2018-08-27 16:57:40 +01:00 |
|
Beatrice Olivera
|
f9cbb7c680
|
created channel for action cable and friendship relationship in database
|
2018-08-27 16:56:21 +01:00 |
|
Beatrice Olivera
|
7d67f04c63
|
Updated .ruby-version
|
2018-08-27 15:41:30 +01:00 |