BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,857 Commits 13 Branches 260 Tags 1.1 GiB
9a77ace223
Commit Graph

13857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajellu
9a77ace223 Merge remote-tracking branch 'upstream/master' into completeEmojiIcons 2016-12-21 09:00:12 -08:00
Anton Georgiev
9ba6a2c5ae Merge pull request #3529 from Lajellu/hideUnusableSlideCtrls 
HTML5 - comment out unimplemented presenter slide control UI
 2016-12-21 11:43:43 -05:00
Anton Georgiev
69f3571101 Merge pull request #3524 from KDSBrowne/UI-Update-Changes01 
UI Changes Update
 2016-12-21 11:10:27 -05:00
Lajellu
8389d2b2e3 HTML5 - comment out Join Video to fix DOM positioning 
The reason there was so much space between `Join Audio` and `Status` was that `Join Video` was in between. Join Video was removed
to fix this positioning.

Leave Audio and Join Video icons are being hidden, which still holds the space for that component in the DOM, but does not show
it.
`Join Audio` should not be commented out because the icon is displayed at certain times.
`Join Video` can be commented out for now for UI purposes and put back when it's implemented.
 2016-12-20 12:27:16 -08:00
Lajellu
95903abe7c HTML5 - comment out unimplemented presenter slide control UI 2016-12-20 10:33:14 -08:00
Lajellu
b3f1d9f804 HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues 2016-12-20 10:06:01 -08:00
Lajellu
98db4c8eec HTML5 - fixes merge conflicts bw master and this branch 2016-12-20 09:18:24 -08:00
Anton Georgiev
0c6197c539 Merge pull request #3506 from oswaldoacauan/audio-stream-volume 
[HTML5] Mic Volume and Device Selector
 2016-12-19 14:13:07 -05:00
Oswaldo Acauan
8ebb41de3a Change default constraints for the audio-stream-volume component 2016-12-19 17:15:48 +00:00
Oswaldo Acauan
37942569fb Prevent blank device selector comobos 2016-12-19 17:11:43 +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
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
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
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
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
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
Fred Dixon
859faa03f3 Merge pull request #3512 from ffdixon/update3-bbb-conf 
Refactored the checks in bbb-conf detecting proper startup
 2016-12-09 12:23:13 -05:00
Fred Dixon
5a8e936a8e Refactored the checks in bbb-conf detecting proper startup 2016-12-09 11:22:07 -06:00
Ghazi Triki
ed3db7b20a Fixed xhdpi by setting application-dpi to 320 and imporved MainView style. 2016-12-09 14:21:14 -02:00
Fred Dixon
d9887113fb Merge pull request #3508 from fcecagno/check-libs 
not rely on bbb-client libraries to build (and package) bbb-client-check
 2016-12-09 10:15:46 -05:00
Fred Dixon
36ac4806c1 Merge pull request #3509 from fcecagno/bbb-conf-stop 
improve logic to stop services on bbb-conf; stop also bbb-webhooks and libreoffice
 2016-12-09 10:15:38 -05:00
Anton Georgiev
7f6d28a52f Merge pull request #3510 from antobinary/adjust-name 
html5client change label "Version:" to "Client Build:"
 2016-12-09 09:53:20 -05:00