Commit Graph

14018 Commits

Author SHA1 Message Date
Richard Alam
af169be2db Merge branch 'master' into support-svc2-in-screen-share 2016-12-19 16:41:40 +00:00
Oswaldo Acauan
d1c4116aee Add missing semicolon 2016-12-19 11:35:33 +00:00
Oswaldo Acauan
66478d0c55 Fix merge conflicts 2016-12-19 11:34:41 +00:00
KDSBrowne
533eb29d58 cleaned up 2016-12-18 17:55:32 -08:00
KDSBrowne
e730d7241f removed unused line 2016-12-18 17:13:37 -08:00
KDSBrowne
90e63b0b54 moved this.setState 2016-12-18 17:00:42 -08:00
Fred Dixon
e8eeb9908e Merge pull request #3526 from antobinary/client-logging-changes
Client logging changes - add json structure to some additional logs
2016-12-16 14:53:33 -05:00
Anton Georgiev
de374c4ffc add json struct to more logs 2016-12-16 19:19:19 +00:00
KDSBrowne
06ef0d09fb moved initialization to constructor 2016-12-16 09:01:40 -08:00
KDSBrowne
83ba4d3d12 removed unused import 2016-12-16 08:58:38 -08:00
KDSBrowne
a6c4713e1a removed unused import 2016-12-16 08:56:17 -08:00
Anton Georgiev
6fe33fb349 switch to logging in json form 2016-12-16 16:50:11 +00:00
Fred Dixon
fdf349effe Merge pull request #3523 from ffdixon/update-landing-page
Updated landingage page for 1.1-beta
2016-12-16 11:16:42 -05:00
Fred Dixon
54f2ec9b9d Updated landingage page for 1.1-beta 2016-12-16 10:14:24 -06:00
Anton Georgiev
0ea28a8ecd Merge pull request #3516 from KDSBrowne/Hide-VideoButton-Temp
Hide Cam button Temporarily
2016-12-16 10:42:15 -05:00
Richard Alam
31d3524b1d Merge pull request #3522 from antobinary/fix-double-webcams
update bbb-client-check for 1.1(-beta)
2016-12-16 13:36:20 -02:00
KDSBrowne
80ede2cd87 removed empty function in chat component 2016-12-16 06:42:07 -08:00
Anton Georgiev
3122f4c4b4 update for 1.1: drop port check, rename deskShare 2016-12-16 14:41:04 +00:00
Fred Dixon
57f77d6bbf Merge pull request #3519 from capilkey/fix-chrome-56-flash
Try and work around transparent Flash blocking
2016-12-15 18:49:42 -05:00
Chad Pilkey
e7348d884e hack for Chrome 56+ to try and work around transparent Flash blocking 2016-12-15 18:28:33 -05:00
KDSBrowne
8795cbac6a removed duplicate Participants heading 2016-12-15 12:03:54 -08:00
KDSBrowne
f7710913f0 update button icon to white 2016-12-15 11:34:01 -08:00
KDSBrowne
811e5c97c2 added basic tool tip for testing 2016-12-15 10:29:19 -08:00
KDSBrowne
959208f86e align chevron vertically with text to right 2016-12-15 09:29:17 -08:00
KDSBrowne
4a4df3512a removed bold font style 2016-12-15 08:28:45 -08:00
KDSBrowne
5d328560a1 added suggestion 2016-12-15 08:15:04 -08:00
KDSBrowne
632ffbb752 removed css for button 2016-12-15 08:10:31 -08:00
KDSBrowne
b6d3a759fb removed chat X icon 2016-12-15 08:05:05 -08:00
Anton Georgiev
2df9f6e10b Merge pull request #3479 from JaeeunCho/scroll_v1
HTML5-clent scroll on chat
2016-12-15 10:31:32 -05:00
KDSBrowne
a4fc8440ea cleaned up 2016-12-14 16:02:08 -08:00
KDSBrowne
d2d0720889 undo a previous css change 2016-12-14 15:46:24 -08:00
KDSBrowne
c932ef7637 added close button to private chat 2016-12-14 13:21:39 -08:00
Richard Alam
a86b0eadbc Merge pull request #3515 from antobinary/fix-double-webcams
Fix double display of webcams on reconnect #3250
2016-12-14 18:33:58 -02:00
Anton Georgiev
388d3ec86f fix double display of webcams on reconnect 2016-12-14 19:59:30 +00:00
KDSBrowne
ae70ce1116 temporarily hide the Cam button 2016-12-14 11:55:35 -08:00
KDSBrowne
c29bbf870f removed unused line 2016-12-14 09:43:07 -08:00
KDSBrowne
0ddde5200d removed unused line 2016-12-14 09:39:58 -08:00
KDSBrowne
83091a969d changed behaviour of fontSizeName bug 2016-12-14 08:42:25 -08:00
KDSBrowne
4bdfb54b4e fixed lint issues 2016-12-14 07:57:54 -08:00
KDSBrowne
adcb46cb41 cleaned up code 2016-12-14 07:50:35 -08:00
KDSBrowne
6512b7be8a fixed bug, removed console logs 2016-12-14 07:40:13 -08:00
Anton Georgiev
1a6062d329 Merge pull request #3497 from mmarangoni/html5-stun-audio
Action bar & join audio improvements
2016-12-14 10:01:52 -05:00
KDSBrowne
eb7f58e2bb fixed issues, ready to set up save 2016-12-13 20:04:26 -08:00
KDSBrowne
38b9227f04 improved application settings - incomplete 2016-12-13 19:40:32 -08:00
Richard Alam
c87f0f559a Merge pull request #3513 from pedrobmarin/end-meeting-disconnection
Working on avoiding reconnection when ending a meeting by API call
2016-12-13 16:39:25 -02:00
Matthew Marangoni
0daa2798d5 updated with master/fixed merge conflicts 2016-12-09 12:39:48 -08:00
Pedro Beschorner Marin
14b480c8ce Working on avoiding reconnection when ending a meeting by API call 2016-12-09 20:33:03 +00:00
Matthew Marangoni
7e68432c29 Merge remote-tracking branch 'upstream/master' into html5-stun-audio 2016-12-09 12:30:33 -08:00
Chad Pilkey
3446790432 Merge pull request #3507 from riadvice/air-mobile-dpi
Updates to the Flex 4 applications
2016-12-09 15:06:02 -05:00
Ghazi Triki
6aef6e65f0 Implemented MainView style. 2016-12-09 15:44:01 -02:00