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

3946 Commits

Author SHA1 Message Date
Anton Georgiev
27a41753f9 hooked on error pages via Session 2018-10-12 17:05:30 +00:00
Bobak Oftadeh
21b84a5303 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-12 09:17:19 -07:00
KDSBrowne
9b42940d63 move polling options for viewer 2018-10-12 15:05:53 +00:00
Bobak Oftadeh
52aa4fd3c1 Mute meeting functionality implemented 2018-10-11 14:27:56 -07:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
prlanzarin
7f3d3c0d32 Fixed reconnecting webcam viewers and session overlaps 2018-10-11 18:23:26 +00:00
Maxim Khlobystov
97ebd02595
Merge pull request #6090 from jfsiebel/ini-configuration-file 
Remove settings and use yml file
 2018-10-11 13:03:48 -04:00
KDSBrowne
bc5592ef67 update css styles 2018-10-11 03:20:58 +00:00
KDSBrowne
a955a7c0f1 replace createContainer with withTracker 2018-10-11 03:01:59 +00:00
KDSBrowne
dc8bd0345d edit live-result style values 2018-10-10 19:04:09 +00:00
KDSBrowne
5654f08b43 clean up code 2018-10-10 18:25:35 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
João Francisco Siebel
74dfa52071 handle system messages on main public chat 2018-10-08 11:22:45 -03:00
Anton Georgiev
497db01167 added meteor/session; userList without router 2018-10-05 19:23:16 +00:00
KDSBrowne
eefef1c207 remove the need for using findDOMNode() 2018-10-05 13:43:27 +00:00
Bobak Oftadeh
e5ae59908c Altered lock viewers label 2018-10-04 15:16:09 -07:00
prlanzarin
2741022cb2 Updated kurento-utils WebRTC calls, added permission request on listen only for safari 
Also fixed a resource leak on listen only fallback and transitioned the SFU listen only from a tag-based approach to MediaStream
 2018-10-03 18:39:55 +00:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
KDSBrowne
7f2d8138ba replace for loop with range() and map() 2018-10-03 14:39:23 +00:00
KDSBrowne
0f277a66d1 replace if condition in map() with filter() 2018-10-03 11:51:04 +00:00
KDSBrowne
28d46b7ca8 change formatted message id's / replace reduce with map 2018-10-03 03:24:34 +00:00
KDSBrowne
c2e785b8c4 add poll max custom fields to config 2018-10-02 23:59:45 +00:00
KDSBrowne
26404c87f7 remove button color type 'primary-outlined' 2018-10-02 23:08:32 +00:00
KDSBrowne
8c60d03ccc add comment to explain regex 2018-10-02 20:45:41 +00:00
KDSBrowne
b241b93b8a replace indexOf() with includes() 2018-10-02 20:30:32 +00:00
Anton Georgiev
308beb874c Auth logged in 2018-10-02 19:53:13 +00:00
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +00:00
Tainan Felipe
ac09d4e69a Add user list item and panel 2018-10-02 10:48:12 -03:00
Tainan Felipe
380b8b77e5 add intl messages 2018-09-28 15:09:15 -03:00
Tainan Felipe
cfd2e3f94b Add create breakout rooms modal 2018-09-28 11:42:07 -03:00
KDSBrowne
b9736e9c08 fix poll results not displaying correctly for presenter 2018-09-28 14:40:53 +00:00
KDSBrowne
e1440de236 fix private chat not working 2018-09-27 16:27:05 +00:00
Bobak Oftadeh
f4a6947313 Moved isModerator check to the user-options container 2018-09-26 09:04:53 -07:00
Tainan Felipe
33655682f0 change modal overlay color for client consistency 2018-09-25 17:29:54 -03:00
Anton Georgiev
faac6a0d5d maintain array of user roles so they are unique 2018-09-25 19:24:43 +00:00
Tainan Felipe
adbf0f0098 Add breakout room button 2018-09-25 14:03:09 -03:00
KDSBrowne
491f841401 prevent user access to poll panel after presenter is lost 2018-09-25 16:54:07 +00:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
Tainan Felipe
9e496a0c93 Add fit to width feature 2018-09-25 09:47:49 -03:00
KDSBrowne
cf23293e10 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-09-25 12:44:38 +00:00
João Francisco Siebel
531f739f12 Merge remote-tracking branch 'upstream/master' into ini-configuration-file 2018-09-25 09:42:24 -03:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings 
Custom user settings
 2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
João Francisco Siebel
a445e0d2e5 make whiteboard tools list configurable 2018-09-21 16:42:39 -03:00
João Francisco Siebel
3c3a5ae59a implement multiUserPenOnly configuration 2018-09-21 13:42:00 -03:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
João Francisco Siebel
b832921be2 fix settings list 2018-09-19 17:34:23 -03:00
João Francisco Siebel
bb58a3fde6 let server handle parameters 2018-09-19 17:32:17 -03:00
Anton Georgiev
8c0394f52e
Merge pull request #6085 from oswaldoacauan/fix-missing-stuff-on-meeting-removal 
Fix not clearing pods and token when removing a meeting
 2018-09-19 14:45:02 -04:00
Anton Georgiev
7ca66965da
Merge pull request #6086 from oswaldoacauan/fix-6012 
Fix fuzzy chat font rendering.
 2018-09-19 14:40:32 -04:00
Anton Georgiev
8df901e0bf
Merge pull request #6087 from Tainan404/zoom-implementation 
Zoom call only for presenter
 2018-09-19 14:15:41 -04:00
Tainan Felipe
61c4c62e54 Zoom call only for presenter 2018-09-19 15:13:09 -03:00
Oswaldo Acauan
750f1bc35a Fix fuzzy chat font rendering. Closes #6012 2018-09-19 14:57:39 -03:00
Oswaldo Acauan
1c12b380a2 Fix not clearing pods and token when removing a meeting 2018-09-19 14:48:15 -03:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window 
Extended the Width of the Chat Area
 2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
Tainan Felipe
7d202ada62 Remove comment 2018-09-19 09:55:47 -03:00
Tainan Felipe
24e0fc55cd Remove unused code 2018-09-19 09:09:45 -03:00
Lucas Zawacki
1d38dc4f2e Make it so that cameras use the full space of the video window 2018-09-18 13:58:29 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -03:00
Tainan Felipe
2d045b415c Put the hand by default in mobile 2018-09-18 11:16:11 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
ab75ffdddd Add pinch and double-tap zoom 2018-09-17 15:02:52 -03:00
João Francisco Siebel
e750ceb0a1 make a single makeCall in auth 2018-09-17 14:05:39 -03:00
João Francisco Siebel
ebe4b83a10 remove unnecessary comments 2018-09-14 15:01:24 -03:00
João Francisco Siebel
ebad6cf6a4 remove debug 2018-09-14 14:53:29 -03:00
KDSBrowne
226adbe254 make poll menu render 2018-09-14 17:50:18 +00:00
KDSBrowne
589a9eb1fd add btn to toggle poll url 2018-09-14 16:29:19 +00:00
Anton Georgiev
f2092114e0
Merge pull request #6061 from BobakOftadeh/Userlist-spacing 
Fixed locked user to have the same height as a default user
 2018-09-13 15:25:06 -04:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
Bobak Oftadeh
5c3f6202b3 Fixed locked user to have the same height as a default user 2018-09-11 13:42:36 -07:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Anton Georgiev
885539bb2a
Merge pull request #6057 from prlanzarin/listen-only-fallback 
Add SIP.js listen only as fallback when SFU is enabled
 2018-09-11 13:50:10 -04:00
prlanzarin
fe9835b5f7 Add SIP.js listen only as fallback when SFU is enabled 2018-09-11 17:09:29 +00:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Anton Georgiev
cae1cc2190
Merge pull request #6052 from BobakOftadeh/publish-fix 
Only propagate necessary information to client
 2018-09-10 15:00:54 -04:00
Bobak Oftadeh
053e0f93fc Fixed issue where unnecessary information was being published to the client. 2018-09-10 08:34:25 -07:00
Anton Georgiev
7508f1d4f8
Merge pull request #6034 from KDSBrowne/02-iphone-polling-fix 
Fix poll answers not being displayed on mobile safari
 2018-09-10 10:08:51 -04:00
KDSBrowne
5f31deee11 use mq() instead of @media 2018-09-09 05:23:33 +00:00
Anton Georgiev
68e02efe80 add missing Meeting const in addUser.js 2018-09-06 22:33:32 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Anton Georgiev
681422dc61 fix listenOnly being interpreted as muted audio (client side) 2018-09-06 18:44:59 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00
Chad Pilkey
625e351af8 fetch fullInfo from Auth every time instead of caching 2018-09-04 13:28:04 -07:00
Chad Pilkey
c58d71533f
Merge pull request #6007 from fcecagno/multi-container-docker 
Multi container docker
 2018-09-04 15:30:30 -04:00
Tainan Felipe
e501b9e5cc Implement pan zoom 2018-09-04 14:37:36 -03:00
Anton Georgiev
73fd896fb0
Merge pull request #6032 from Tainan404/fix-safary-animaiton 
Split animation to own span to run in safari.
 2018-09-04 13:14:29 -04:00
Anton Georgiev
49c0e7b9b1
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2 
Better handling of screensharing ice connection state errors.
 2018-09-04 13:14:08 -04:00
Anton Georgiev
8e553ab0c6
Merge pull request #5855 from musickiper/discard-cur-annotation-via-right-click 
Add fuctionality for discard current annotation via right-click
 2018-09-04 11:13:00 -04:00
KDSBrowne
bf38c36b71 fix polling answer position in safari on mobile 2018-08-31 17:14:00 +00:00
Tainan Felipe
1f6b959efc Split animation and connection to own span to run in safari 2018-08-31 13:58:47 -03:00
Maxim Khlobystov
5825b635ba Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-30 16:07:52 -04:00
prlanzarin
dc767d9bdb Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown 2018-08-30 02:41:02 +00:00
Tainan Felipe
92ecd8d39d Fix misspelling 2018-08-29 17:24:44 -03:00
Tainan Felipe
ce6f1699f7 Add flash comment explaining mistery number 2018-08-29 17:20:42 -03:00
Anton Georgiev
065d932b64
Merge pull request #6020 from prlanzarin/autoplay-listen-only 
Resolving listen only stream correctly
 2018-08-29 16:10:52 -04:00
prlanzarin
b4052f7052 Resolving listen only stream correctly 2018-08-29 19:59:33 +00:00
Bobak Oftadeh
cacc5e1920 Extended the width of the chat area 2018-08-29 12:57:36 -07:00
Anton Georgiev
afd97601c5
Merge pull request #6019 from prlanzarin/autoplay-listen-only 
Improvements to Safari/Chrome autoplay policy
 2018-08-29 15:44:05 -04:00
prlanzarin
a7bfb985d3 Improvements to Safari/Chrome autoplay policies with placeholder buffer on audiocontext and bogus audio + upstarting audio tag as muted 2018-08-29 19:12:34 +00:00
Anton Georgiev
157ce58f04
Merge pull request #6018 from antobinary/lock-public-chat 
[HTML5] Comply with lock settings for chat
 2018-08-29 13:22:49 -04:00
Anton Georgiev
e03eccab2e combine isViewer and isLocked by using existing property from mapUser 2018-08-29 17:21:39 +00:00
Anton Georgiev
e756ce1548 comply to lock settings for chat 2018-08-29 16:00:53 +00:00
Tainan Felipe
742229e88f Fix lint errors 2018-08-28 16:30:37 -03:00
Tainan Felipe
70e29725ee Fix zoom display alignment 2018-08-28 14:14:02 -03:00
Tainan Felipe
05a5e911c9 remove class and fix NaN bug 2018-08-28 14:14:01 -03:00
Tainan Felipe
9f6ed96b36 add zoom functions to component 2018-08-28 14:14:01 -03:00
Tainan Felipe
2815955236 state shared between presentation and overlay 2018-08-28 14:14:01 -03:00
Tainan Felipe
7c082c608a Add zoom tooll and styles 2018-08-28 14:14:01 -03:00
Tainan Felipe
257b4cc8ac port flash code to js and implement initial work in zoom 2018-08-28 14:14:01 -03:00
Tainan Felipe
25834dd4f8 zoom calc based in flash 2018-08-28 14:13:18 -03:00
Maxim Khlobystov
82a69fb902 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-28 12:49:06 -04:00
prlanzarin
4f99173d38 Using default input stream for SFU listne only 2018-08-28 15:24:06 +00:00
prlanzarin
a9b98b6f7f Handling fake audio tag play exception, reduced timeout to match sound length and removed permission fallback from audio 2018-08-27 20:56:51 +00:00
Felipe Cecagno
62311387b8 more changes to configure redis using environment variables 2018-08-24 17:15:47 -03:00
Diego Sampaio
6fbb577a9f Fix redis connection using private settings 2018-08-24 17:15:47 -03:00
BobakOftadeh
2b61c00748 Prevented the presenataion title from pushing the dropdown menu off-screen (#5994) 
The dropdown menu is no longer pushed off screen on Firefox. #5972
 2018-08-23 14:29:28 -03:00
James Jung
4db30fe741 Delete useless logics, and make codes more readable 2018-08-23 13:07:56 -04:00
James Jung
3dd288c0ca Remove loop inside "addAnnotationToDiscardedList" 2018-08-23 12:35:26 -04:00
Maxim Khlobystov
fc3e46493e Linting. 2018-08-23 11:49:16 -04:00
James Jung
b0a93e5377 Move the placement of undoAnnotation from service.js to draw-listeners 
Make discardedList be updated on not only the side of the sender but also the side of receiver too
Add logic for preventing the size of discardedList getting bigger unlimitedly
 2018-08-23 11:42:34 -04:00
Maxim Khlobystov
242200ac91 Replaced Ice with ICE in strings. 2018-08-22 14:51:25 -04:00
Anton Georgiev
aed8577606 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into log-config-restructure 2018-08-22 18:30:02 +00:00
Anton Georgiev
6da18cd52d made clientLog structure easier to edit via script 2018-08-22 18:25:43 +00:00
Maxim Khlobystov
d67aba6c8a Listening to ice connection failures when screensharing. 2018-08-22 14:10:08 -04:00
Anton Georgiev
778e22d42f
Merge pull request #5991 from prlanzarin/sfu-cam-target-bitrate 
[HTML5] Added target bitrate option for WebRTC screenshare and webcam
 2018-08-21 10:02:56 -04:00
Anton Georgiev
666a59232e
Merge pull request #5993 from KDSBrowne/5980-chat-input-font-size 
Adjust chat input font size
 2018-08-21 09:52:56 -04:00
KDSBrowne
e349417474 revert changes to persist emoji status on reload 2018-08-21 13:44:59 +00:00
KDSBrowne
93ee7c20bd fix flash users not showing in html5 2018-08-21 12:56:07 +00:00
KDSBrowne
8df5df1322 increase chat text size 2018-08-21 12:47:05 +00:00
prlanzarin
ad353a6e84 Fixed isVideoBroadcasting check to return a bool 2018-08-20 19:44:38 +00:00
prlanzarin
9f9e248de7 Made webcam constraints configurable, removed fps limitations and resolution floor 
Also fixed handlePlayStop and stopWebRTCPeer exceptions
 2018-08-20 18:08:10 +00:00
Anton Georgiev
a09ef26166
Merge pull request #5983 from jfsiebel/akka-add-sync-voice-user 
Add SyncGetVoiceUsersRespMsg message in akka
 2018-08-20 13:12:37 -04:00
Anton Georgiev
a0a46e5338 Merge branch 'akka-add-sync-voice-user' of github.com:jfsiebel/bigbluebutton into test-5983 2018-08-20 15:44:23 +00:00
KDSBrowne
26cc1979b6 prevent status of current user being reset on page reload 2018-08-20 14:15:23 +00:00
KDSBrowne
b67aecc3aa make userlist emoji sort work 2018-08-17 15:01:41 +00:00
James Jung
86a0440703 Remove useless and error causing codes 2018-08-16 13:15:12 -04:00
Joao Siebel
c0b33de410 re-use function 2018-08-16 09:21:13 -03:00
Joao Siebel
04631f5e6e remove 🐛 2018-08-15 14:31:07 -03:00
Anton Georgiev
6459b84c83 Pulled HTML5 locales aug 15; Fix for locale switch edge case (#5984) 2018-08-15 13:58:23 -03:00
Joao Siebel
445d710b2a handle SyncGetVoiceUsersRespMsg on meteor 2018-08-15 13:45:00 -03:00
KDSBrowne
dfa09244c5 use JSX spread attributes 2018-08-15 15:02:48 +00:00
KDSBrowne
c0e1aeeff8 move position of clear status option in user-dropdown menu 2018-08-15 14:55:22 +00:00
KDSBrowne
29bcbea923 rename to alerts / missing from #5973 2018-08-15 02:35:58 +00:00
James Jung
bac2854b77 Add extra comments to make code more readable 2018-08-14 16:00:15 -04:00
KDSBrowne
fed85fba48 Update font size of chat input to match the text display in the chat area 2018-08-14 19:16:11 +00:00
Anton Georgiev
91b21540fa
Merge pull request #5970 from prlanzarin/html5-guest-always-accept 
Added support for ALWAYS_ACCEPT guest policy in the HTML5 client
 2018-08-14 15:00:06 -04:00
James Jung
dc71cd0382 Move filter logic from service method to draw-stream listener, and makes code more readable 2018-08-14 14:47:09 -04:00
Anton Georgiev
cd851fcdbc
Merge pull request #5978 from antobinary/logs-work 
Logging additional cases in HTML5 client
 2018-08-14 13:42:34 -04:00
Anton Georgiev
823629cb30 add log when user fully joined and subscribed to collections 2018-08-14 17:29:03 +00:00
Anton Georgiev
67b5257e8d
Merge pull request #5977 from Tainan404/issue-5496 
fix toolbars losing border radius when overlap the presentation.
 2018-08-14 13:14:39 -04:00
Anton Georgiev
1e8a4cf1e7
Merge pull request #5973 from KDSBrowne/5963-notifications-rename 
Rename 'push notifications' to 'alerts'
 2018-08-14 13:13:31 -04:00
Anton Georgiev
f83374491b
Merge pull request #5971 from MaximKhlobystov/ice-connection-state-errors 
Better handling of video ice connection state errors.
 2018-08-14 13:12:12 -04:00
Anton Georgiev
aee7dfe70c
Merge pull request #5955 from KDSBrowne/5910-cam-audioIndicator-inconsistency 
Fix audio status icon inconsistent size on webcams
 2018-08-14 11:43:43 -04:00
Maxim Khlobystov
bfe48dc918 Uncommented the line that has been commented out for debugging purposes. 2018-08-14 10:40:52 -04:00
Tainan Felipe
71bd889446 fix toolbars losing border radius when overlap the presentation 2018-08-14 10:30:46 -03:00
Maxim Khlobystov
ed85f109a0 Listening to closed ice connection state in case an error doesn't result in failed state. 2018-08-13 16:26:45 -04:00
Anton Georgiev
7444e61d4d Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into logs-work 2018-08-13 20:05:07 +00:00
Bobak Oftadeh
88de0a4bbf Fixed clientInfo JSON parsing error 2018-08-13 19:53:20 +00:00
Anton Georgiev
ed173b813a fix linting 2018-08-13 19:52:44 +00:00
James Jung
3f8a10897a Initialize a list of discarded annotations, filter out discarded annotations inside AnnotationsStreamer added handler 2018-08-13 15:40:47 -04:00
KDSBrowne
d7b6d027a2 change name of formatted string id's 2018-08-13 19:16:22 +00:00
Anton Georgiev
8092fa1304
Merge pull request #5968 from BobakOftadeh/add-help-button 
Added help button to drop-down list
 2018-08-13 15:02:26 -04:00
Anton Georgiev
ca873cd6da
Merge pull request #5839 from KDSBrowne/5782-move-set-status 
Move set status menu to user item dropdown
 2018-08-13 15:00:04 -04:00
KDSBrowne
6c51f2e7e9 clean up code 2018-08-13 18:47:22 +00:00
KDSBrowne
d8982843fd remove UserAction wrapper 2018-08-13 16:27:56 +00:00
KDSBrowne
5d4f9c8981 change parameter name to something more meaningful 2018-08-13 15:05:15 +00:00
Maxim Khlobystov
fdf0615d04 Fixing linter errors in the video-provider component. 2018-08-12 18:40:53 -04:00
Maxim Khlobystov
cf1de23629 Properly handling ice connection state errors. 2018-08-12 18:39:39 -04:00
Bobak Oftadeh
55eb076dd9 Improved implementation of showHelpButton 2018-08-10 12:35:14 -07:00
prlanzarin
71307e7b26 Added support for ALWAYS_ACCEPT guest policy in the HTML5 client 2018-08-10 19:30:17 +00:00
Anton Georgiev
ff3b19a3bf add log on successful and unsuccessful login 2018-08-10 17:51:12 +00:00
Bobak Oftadeh
4d0b8418db Added help icon 2018-08-10 08:29:52 -07:00
Anton Georgiev
373bdae362
Merge pull request #5929 from jfsiebel/add-html5-group-chat-support 
Update chat messages in HTML5 to use new group chat messages
 2018-08-10 10:54:02 -04:00
Bobak Oftadeh
9feb47a1ca Option to disable the help button added 2018-08-09 15:40:52 -07:00
Bobak Oftadeh
7b9de769a7 Added help button to the drop-down list 2018-08-09 14:08:16 -07:00
KDSBrowne
fecbee16b5 change folder / component names & localized strings 2018-08-09 17:02:18 +00:00
Anton Georgiev
4ee01b5caa add log when client loads fully 2018-08-08 21:20:55 +00:00
Joao Siebel
22b9dda230 handle SyncGetGroupChatsRespMsg and SyncGetGroupChatMsgsRespMsg messages 2018-08-08 13:42:45 -03:00
KDSBrowne
f8026b1b9a toggle screenshare btn color 2018-08-07 23:10:24 +00:00
KDSBrowne
155b36f929 add desktop unshare icon 2018-08-07 23:02:11 +00:00
João Francisco Siebel
5a76eec168 remove chat collection and fix group chat messages subscription 2018-08-06 09:05:07 -03:00
KDSBrowne
12f5fffa93 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5909-toggle-screenshare-icon 2018-08-05 23:47:16 +00:00
Anton Georgiev
56b9e515c4
Merge pull request #5959 from BobakOftadeh/indicator-performance-boost 
Pulse animation performance improved
 2018-08-03 16:34:56 -04:00
Bobak Oftadeh
ef8c0226fe Pulse animation performance improved 2018-08-03 12:11:46 -07:00
Anton Georgiev
096323ba2d
Merge pull request #5940 from Tainan404/compability-to-npm 
Compability to npm
 2018-08-03 11:21:52 -04:00
Joao Siebel
18109fd792 fix problem when sender starts a private chat 2018-08-03 11:51:36 -03: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
Joao Siebel
32516bfbbf implement welcome message and clear message in group chat messages 2018-08-03 11:03:16 -03:00
KDSBrowne
fc6d4a582f fix webcams audio state indicator sizing 2018-08-03 02:53:46 +00:00
KDSBrowne
f07599c4e5 make desk-share icon toggle / using temp icon 2018-08-03 01:34:48 +00:00
Tainan Felipe
ece61e9918
Merge branch 'master' into compability-to-npm 2018-08-02 17:27:23 -03:00
Anton Georgiev
4daedd4cdc Locale selection without reload on route change. credits: @oswaldoacauan (#5953) 
Resolves #5668 resurfacing
 2018-08-02 16:23:11 -03:00
Joao Siebel
372150d766 Merge branch 'add-html5-group-chat-support' of github.com:jfsiebel/bigbluebutton into add-html5-group-chat-support 2018-08-02 14:23:55 -03:00
Joao Siebel
140968571e handle clear public chat for group chat 2018-08-02 14:23:20 -03:00
KDSBrowne
524991b26d make btn functionality work for different locales 2018-08-02 14:40:48 +00:00
James Jung
d95fff40f1 Remove a global let, improve global variable names' consistency and make codes inside service clean up 2018-08-01 16:15:52 -04:00
Anton Georgiev
9d38bb6ca7
Merge pull request #5951 from antobinary/logClient-2 
Add check for logClient to obtain meetingId for media calls
 2018-08-01 15:10:06 -04:00
KDSBrowne
2f4d8dd571 add suggested change 2018-08-01 18:26:16 +00:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support 2018-08-01 14:24:00 -04:00
Anton Georgiev
62f640bd7c
Merge pull request #5948 from BobakOftadeh/client-logger-adjustments 
Implemented adjustments to logClient
 2018-08-01 14:21:48 -04: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
1fdbfb6284
Merge pull request #5950 from MaximKhlobystov/browser-detection-fix 
Handling the case when browser detection package fails.
 2018-08-01 13:48:34 -04:00
KDSBrowne
7068764bd6 fix trigger not closing menu 2018-08-01 17:47:03 +00:00
Joao Siebel
e3ec9853b3 change public chat id for unread messages search 2018-08-01 14:03:12 -03:00
KDSBrowne
56ee504bdd prevent console error 2018-08-01 16:50:11 +00:00
Anton Georgiev
e64dbda4ce add check for logClient to handle media calls 2018-08-01 16:06:49 +00:00
KDSBrowne
2993e44a2c remove unneeded callback refs 2018-08-01 16:04:28 +00:00
KDSBrowne
b379f8e204 change variable name 2018-08-01 15:52:22 +00:00
KDSBrowne
165f3eaa8a improve solution so new props dont need to be passed to dropdown component 2018-08-01 15:44:27 +00:00
KDSBrowne
78c81880db Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5782-move-set-status 2018-08-01 15:43:31 +00:00
Maxim Khlobystov
aa8c656d7d Defaulting to desktop when browser detection package fails. 2018-08-01 11:10:21 -04: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
Bobak Oftadeh
78bcec7553 Implemented adjustments to logClient 2018-07-31 15:28:03 -07:00
Joao Siebel
03389a8adc fix unread message counter for private chats 2018-07-31 14:13:36 -03:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00: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
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
Anton Georgiev
475b6d8def
Merge pull request #5918 from Tainan404/issue-5672 
Fix ios scrolling when drawing
 2018-07-30 06:51:18 -04:00
Tainan Felipe
0c2866ccfb move ReconnectingWebSocket to npm packages 2018-07-27 17:42:45 -03:00
James Jung
006ddf64cd Correct variables 2018-07-27 14:35:16 -04:00
James Jung
c73bebbdc3 Change wrong variable names, and make use Meteor setting's value than use literal for checking annotation's status 2018-07-27 11:06:49 -04:00
João Francisco Siebel
655483576f fix unread messages counter on public chat and remove some old chat configurations 2018-07-27 10:44:21 -03:00
Oswaldo Acauan
ce021e6776 Fix race condition 2018-07-27 10:18:45 -03: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
Lucas Fialho Zawacki
e36c494252 Use newer logging calls for video,audio,screenshare 2018-07-26 15:26:56 -03:00
James Jung
46a382a80a Separate the logic for discarding the current annotation from each draw listener component to the service of whiteboard 2018-07-26 14:06:16 -04:00
Joao Siebel
d8391f450b use group chat messages in html5 client 2018-07-26 11:56:26 -03:00
Lucas Fialho Zawacki
df22f43b11 Add window.Logger to kurento-extension 2018-07-25 19:08:35 -03:00
Lucas Fialho Zawacki
2fc85f75e1 New Logging format for listenonly audio and screenshare 2018-07-25 19:08:24 -03:00
Lucas Fialho Zawacki
b667c53590 Get more detailed logs from the video component 2018-07-25 18:53:12 -03:00
Maxim Khlobystov
e041718e55 Code cleanup 2018-07-25 15:59:14 -04:00
Maxim Khlobystov
249e79660c Prevented the client logging error when Auth.fullInfo is not provided. 2018-07-25 14:13:22 -04:00
prlanzarin
7d70ff371c Fixed webkit thing with a candid hack 2018-07-25 16:55:13 +00:00
prlanzarin
6e87e9c67b Initial fake audio for webkit autoplay fix 2018-07-25 15:14:38 +00:00
Tainan Felipe
83d5617109 Fix ios scrolling when drawing 2018-07-25 11:08:56 -03:00
Anton Georgiev
ac581a97fb
Merge branch 'v2.0.x-release' into propTypes-screen-share 2018-07-25 09:52:56 -04:00
Bobak Oftadeh
1e28d8089e Added propTypes to screenshare variables 2018-07-24 14:55:00 -07:00
Anton Georgiev
5e750bb3c6 resolve conflicts for 5822 2018-07-24 21:10:30 +00:00
Anton Georgiev
75e72e9e72 resolve linting issues 2018-07-24 21:09:17 +00:00
Anton Georgiev
9f87a4f344 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into test-5822 2018-07-24 21:08:28 +00:00
Oswaldo Acauan
b7823c406c Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods 2018-07-24 17:20:37 -03:00
Maxim Khlobystov
89725fa461
Merge pull request #5905 from Tainan404/v2-fix-intl 
Fix intl id being showing.
 2018-07-24 14:03:13 -04:00
Anton Georgiev
e4edb9f196
Merge pull request #5894 from prlanzarin/sfu-error-handling-3 
SFU error handling part 3
 2018-07-24 13:45:08 -04:00
Anton Georgiev
682f753432
Merge pull request #5890 from BobakOftadeh/screenshare-button-moved 
Desktop share button moved to the action bar component
 2018-07-24 13:41:58 -04:00
Bobak Oftadeh
95e62b42e6 Moved screen share check to a variable 2018-07-24 09:46:30 -07:00
Anton Georgiev
cf98f09027
Merge pull request #5901 from KDSBrowne/01-bug-fixes 
Fix upload modal and cam unshare bug
 2018-07-24 09:30:44 -04:00
James Jung
204921e043 Make code more readable, and make clicking the mouse right button not to draw annotation 
Seperate the function 'contextMenuHandler' of drawing listeners into the service for reusability

Call the 'UndoAnnotation' method from Whiteboard-toolbar's service to use inside Whiteboard-overlay's draw listeners,
rather than initializing the same method inside Whiteboard-overlay's service to use

Make drawing annotations using the mouse right button inactive
 2018-07-23 17:25:06 -04:00
Tainan Felipe
3cd9f1f381 Fix audio lock setting not applied 2018-07-23 15:54:49 -03:00
Anton Georgiev
ddbb2a64dc Merge branch 'custom-parameters' of github.com:lfzawacki/bigbluebutton into test-5822 2018-07-23 18:33:32 +00:00
Tainan Felipe
1c04aacb24 fix intl showing intl ids 2018-07-23 13:46:53 -03:00
KDSBrowne
37c9599a70 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 01-bug-fixes 2018-07-23 15:37:28 +00:00
Anton Georgiev
8b0ec94405 remove duplicate import causing app to crash 2018-07-23 15:06:25 +00:00
Anton Georgiev
5dc3fe82c2
Merge branch 'v2.0.x-release' into custom-parameters 2018-07-23 10:29:29 -04:00
KDSBrowne
1f7ff24b63 add return to prevent cam unsharing on first route change 2018-07-22 17:45:33 +00:00
KDSBrowne
c502027427 use withModalMounter to prevent the modal re-opening 2018-07-22 17:45:14 +00:00
James Jung
df17e36462 Change the functionality for discard current annottation via right-click, based on its purpose 
The annotaion can be discarded using the mouse right button, only when it is being drawn
 2018-07-20 16:17:41 -04:00
James Jung
cf96835280 Change the functionality for discard current annottation via right-click, based on its purpose 
The annotaion can be discarded using the mouse right button, only when it is being drawn
 2018-07-20 16:05:24 -04:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Bobak Oftadeh
e1fbc5059b Desktop share button moved to the action bar component 2018-07-20 10:07:10 -07:00
Bobak Oftadeh
0db93d35b9 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-20 09:42:11 -07:00
James Jung
03cabb7c80 Change the 'contentMenuHandler' method of every whiteboard-draw-listener component to static 
This is for preventing Lint shows the error which a class method is implemented without using 'this' inside
 2018-07-20 12:05:06 -04:00
Anton Georgiev
13691f0df2
Merge pull request #5880 from Tainan404/issue-5852 
Allow guest user join via html5 client
 2018-07-20 11:28:39 -04:00
Tainan Felipe
06b4504876 Fix recording not update 2018-07-20 09:43:09 -03:00
Lucas Fialho Zawacki
8e023d57c9 Ids for share video and share screen buttons 2018-07-19 17:45:03 -03:00
Lucas Fialho Zawacki
ffcf35b7da react key for screenshare video area 2018-07-19 17:44:51 -03:00
Lucas Fialho Zawacki
125e90582c Add processing of userdata parameters and correct bug while processing metadata 2018-07-19 17:44:20 -03:00
Tainan Felipe
193edcb8fd remove comment 2018-07-19 15:12:04 -03:00
Anton Georgiev
488f6c04e1
Merge pull request #5865 from Tainan404/issue-5675 
Add user when moderator join via audio only in breakout room
 2018-07-19 14:09:54 -04:00
Anton Georgiev
daf5cea886
Merge pull request #5878 from MaximKhlobystov/presentation-upload-current 
Presentation selected to be uploaded (or the first one of them) becomes current.
 2018-07-19 13:39:26 -04:00
Bobak Oftadeh
6d2d701127 Altered client logger functions 2018-07-19 09:21:26 -07:00
Tainan Felipe
005310d22a Allow guest user join via html5 client 2018-07-19 09:46:44 -03:00
Maxim Khlobystov
3d0b41c166 Pre-select one of the presentations that are about to be uploaded. 2018-07-18 14:47:40 -04:00
Anton Georgiev
94d3d52a77
Merge pull request #5821 from musickiper/fix-navbar-problem-on-iphone 
Adjust Navbar not to cover on the top of any list in mobile view
 2018-07-18 13:59:42 -04:00
James Jung
617446f89b Change the overflow setting of the public chat to make the navbar not cover the public chat save button 2018-07-18 13:42:02 -04:00
Bobak Oftadeh
8119e10167 Updated how targets are added to the client logger 2018-07-18 09:04:40 -07:00
James Jung
696399fc3a Fix the header not to overlap the options list of public chat on iphone 2018-07-17 14:59:44 -04:00
James Jung
4e1bba7ba5 Add functionality for discard current annotation via right-click 2018-07-16 17:03:24 -04:00
James Jung
c40136c3ca Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into discard-cur-annotation-via-right-click 2018-07-16 15:03:23 -04:00
James Jung
40d16ca520 Add functionality for discard current annotation via right-click 2018-07-16 14:45:19 -04:00
Tainan Felipe
5b84652fc4 Add speak icon when is voice only 2018-07-16 15:17:49 -03:00
Tainan Felipe
42a2bfff58 Add user when voice only user join in the meeting 2018-07-16 14:03:01 -03:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
 2018-07-16 16:08:38 +01:00
Bobak Oftadeh
5a2d2934fa Updated settings for client-logger 2018-07-13 12:44:22 -07:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Anton Georgiev
f50cf96100
Merge pull request #5840 from Tainan404/issue-5833 
Comply audio lock setting.
 2018-07-12 14:38:19 -04:00
KDSBrowne
ce085aa74b adjust icon size / line-height 2018-07-12 18:01:14 +00:00
KDSBrowne
006b5cfa40 add arrow icon to end of set status option 2018-07-12 17:42:51 +00:00
Anton Georgiev
97fb0e9b4f
Merge pull request #5827 from Tainan404/issue-5562 
Allow html5 user to join in any breakout room
 2018-07-12 12:21:14 -04:00
Tainan Felipe
54aa1cddc3 Add line break 2018-07-12 13:19:54 -03:00
Anton Georgiev
2e3c071419
Merge pull request #5812 from musickiper/tweak-usrMenu-for-all-text 
Allow longer menu labels (think DE) to spread over several rows within the menu
 2018-07-12 11:39:46 -04:00
Tainan Felipe
80681142e7 check lockSettigProps existence 2018-07-12 11:35:37 -03:00
KDSBrowne
aae5cfbd92 fix reported bugs / impliment suggested changes 2018-07-11 20:08:22 +00:00
James Jung
9f0a7ea08a chg mute/unmute icon 2018-07-11 15:13:59 -04:00
James Jung
7344d2fc01 Add fuctionality for discard current annotation via right-click 2018-07-11 14:51:40 -04:00
Anton Georgiev
466bcf054a
Merge pull request #5854 from prlanzarin/video-attach-response-fixes 
Trying to fix WebRTC video tag attachment
 2018-07-11 13:41:09 -04:00
James Jung
26a5522203 Add fuctionality for discard current annotation via right-click 2018-07-11 13:11:54 -04:00
prlanzarin
7fb2f063dd Trying to fix video tag attachment race condition and correctly checking peer availability on server messages 2018-07-11 16:32:19 +00:00
Anton Georgiev
80715cc133
Merge pull request #5851 from antobinary/guests 
Disable HTML5 waiting screen for guest approve
 2018-07-11 09:53:18 -04:00
Anton Georgiev
4dbe681a46 disable HTML5 waiting screen for guest approve 2018-07-11 12:46:44 +00:00
KDSBrowne
788dc3e7c0 fix clearing status from another user bug 2018-07-10 17:47:08 +00:00
James Jung
7b286df2f5 Adjust the list view looks better 2018-07-10 13:01:17 -04:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn 
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
 2018-07-10 11:24:37 -04:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Tainan Felipe
e424970018 Comply audio lock setting 2018-07-09 16:23:16 -03:00
KDSBrowne
6a4a3ee160 remove emoji service functions from action-bar 2018-07-09 17:08:19 +00:00
KDSBrowne
341d19fa52 remove old way of setting emoji status 2018-07-09 16:14:07 +00:00
KDSBrowne
8647f766aa wrap conditions in parentheses to improve visibility 2018-07-09 16:04:24 +00:00
Tainan Felipe
f8b683a611 Tiny fixes 2018-07-09 09:13:11 -03:00
KDSBrowne
1fd11cfb2f remove window click event listener 2018-07-09 03:51:22 +00:00
KDSBrowne
1e513b4798 use formatted strings for emoji menu options / edit variable names 2018-07-08 23:52:14 +00:00
KDSBrowne
7896ab9fa8 fix menu functionality bugs / add status options 2018-07-08 18:53:52 +00:00
Anton Georgiev
b50dda8566
Merge pull request #5232 from oswaldoacauan/fix-4987 
Implement basic GroupChat messages
 2018-07-06 16:45:14 -04:00
Tainan Felipe
b6aa7e5136 remove breakout URL of nav bar and remove code of service 2018-07-06 14:46:07 -03:00
Tainan Felipe
4e87260b59 add free join interface 2018-07-06 14:38:14 -03:00
Tainan Felipe
425c5da4ee allow get all meetings when is free join breakout room 2018-07-06 14:07:08 -03:00
Tainan Felipe
ccd045dbef add Method for request Breakout join URL 2018-07-06 14:00:44 -03:00
JamesJung
7350c1f81b Don't push chat notification if chat is open (#5773) 
* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Make the public/private chat notification not to be pushed when public/private chat is opened

* Change variable name to more make sense

* Refactoring codes to make functions more readable

* Remove useless condition code

* Remove useless variable and condition
 2018-07-06 11:23:47 -03:00
Tainan Felipe
9756517392 fix white blocks when hover toast 2018-07-06 09:08:50 -03:00
James Jung
3187cdd3c5 Adjust Navbar not to cover on the top of any list in mobile view 2018-07-05 17:09:43 -04:00
James Jung
430872e506 Adjust Navbar not to cover on the top of any list in mobile view 2018-07-05 17:04:18 -04:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
James Jung
09b604f954 tweak user menu to allow all text to be displayed 2018-07-04 14:41:05 -04:00
Maxim Khlobystov
5bdc1bb88c
Merge pull request #5805 from MaximKhlobystov/move-current-user-to-top 
Move current user to the top of the users list.
 2018-07-04 14:11:18 -04:00
Maxim Khlobystov
fefec54832 Typo. 2018-07-04 13:51:59 -04:00
Maxim Khlobystov
0902bb33e6 Cleanup: removed unnecessary condition. 2018-07-04 13:48:58 -04:00
Maxim Khlobystov
6b9159ad28 Used sorting by whether the user is current or not. 2018-07-04 13:27:15 -04:00
Tainan Felipe
957a2ef02c Tiny fixes in chat and notifications (#5807) 
* don't notify old messages when user reload the client

* fix chat height
 2018-07-04 14:12:08 -03:00
KDSBrowne
a513110cdd Merge remote-tracking branch 'Maxim/move-current-user-to-top' into 5782-move-set-status 2018-07-04 16:55:39 +00:00
Maxim Khlobystov
d0ade399ce Modified the userlist sorting order by pushing the current user to the top. 2018-07-04 11:33:54 -04:00
James Jung
7462710905 adjust view of mobile user actions list 2018-07-03 17:03:27 -04:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Anton Georgiev
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message 
Moderator only message support.
 2018-07-03 11:48:08 -04:00
Anton Georgiev
4b30bb7a37
Merge pull request #5759 from KDSBrowne/fix-5637 
Prevent settings modal re-opening after dismiss
 2018-07-03 11:45:54 -04:00
Maxim Khlobystov
4a7a3cfcf9 Clearing user system messages when adding a user. 2018-07-03 11:45:44 -04:00