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

22121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
096323ba2d
Merge pull request #5940 from Tainan404/compability-to-npm 
Compability to npm
 2018-08-03 11:21:52 -04:00
Anton Georgiev
993bf61d24
Merge pull request #5956 from antobinary/adjust-meeting-structure 
Adjusted meeting model structure to correctly add a meeting
 2018-08-03 10:37:42 -04:00
Anton Georgiev
7c132c149a Added missing properties in Meeting 2018-08-03 14:19:05 +00:00
Tainan Felipe
ece61e9918
Merge branch 'master' into compability-to-npm 2018-08-02 17:27:23 -03:00
Tainan Felipe
0330f14f42 Merge branch 'master' into compability-to-npm 2018-08-02 17:24:49 -03:00
Tainan Felipe
db2b5ec05c use stable version the reconnecting-websocket package 2018-08-02 17:15:19 -03:00
Chad Pilkey
e66c82a688
Merge pull request #5952 from ritzalam/display-guest-button-on-authed-non-guest-users 
- display guest waiting button in users list window when authed non-…
 2018-08-01 16:06:57 -04:00
Richard Alam
11b4d64208 - display guest waiting button in users list window when authed non-guest joins. 
Set enableGuestUI="true" and guestSoftMode="true" in config.xml
 2018-08-01 12:49:36 -07:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods 
Presentation pods support
 2018-08-01 13:49:32 -04:00
Anton Georgiev
dce2e6c860
Merge pull request #5949 from riadvice/pull-from-2.0 
Pull from 2.0 and 2.2-dev
 2018-08-01 13:41:53 -04:00
Ghazi Triki
9b86ae072d Delete unwanted function call. 2018-08-01 18:35:29 +01:00
Ghazi Triki
ab750addf8 Fix merge issues in WhiteboardCanvas.as 2018-08-01 18:24:27 +01:00
Oswaldo Acauan
0ed7c45ec0 Fix Acl for cursor/annotations for pods 2018-08-01 10:21:44 -03:00
Oswaldo Acauan
3c2bb8748a Fix Acl for cursor/annotations for pods 2018-08-01 10:21:33 -03:00
Anton Georgiev
35c497a6ad
Update index_html5_vs_flash.html 2018-08-01 07:50:25 -04:00
Ghazi Triki
26d56d34d6 Fix merge conflicts. 2018-08-01 12:14:55 +01:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
Tainan Felipe
05d04b63cb remove jquery-json.js 2018-07-31 09:00:27 -03:00
Anton Georgiev
b99cc7f413
Merge pull request #5923 from MaximKhlobystov/client-logging-error 
Fix for the client logging error
 2018-07-30 14:10:16 -04:00
Maxim Khlobystov
57f8d66b35 Setting the correct validUser value. 2018-07-30 14:02:46 -04:00
Richard Alam
59a08d7da6
Merge pull request #5939 from ritzalam/user-inactivity-timer 
- fix tracking of user inactivity
 2018-07-30 13:55:36 -04:00
Richard Alam
a57f389f4a - fix tracking of user inactivity 2018-07-30 10:53:29 -07:00
Richard Alam
fcd5c2a135
Merge pull request #5938 from ritzalam/user-inactivity-timer 
- try to make comment clearer on purpose of value setting
 2018-07-30 13:01:46 -04:00
Richard Alam
119d1aecf3 - try to make comment clearer on purpose of value setting 2018-07-30 10:00:12 -07:00
Tainan Felipe
80eeea2ac6 remove bbblogger 2018-07-30 13:57:06 -03:00
Richard Alam
56ed76ccd6 Merge branch 'riadvice-user-inactivity-refactor' into v2.2-dev 2018-07-30 09:36:12 -07:00
Richard Alam
804d1e2cc6 - change the log to be specific on what the method does. 2018-07-30 09:34:32 -07:00
Anton Georgiev
53e5a64885
Merge pull request #5928 from lfzawacki/the-new-adventures-of-logger-and-loggy 
Additions to video, listen-only and screenshare logging
 2018-07-30 11:53:33 -04:00
Richard Alam
524ee0dd2a Merge branch 'user-inactivity-refactor' of https://github.com/riadvice/bigbluebutton into riadvice-user-inactivity-refactor 2018-07-30 07:11:32 -07:00
Anton Georgiev
475b6d8def
Merge pull request #5918 from Tainan404/issue-5672 
Fix ios scrolling when drawing
 2018-07-30 06:51:18 -04:00
Ghazi Triki
dffeeb8daf Update user last activity time when he sends a message. 2018-07-30 11:43:19 +01:00
Fred Dixon
7db3091fa5
Merge pull request #5931 from prlanzarin/listen-only-permission-fix 
[HTML5] Attempt to fix SIP.js listen only permission problems
 2018-07-28 18:53:28 -04:00
Fred Dixon
a90b9b882e
Merge pull request #5933 from prlanzarin/screenshare-fix-recording 
Fixed screenshare recording
 2018-07-28 18:52:49 -04:00
Fred Dixon
0c0e8999f1
Merge pull request #5907 from riadvice/v2.0-bbb-conf 
Clean bbb-conf from unused variables
 2018-07-28 10:41:45 -04:00
Fred Dixon
ebf4968253
Merge pull request #5875 from fcecagno/fix-webhooks 
Fix webhooks
 2018-07-28 09:36:32 -04:00
Tainan Felipe
0c2866ccfb move ReconnectingWebSocket to npm packages 2018-07-27 17:42:45 -03:00
Ghazi Triki
ffb6d6e593 Update last user activity depending on his actions. 2018-07-27 19:00:15 +01:00
Ghazi Triki
7da3fb3c37 Fix inactive user check rule using time. 2018-07-27 17:48:39 +01:00
Ghazi Triki
c21f5aabad Add new parameter userInactivityThresholdInMinutes to bigbluebutton.properties and improve inactive user warning and eject from server. 2018-07-27 15:02:04 +01:00
Oswaldo Acauan
ce021e6776 Fix race condition 2018-07-27 10:18:45 -03:00
prlanzarin
dc0230ef1f Removed deprecated finally statements from mcs-core 2018-07-26 21:06:34 +00:00
prlanzarin
b52c705d68 Refactored SFU recording path handling and fixed WebRTC screenshare recordings 2018-07-26 21:06:26 +00:00
Oswaldo Acauan
0f94c334e0 Fix cursor while mwb is on 2018-07-26 16:35:38 -03:00
Lucas Fialho Zawacki
f8d8e5c8e5 Prettier obj logs in audio, video, screenshare 2018-07-26 16:29:55 -03:00
Oswaldo Acauan
9eb53234df Fix remote cursors not showing 2018-07-26 16:23:52 -03:00
Oswaldo Acauan
047b23fd4a Fix for annotations 2018-07-26 16:15:02 -03:00
Oswaldo Acauan
adb34da217 Fixes for cursor 2018-07-26 16:05:55 -03:00
Anton Georgiev
e7d6a515ec
Merge pull request #5930 from Tainan404/unused-dependencies 
Remove unused packges
 2018-07-26 14:52:58 -04:00
prlanzarin
4393d19877 Modified SIP.js to only resolve local description on ICE completion 2018-07-26 18:52:49 +00:00
Lucas Fialho Zawacki
e36c494252 Use newer logging calls for video,audio,screenshare 2018-07-26 15:26:56 -03:00