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

13236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
6a68f10a39 Merge branch 'jfederico-bbb-web_fix-configXML' 2016-08-02 15:23:52 +00:00
Richard Alam
8a57a7c75c Merge branch 'bbb-web_fix-configXML' of https://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-configXML 2016-08-02 15:19:03 +00:00
Richard Alam
efe02bec62 Merge pull request #3248 from ritzalam/update-jws-jars 
Update jws jars
 2016-08-02 11:13:33 -04:00
Richard Alam
5906a0fc7b Cleanup 
Removed old jar files.
 2016-08-02 15:10:18 +00:00
Richard Alam
61c6a56d13 Update jws ffmpeg lib jars 
Updated ffmpeg lib jars, specifically linux jars as the old ones were broken.
 2016-08-02 15:00:51 +00:00
Calvin Walton
d4e7605f42 RnP: Fix use of deprecated IO#lines in logging functions 2016-08-02 10:58:42 -04:00
Calvin Walton
2b8d7a9858 Merge remote-tracking branch 'origin/master' into recording-captions 2016-08-02 10:49:05 -04:00
Anton Georgiev
bde7f5a313 Merge pull request #3247 from oswaldoacauan/user-kick 
[HTML5] Add handlers for when the current user is kicked
 2016-07-29 16:12:58 -04:00
Anton Georgiev
33393790b3 we still need this module (for the moment) 2016-07-29 19:04:38 +00:00
Anton Georgiev
89e48ebd48 add missing part for adding webrtc support to module screenshare 2016-07-29 18:51:08 +00:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
Oswaldo Acauan
6f9c4219ad Fix typo 2016-07-28 19:57:42 +00:00
Oswaldo Acauan
afe1a66e02 Fix conflicts and merge master 2016-07-28 19:50:44 +00:00
Oswaldo Acauan
da70b92c9d Add missing files 2016-07-28 19:49:16 +00:00
Oswaldo Acauan
b8e4a2692c Add handlers for kick 2016-07-28 19:48:26 +00:00
jfederico
7c0b0a3856 bbb-web: Log error message on invalid 2016-07-28 15:46:44 -04:00
Oleksandr Zhurbenko
79c06588e3 Updated update_caption_owner_message 
So that owner_id could be updated in  multiple objects
 2016-07-28 11:53:13 -07:00
Oleksandr Zhurbenko
1fd07f9265 Updated indirect dependencies 2016-07-27 15:47:08 -07:00
mmarangoni
efaf05a27e fixed up/down/space/enter keypress events 2016-07-27 15:33:32 -07:00
Oleksandr Zhurbenko
d510907179 Upgraded Meteor to 1.4 2016-07-27 14:50:35 -07:00
Fred Dixon
efdad7d4ed Merge pull request #3244 from ffdixon/update-bbb-conf 
Updated checks in bbb-conf for https
 2016-07-27 17:41:58 -03:00
Fred Dixon
8dd4810f29 Updated checks in bbb-conf for https 2016-07-27 16:39:31 -04:00
perroned
8c7fdc0036 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/prod/lib/verto_extension.js
 2016-07-27 19:32:01 +00:00
Richard Alam
6911b62a11 Merge pull request #3241 from riadvice/breakout-rooms-recording 
Breakout rooms recording
 2016-07-27 15:09:33 -04:00
Anton Georgiev
0f0d51df5c Merge pull request #3243 from antobinary/fix-server-issue 
html5client:Add httpS flag in config instead of detecting prod vs dev env
 2016-07-27 13:41:51 -04:00
Anton Georgiev
a1fde6ae12 add httpS flag in config instead of detecting prod vs dev env 2016-07-27 16:36:33 +00:00
Oleksandr Zhurbenko
ed51c99803 Adjusted view to the new CC data format 2016-07-26 16:05:22 -07:00
Lajellu
bd46e8c2ff adds new icons 2016-07-26 14:28:58 -07:00
Lajellu
1ead9ced59 adds presentation controls 2016-07-26 13:56:43 -07:00
Anton Georgiev
e4434b09ad Merge pull request #3242 from antobinary/fix-server-issue 
Handle https connections for slide dimension calculator
 2016-07-26 15:10:42 -04:00
Oswaldo Acauan
2c93c41fc5 Update handler payload check 2016-07-26 18:50:18 +00:00
Anton Georgiev
860916efc1 refactor 2 cases 2016-07-26 17:47:36 +00:00
Anton Georgiev
3e070872cf fix issue with slide calc under https 2016-07-26 17:33:35 +00:00
Ghazi Triki
2638e6c9c1 Merge branch 'master' into breakout-rooms-recording 
# Conflicts:
#	akka-bbb-apps/src/main/resources/application.conf
 2016-07-26 17:27:50 +01:00
Ghazi Triki
60463ee8be Put join breakout room before listen to breakout room button. 2016-07-26 17:23:13 +01:00
Anton Georgiev
a47f159b4b Merge pull request #3239 from perroned/fix-verto-console-error 
Fixes unreachable code error
 2016-07-26 10:16:48 -04:00
Oleksandr Zhurbenko
6c7cb5a65b Changed the way we store captions on the initial history retrieving 2016-07-25 16:33:33 -07:00
Ghazi Triki
a62db6c8b4 Breakout rooms uses password from the parent room. 2016-07-25 23:20:31 +01:00
Ghazi Triki
6a6dce2e68 Listen to breakout room is only visible when the user joins the voice conference. 2016-07-25 23:07:13 +01:00
Ghazi Triki
6d0450b64a Update record ComboBox position in BreakoutRoomSettings.mxml 2016-07-25 23:03:42 +01:00
Ghazi Triki
7d2cef9b9f Added recording options for breakout rooms. 2016-07-25 22:31:04 +01:00
perroned
9111a445ad Removes function, removes console error 2016-07-25 21:00:41 +00:00
Fred Dixon
0c0f055427 Merge pull request #3238 from ffdixon/update-bbb-conf-https 
bbb-conf updates bbb-apps-screenshare and bbb-apps-akka with https URLs
 2016-07-25 13:53:37 -03:00
Fred Dixon
4a446146e1 bbb-conf updates bbb-apps-screenshare and bbb-apps-akka with https URLs 2016-07-25 12:51:37 -04:00
Fred Dixon
400392c560 Merge pull request #3237 from ffdixon/remove-newline-from-application-conf 
Removed Windows line feeds from application.conf
 2016-07-24 21:58:15 -06:00
Fred Dixon
7a75773680 Removed Windows line feeds from application.conf 2016-07-24 23:56:26 -04:00
jfederico
a43ae327d0 bbb-demo: Fix for issue on demo12 (configXML). Join doesnt work when using http 2016-07-24 12:27:14 -04:00
Oleksandr Zhurbenko
fd0247d719 Injected initial component for the closed-captions 2016-07-22 17:12:31 -07:00
jfederico
3763b0da24 bbb-web: Fix for issue #3148 2016-07-22 16:01:28 -04:00
perroned
a22b21f61b Merge remote-tracking branch 'anton/fix-webrtc-deskshare' into join-components-with-skeleton 2016-07-22 19:36:19 +00:00