BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,057 Commits 13 Branches 260 Tags 1.1 GiB
48f1441e52
Commit Graph

4914 Commits

Author SHA1 Message Date
perroned
48f1441e52 Fixes bug where share window won't close last step of instructions via toolbar button 2017-02-09 22:04:13 +00:00
perroned
92026952e5 Fixes issue with second window after ext installation 2017-02-09 19:35:09 +00:00
perroned
0c64b0e0dc Removes comments from config xml template 2017-02-08 21:27:53 +00:00
perroned
e1ed43d343 Adds some deskshare strings and labels 2017-02-08 21:07:23 +00:00
Anton Georgiev
384a97f3b9 fix labels + tooltips for viewer in webrtc deskshare 2017-02-08 19:06:24 +00:00
Anton Georgiev
5f5ecaee04 fix labels + tooltips; todo revisit "stop" button 2017-02-08 19:06:09 +00:00
Dan A. Perrone
37cce892fc fixes issue of sending empty video 2017-02-07 10:18:52 -05:00
perroned
1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
 2017-02-02 15:27:08 +00:00
Anton Georgiev
573284d1d2 Merge pull request #3599 from antobinary/fix-android 
recover redirect to html5 client on android device
 2017-01-24 15:52:36 -05:00
Anton Georgiev
e55705b043 recover redirect to html5 client on android device 2017-01-24 15:34:52 -05:00
Chad Pilkey
cab1bebeac fix typo in closed caption locale string 2017-01-24 12:35:56 -05:00
Chad Pilkey
0ea6387b19 remove screenshare webrtc options from config.xml because they aren't fully implemented 2017-01-23 14:32:58 -05:00
Anton Georgiev
00fb1added log line was displaying null values 2017-01-20 16:56:48 -05:00
Anton Georgiev
5b78da8ed0 fix incorrect screenshare stream uri on reconnect 2017-01-20 16:55:34 -05:00
Anton Georgiev
6110797486 Merge pull request #3580 from antobinary/fix-many-webcam 
Filter out webcam duplicates. Also fixes #3572
 2017-01-20 11:25:23 -05:00
Anton Georgiev
9c3df8d3e5 improve detection of duplicates + cleanup 2017-01-19 18:09:26 -05:00
Anton Georgiev
98300d77e2 allow view for 2+ webcams per user. improve duplicate detection 2017-01-19 17:36:58 -05:00
Chad Pilkey
e5d06f9f23 add custom poll option text to locales 2017-01-19 14:58:17 -05:00
Chad Pilkey
1319c58b98 add defined widths for screenshare help text 2017-01-11 18:28:08 -05:00
Chad Pilkey
4e01f909e8 add new ScreensharePublish and ScreenshareView windows to the layout exclusion 2017-01-11 17:50:02 -05:00
Chad Pilkey
d3ab07e401 change screenshare help lines from Label to Text so they wrap 2017-01-09 17:26:24 -05:00
Richard Alam
90af5151c1 - fix locale causing build to fail 2017-01-09 16:52:55 +00:00
Richard Alam
73eae41999 - updating locales 2017-01-09 15:49:28 +00:00
Chad Pilkey
f11345f24a Merge pull request #3537 from riadvice/webcams-only-for-moderator 
Webcams only for moderator
 2017-01-04 13:14:46 -05:00
Ghazi Triki
2e3bb4754d Fixed typos in webcamsOnlyForModerator naming. 2017-01-04 19:02:17 +01:00
Ghazi Triki
92c1205e9c Handling "webcamsOnlyForModerator" meeting option in the client. 2017-01-02 17:06:16 +01:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Richard Alam
af169be2db Merge branch 'master' into support-svc2-in-screen-share 2016-12-19 16:41:40 +00: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
Chad Pilkey
e7348d884e hack for Chrome 56+ to try and work around transparent Flash blocking 2016-12-15 18:28:33 -05: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
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
Pedro Beschorner Marin
14b480c8ce Working on avoiding reconnection when ending a meeting by API call 2016-12-09 20:33:03 +00:00
Richard Alam
02066ef3ee Merge pull request #3501 from pedrobmarin/video-auto-start 
Video auto start
 2016-12-08 13:39:56 -02:00
Richard Alam
dc30aa6304 Merge pull request #3496 from pedrobmarin/priority-video-resolution 
Priority video will care about its own aspect ratio when positioning …
 2016-12-08 11:18:13 -02:00
Pedro Beschorner Marin
4938505781 Better handling no-webcam scenario 2016-12-07 17:53:18 +00:00
Pedro Beschorner Marin
e554b87780 Fixed videoconf autoStart-skipCheck race condition 2016-12-07 13:13:11 +00:00
Pedro Beschorner Marin
f0ed824aea Priority video will care about its own aspect ratio when positioning itself at videodock 2016-12-06 19:22:33 +00:00
Pedro Beschorner Marin
c4598c280a Fixed some layout lock issues: 
- New attendees get their layout locked;
- Double clicking top overlay won't maximize a window; and
- Right clicking won't show minimize/maximize options.
 2016-12-06 18:23:25 +00:00
perroned
0a12d2f6ce Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/startup/server/EventQueue.js
 2016-12-01 19:19:58 +00:00
perroned
fc995d25bf Adds conference command support 2016-12-01 17:00:15 +00:00
Richard Alam
145c40a459 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-11-24 23:00:56 +00:00
Richard Alam
c26a29ff41 - try to use svc2 codec 2016-11-24 22:54:28 +00:00
Richard Alam
5f56a4edcd - close port testing connection 2016-11-22 20:46:29 +00:00
Richard Alam
224114c83d Merge pull request #3424 from riadvice/logout-on-stop-recording 
New option to logout user when he stops the recording
 2016-11-22 13:40:41 -05:00
Ghazi Triki
59a0f4665d Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection. 2016-11-21 18:01:22 +01:00
Chad Pilkey
cb77ada8f2 fix exception in webrtc error logging 2016-11-15 18:26:36 -05:00
Richard Alam
27eac5faec Merge pull request #3462 from ritzalam/improve-client-logging 
- create only one netConnection to bbb-apps. Not re-create one when …
 2016-11-11 17:40:35 -05:00