Beatrice Olivera
|
f5be2763ec
|
routes changes
|
2018-09-05 13:07:43 +01:00 |
Beatrice Olivera
|
ccfba63f6c
|
Merge branch 'master' into chat-features
|
2018-09-04 19:33:26 +01:00 |
|
Beatrice Olivera
|
b19a000729
|
fixed bug where translations were also broadcasted to other client and fixed bug where the same original and target language caused a 500 error
|
2018-09-04 19:22:13 +01:00 |
|
Beatrice Olivera
|
f4467c65fd
|
implemented chat and built in google translate
|
2018-09-04 19:03:28 +01:00 |
Ethan Fraenkel
|
95d0c2f5cd
|
Romain added hangup
|
2018-09-04 14:50:44 +02: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 |
|
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
|
ed238f3f7e
|
Merge branch 'master' into working-version
|
2018-08-31 21:44:53 +01:00 |
|
Beatrice Olivera
|
9970c384c6
|
minor updates to clean up code
|
2018-08-31 21:38:48 +01:00 |
|
Beatrice Olivera
|
7f579eff3c
|
Merge pull request #32 from beatriceo/guy
done demo checklist
|
2018-08-31 15:31:57 +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
|
0b377cbe20
|
fixed calling modal
|
2018-08-31 11:29:24 +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
|
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
|
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
|
6dee298b44
|
Add dotenv - Protect my secret data in .env file
|
2018-08-29 14:53:39 +01:00 |
|
Beatrice Olivera
|
68d55cbcd8
|
added chat room controllers
|
2018-08-29 14:09:12 +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
|
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 |
|
Ethan Fraenkel
|
3d44276105
|
bugfix devise
|
2018-08-28 15:46:15 +02:00 |
|
Benjamin Myara
|
daec345b50
|
done landing_page
|
2018-08-28 15:00:54 +01:00 |
|
Beatrice Olivera
|
acc13310f6
|
changed pages/home to pages/call
|
2018-08-28 13:48:32 +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
|
ebd896cd31
|
Initial commit with devise template from https://github.com/lewagon/rails-templates
|
2018-08-27 15:37:06 +01:00 |