Commit Graph

Select branches

Hide Pull Requests

file-transfer

master

refactoring

ruby-translation

translation

#1

#10

#11

#12

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#8

#9

Mono Color

• 2f6d020b26
  Merge pull request #40 from beatriceo/front-end Beatrice Olivera 2018-09-01 20:27:34 +01:00
• 6a1992a29f fixed issue where calling modal was only appeared for the first contact in list #40 Beatrice Olivera 2018-09-01 20:23:53 +01:00
• 1b7a58e4bf improved responsiveness further Beatrice Olivera 2018-09-01 19:30:03 +01:00
• 56d1b924a0 made settings page responsive Beatrice Olivera 2018-09-01 19:12:26 +01:00
• 3935b3067c changed fonts and minor css changes Beatrice Olivera 2018-09-01 18:45:52 +01:00
• ff6d17ae90 fixed active/inactive detail on navbar Beatrice Olivera 2018-09-01 18:27:12 +01:00
• c0ef870956 made contacts page responsive Beatrice Olivera 2018-09-01 18:03:32 +01:00
• 80646d4d33 css changes (navbar, settings page, contacts page) Beatrice Olivera 2018-09-01 17:36:46 +01:00
• 2e8dd92f39
  Merge pull request #39 from beatriceo/images Beatrice Olivera 2018-09-01 14:11:10 +01:00
• d42e2dbac1 resized image to correct size for fb og #39 Beatrice Olivera 2018-09-01 14:10:11 +01:00
• eaba9c495a
  Merge pull request #38 from beatriceo/add-license-1 Beatrice Olivera 2018-09-01 13:51:27 +01:00
• 19a5c5420e
  Create LICENSE #38 Beatrice Olivera 2018-09-01 13:51:17 +01:00
• d22d651ce7
  Merge pull request #37 from beatriceo/read-me Beatrice Olivera 2018-09-01 13:46:05 +01:00
• 04fb217322
  Update README.md #37 Beatrice Olivera 2018-09-01 13:45:52 +01:00
• 458d6c0dd9
  Merge pull request #36 from beatriceo/error-pages Beatrice Olivera 2018-09-01 13:29:28 +01:00
• fe09d2dc8e added error types to error pages #36 Beatrice Olivera 2018-09-01 13:28:51 +01:00
• 802cb86319
  Merge pull request #35 from beatriceo/working-version Beatrice Olivera 2018-08-31 21:45:59 +01:00
• ed238f3f7e
  Merge branch 'master' into working-version #35 Beatrice Olivera 2018-08-31 21:44:53 +01:00
• 8c833e47d9 added mute to html of local video Beatrice Olivera 2018-08-31 21:42:33 +01:00
• 9970c384c6 minor updates to clean up code Beatrice Olivera 2018-08-31 21:38:48 +01:00
• 157d056708 used first name and last name for contact details if available Beatrice Olivera 2018-08-31 21:32:35 +01:00
• a7d4422f3a added autoclick on join room Beatrice Olivera 2018-08-31 21:24:38 +01:00
• fbde469f45 added js package so that es7 syntax works, moved signaling-server from apps folder to pack folder, removed recurring js errors Beatrice Olivera 2018-08-31 20:47:33 +01:00
• 62194ffea4 removed default seb image in calling modal Beatrice Olivera 2018-08-31 20:12:43 +01:00
• e2a520b55c erm no he didnt Beatrice Olivera 2018-08-31 16:16:33 +01:00
• c847f48340 guy fixed it Beatrice Olivera 2018-08-31 16:14:24 +01:00
• aa109aa35d
  Merge pull request #34 from beatriceo/fix-seb Beatrice Olivera 2018-08-31 16:10:17 +01:00
• 2bd9274706 removed hardcoded profile pic #34 Beatrice Olivera 2018-08-31 16:09:45 +01:00
• 8cc007e315
  Merge pull request #33 from beatriceo/contacts-video Beatrice Olivera 2018-08-31 15:49:51 +01:00
• d484769f40 asdf #33 Beatrice Olivera 2018-08-31 15:49:10 +01:00
• 7f579eff3c
  Merge pull request #32 from beatriceo/guy Beatrice Olivera 2018-08-31 15:31:57 +01:00
• ebdad02216
  Merge pull request #31 from beatriceo/del Beatrice Olivera 2018-08-31 15:16:05 +01:00
• 78540284c1 del #31 Benjamin Myara 2018-08-31 15:15:15 +01:00
• 103f00d55a
  Merge pull request #30 from beatriceo/del Beatrice Olivera 2018-08-31 15:09:12 +01:00
• d27a53feea
  Merge branch 'master' into del #30 Beatrice Olivera 2018-08-31 15:09:04 +01:00
• c67849c3dc del Benjamin Myara 2018-08-31 15:06:42 +01:00
• 23212e9e99 done demo checklist #32 Ethan Fraenkel 2018-08-31 15:32:14 +02:00
• 2d20473270
  Merge pull request #29 from beatriceo/signaling-fix Beatrice Olivera 2018-08-31 14:26:53 +01:00
• 4b7dee3633 Fixed serious bug in signaling-js #29 Beatrice Olivera 2018-08-31 14:26:01 +01:00
• 5b87fd5e01
  Merge pull request #28 from beatriceo/tab Beatrice Olivera 2018-08-31 12:19:05 +01:00
• b62908598e Solve conflict #28 Beatrice Olivera 2018-08-31 12:17:16 +01:00
• b6648b5ed7 Merge branch 'master' into tab Beatrice Olivera 2018-08-31 12:11:51 +01:00
• 9828142868
  Merge pull request #27 from beatriceo/contacts Beatrice Olivera 2018-08-31 12:05:37 +01:00
• b2182f0322
  Merge pull request #26 from beatriceo/modal-fix Beatrice Olivera 2018-08-31 12:03:09 +01:00
• 4eecfe6291 fixed issue where modal trigger broke navbar #26 Beatrice Olivera 2018-08-31 11:55:03 +01:00
• d0803e7e72
  Merge pull request #25 from beatriceo/modal-fixes Beatrice Olivera 2018-08-31 11:30:05 +01:00
• 0b377cbe20 fixed calling modal #25 Beatrice Olivera 2018-08-31 11:29:24 +01:00
• 017a45f242 added favicon Ethan Fraenkel 2018-08-31 11:58:20 +02:00
• 2a4d10b590 fixed contacts and added a scrollable feature #27 Ethan Fraenkel 2018-08-31 11:54:11 +02:00
• 18bc693b5c
  Merge pull request #24 from beatriceo/brand Beatrice Olivera 2018-08-31 10:33:46 +01:00
• 4fdc56ca5c
  Merge branch 'master' into brand #24 Beatrice Olivera 2018-08-31 10:33:38 +01:00
• 81ed01010c done brand Benjamin Myara 2018-08-31 10:17:26 +01:00
• 56c5278624
  Merge pull request #23 from beatriceo/request-origins Beatrice Olivera 2018-08-31 06:16:54 +01:00
• 28673600d8 removed / from request origin url #23 Beatrice Olivera 2018-08-31 06:15:39 +01:00
• e59b4305d1
  Merge pull request #22 from beatriceo/request-origins Beatrice Olivera 2018-08-31 06:03:13 +01:00
• c264c98444 added polyglot.live to request origins and commented out unnecessary information on chatroom show page #22 Beatrice Olivera 2018-08-31 06:02:24 +01:00
• f911f91da5
  Merge pull request #21 from beatriceo/page Beatrice Olivera 2018-08-30 20:09:19 +01:00
• a900959c34
  Merge branch 'master' into page #21 Beatrice Olivera 2018-08-30 20:09:00 +01:00
• eca6f59ff5
  Merge pull request #20 from beatriceo/ben-save-us Beatrice Olivera 2018-08-30 18:59:38 +01:00
• cac4846f5f added request origin #20 Beatrice Olivera 2018-08-30 18:59:12 +01:00
• bb5e5eff15
  Merge pull request #19 from beatriceo/actioncable Beatrice Olivera 2018-08-30 18:43:32 +01:00
• c3b072ba38 added room id in exchange parameters #19 Beatrice Olivera 2018-08-30 18:42:42 +01:00
• 5245f2257d created rooms and redirects users to correct room Beatrice Olivera 2018-08-30 14:18:26 +01:00
• 405d2cd5df added chatroom channel with room ids and notifications channel Beatrice Olivera 2018-08-30 03:00:09 +01:00
• 25c6c3aeb5 done page Benjamin Myara 2018-08-29 16:58:21 +01:00
• 6dee298b44 Add dotenv - Protect my secret data in .env file Benjamin Myara 2018-08-29 14:53:39 +01:00
• f0bca74f89
  Merge pull request #18 from beatriceo/rooms Beatrice Olivera 2018-08-29 14:11:40 +01:00
• 68d55cbcd8 added chat room controllers #18 Beatrice Olivera 2018-08-29 14:09:12 +01:00
• 085e402c4d created models for chatroom Beatrice Olivera 2018-08-29 13:44:10 +01:00
• 82079d71cd removed room id from connections table Beatrice Olivera 2018-08-29 13:15:37 +01:00
• 97aee2c10f added room id to connections table Beatrice Olivera 2018-08-29 11:39:51 +01:00
• dfb53b89b0
  Merge pull request #17 from beatriceo/call Beatrice Olivera 2018-08-29 00:06:38 +01:00
• 40c2b34ca3
  Merge pull request #16 from beatriceo/call-page Beatrice Olivera 2018-08-28 20:39:02 +01:00
• cbfa5b8e7a made edits to call page #16 Beatrice Olivera 2018-08-28 20:36:56 +01:00
• 3babc6540c added css to contacts #17 Beatrice Olivera 2018-08-28 18:48:49 +01:00
• aaf935eec6
  Merge pull request #15 from beatriceo/call Beatrice Olivera 2018-08-28 18:27:02 +01:00
• 4b1636ee78 added routes for call #15 Beatrice Olivera 2018-08-28 18:26:33 +01:00
• 3dfbc577b6
  Merge pull request #14 from beatriceo/redirection Beatrice Olivera 2018-08-28 17:42:02 +01:00
• 89976ad750 edited routes to redirect to correct pages upon sign up #14 Beatrice Olivera 2018-08-28 17:41:10 +01:00
• f8d05dd449
  Merge pull request #13 from beatriceo/front-end Beatrice Olivera 2018-08-28 17:25:25 +01:00
• e7b4b74c00
  Merge branch 'master' into front-end #13 Beatrice Olivera 2018-08-28 17:21:12 +01:00
• e98199d013 finished basic contacts page #12 Beatrice Olivera 2018-08-28 17:18:58 +01:00
• 9f23553256
  Merge pull request #11 from beatriceo/devise-fix Ethan1710 2018-08-28 15:45:02 +01:00
• 3d44276105 bugfix devise #11 Ethan Fraenkel 2018-08-28 15:46:15 +02:00
• fb0143a20b
  Merge pull request #10 from beatriceo/landing_page Ethan1710 2018-08-28 15:35:27 +01:00
• 8745a42b00
  Merge pull request #9 from beatriceo/login-page Ethan1710 2018-08-28 15:34:59 +01:00
• daec345b50 done landing_page #10 Benjamin Myara 2018-08-28 15:00:54 +01:00
• 45a6f19a9c added title to tabbar #9 Ethan Fraenkel 2018-08-28 15:36:05 +02:00
• 6f091b96aa done with login signup Ethan Fraenkel 2018-08-28 15:34:52 +02:00
• e73df2ed65
  Merge pull request #8 from beatriceo/front-end Beatrice Olivera 2018-08-28 13:49:11 +01:00
• acc13310f6 changed pages/home to pages/call #8 Beatrice Olivera 2018-08-28 13:48:32 +01:00
• d12fa2a46b
  Merge pull request #7 from beatriceo/frontend-setup Beatrice Olivera 2018-08-28 12:38:41 +01:00
• b44963ee4c Changed colors setup bootstrap #7 Ethan Fraenkel 2018-08-28 12:39:45 +02:00
• 4e1d0559ed
  Merge pull request #6 from beatriceo/redis-fix Beatrice Olivera 2018-08-28 11:31:53 +01:00
• 970c38ce68 interpolated redis url #6 Beatrice Olivera 2018-08-28 11:31:24 +01:00
• d419ad9201
  Merge pull request #5 from beatriceo/redis-env Beatrice Olivera 2018-08-28 11:24:01 +01:00
• a820f417c1 hid key #5 Beatrice Olivera 2018-08-28 11:23:39 +01:00
• 644b6cb411 Basic Navbar working Ethan Fraenkel 2018-08-28 12:18:23 +02:00
• a80497139d
  Merge pull request #4 from beatriceo/redis-fix Beatrice Olivera 2018-08-28 11:05:55 +01:00
• bc42c644e6 added redis url #4 Beatrice Olivera 2018-08-28 11:05:27 +01:00