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

21961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jfederico
b9f52a2438 Script for fixing meeting tag in recordings migrated from BBB 1.0 and before 2018-09-20 14:23:29 +00: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
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
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
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
Ghazi Triki
dffeeb8daf Update user last activity time when he sends a message. 2018-07-30 11:43:19 +01: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
Ghazi Triki
5472456e90 Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg and UserActivitySignResponseMsg. 2018-07-25 21:14:38 +01:00
Richard Alam
a5d18d7729
Merge pull request #5919 from ritzalam/fix-ask-moderator-check 
- make authenticated non-moderators wait if gues policy is ASK_MODER…
 2018-07-25 10:36:11 -04:00
Richard Alam
85385206fd - make authenticated non-moderators wait if gues policy is ASK_MODERATOR 2018-07-25 07:06:55 -07:00
Ghazi Triki
0f93649f99 Update UserInactivityWindow style. 2018-07-25 11:40:37 +01:00
Ghazi Triki
5b34f93daa Move user inactivity configuration parameters to bigbluebutton-web application and rename them to userInactivityLogoutTimerInMinutes and userInactivityResponseDelayInMinutes. 2018-07-25 10:56:55 +01:00
Calvin Walton
5f3b09e83d Merge branch 'revert-mconf-branding' into v2.2-dev 2018-07-24 13:19:54 -04:00
Calvin Walton
66ce4cde02 Revert copyright info in recording to say BigBlueButton 2018-07-24 13:18:18 -04:00
Calvin Walton
c43863eff6 Merge branch 'playback-async-requests' of https://github.com/fcecagno/bigbluebutton into v2.2-dev 2018-07-24 09:56:50 -04:00
Richard Alam
aef2fe577d
Merge pull request #5889 from kepstin/turn-stun-fix 
Fix comments in turn-stun-servers.xml (v2.2-dev)
 2018-07-20 15:39:17 -04:00
Richard Alam
3c5015d6d0
Merge pull request #5888 from ritzalam/recording-timer-updates 
- send only recording timer updates to clients when the meeting is r…
 2018-07-20 15:38:25 -04:00
Richard Alam
a58e4ed44d
Merge pull request #5886 from riadvice/pdf-export-improve 
Fix multi-line PDF text export
 2018-07-20 15:38:05 -04:00
Calvin Walton
4faf1c9231 Fix comments in turn-stun-servers.xml 
When some code was being moved around, it looks like a bad sed command got run
on this file which made the comments/documentation unreadable.

Revert to the previous version of the file.
 2018-07-20 11:21:46 -04:00
Ghazi Triki
16a23a7ea3 Improve multi-line text PDF export. 2018-07-20 16:21:24 +01:00
Richard Alam
b2c2705223 - send only recording timer updates to clients when the meeting is recording 2018-07-20 08:20:41 -07:00
Richard Alam
4f5e42f022
Merge pull request #5885 from ritzalam/fix-ask-moderator-check 
- only allow moderators in when guest policy is ASK_MODERATOR
 2018-07-20 10:41:50 -04:00
Richard Alam
bfe9075e55 - only allow moderators in when guest policy is ASK_MODERATOR 2018-07-20 07:40:29 -07:00
Chad Pilkey
7a5ba9c036
Merge pull request #5883 from capilkey/copyable-user-info 
Copyable user info
 2018-07-19 16:56:27 -04:00
Chad Pilkey
9798da5b6e allow selection of user directory values 2018-07-19 13:52:13 -07:00
Chad Pilkey
98d0a4e0dc make the ShortcutHelpWindow a little shorter 2018-07-19 13:51:52 -07:00
Chad Pilkey
05f83b9063
Merge pull request #5879 from capilkey/fix-userlist-gear-visiblity 
Correct the userlist gear visibility
 2018-07-19 00:58:12 -04:00
Chad Pilkey
a27774ee86 don't always show userlist gear to moderators 2018-07-18 21:55:40 -07:00
Chad Pilkey
37967514b5
Merge pull request #5876 from capilkey/load-from-CDN 
Use png of slide for export with annotations
 2018-07-18 15:12:50 -04:00
Chad Pilkey
d2295095b8 refactored the annotations in presentation export with annotations and improved the pencil 2018-07-18 12:05:28 -07:00
Richard Alam
0f51609212
Merge pull request #5877 from ritzalam/fix-pres-download-issue 
Fix pres download issue
 2018-07-18 15:01:43 -04:00
Richard Alam
4e215249a5 - allow downloading of presentations with utf-8 filenames 2018-07-18 11:52:11 -07:00
Richard Alam
223f8d99d8 - fix issue where file aside from pdf can be made downloadable 2018-07-18 11:51:00 -07:00
Chad Pilkey
f18485481c use png of slide for export with annotations 2018-07-17 17:12:00 -07:00
Richard Alam
278514c0b1
Merge pull request #5874 from ritzalam/fix-user-eject-on-rtmps 
- when using rtmps, firefox and ie clients doesn't log out when the …
 2018-07-17 18:34:24 -04:00
Richard Alam
1f25cd7079 - when using rtmps, firefox and ie clients doesn't log out when the user is ejected from the meeting. 
The client relies on the connection being closed by red5 when the user is ejected which triggers
   the client to logout. Hoever, when using rtmps, the connection doesn't close therefore not logging
   out the client.
 2018-07-17 14:31:45 -07:00
Richard Alam
ad0dbfdbbd
Merge pull request #5873 from ritzalam/allow-authed-and-mods-in-when-policy-is-ask 
- when guestPolicy is ASK_MODERATOR, only apply policy to viewer and…
 2018-07-17 13:59:06 -04:00
Richard Alam
f33996d038 - when guestPolicy is ASK_MODERATOR, only apply policy to viewer and guest 2018-07-17 10:56:45 -07:00
Chad Pilkey
166a8d9cea
Merge pull request #5871 from capilkey/fix-userlist-renderer 
Fixes for 2.2 merge issues in the client
 2018-07-16 18:49:00 -04:00
Chad Pilkey
b9600364dc fix user's guest state in client when processing join 2018-07-16 15:41:47 -07:00
Chad Pilkey
648573fe86 remove moderatorUnmute option from config.xml because they can never unmute 2018-07-16 15:38:33 -07:00
Chad Pilkey
d27391dd9e fix inconsistency with the user list mic img/btn 2018-07-16 15:37:56 -07:00
Richard Alam
0bc643e71c
Merge pull request #5868 from ritzalam/disable-vertx-msging 
- disable experimental way to send messsages from client to server
 2018-07-16 17:26:29 -04:00