paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Commit Graph

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