Maxim Khlobystov
|
cc8119ee58
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup
|
2019-04-10 15:50:28 -04:00 |
|
Maxim Khlobystov
|
de3c2c12ca
|
Code improvements
|
2019-04-10 15:40:40 -04:00 |
|
Pedro Beschorner Marin
|
141170e695
|
Refactoring lockSettingsProps
|
2019-04-10 10:44:34 -03:00 |
|
Pedro Beschorner Marin
|
3f2cb781d7
|
Adjusted lockSettingsProps for the HTML5 client
|
2019-04-10 13:04:27 +00:00 |
|
Vitor Mateus
|
5cc41dd728
|
Fix console warning
|
2019-04-09 14:55:10 -03:00 |
|
Anton Georgiev
|
ee69e002d0
|
Merge pull request #7158 from Tainan404/add-remember-checkbox
Add remember checkbox for remember guest policy choice
|
2019-04-08 17:06:27 -04:00 |
|
Maxim Khlobystov
|
d7d69d1c98
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup
|
2019-04-05 18:46:47 -04:00 |
|
Maxim Khlobystov
|
3fa22c6908
|
User information lookup feature in HTML5 client.
|
2019-04-05 18:32:21 -04:00 |
|
Anton Georgiev
|
1b2ee2e09e
|
Merge pull request #7103 from Tainan404/issue-7071
Fix modal closing when get conversion error
|
2019-04-05 15:16:55 -04:00 |
|
Vitor Mateus
|
49942f003c
|
Merge remote-tracking branch 'upstream/master' into issue-7021
|
2019-04-05 15:44:39 -03:00 |
|
Vitor Mateus
|
1d41ce65c3
|
code cleanups
|
2019-04-05 15:33:09 -03:00 |
|
Vitor Mateus
|
32067f2f7a
|
Fixes and improvements
|
2019-04-05 15:10:05 -03:00 |
|
Pedro Beschorner Marin
|
3d1c6a22d8
|
Removed extra empty line
|
2019-04-05 14:12:06 +00:00 |
|
Pedro Beschorner Marin
|
1e95ff3e6b
|
Using processForHTML5ServerOnly from helpers
|
2019-04-05 13:52:13 +00:00 |
|
Pedro Beschorner Marin
|
9ae8813f47
|
Sending an extra message for guest management in Meteor
|
2019-04-05 13:18:24 +00:00 |
|
Tainan Felipe
|
51660895ba
|
Add remember checkbox for remember guest policy choice
|
2019-04-03 17:11:47 -03:00 |
|
Vitor Mateus
|
21f0493b7a
|
Merge remote-tracking branch 'upstream/master' into issue-7021
|
2019-03-29 09:26:29 -03:00 |
|
Tainan Felipe
|
b4bbfbb7c6
|
Fix modal closing when get some conversion error
|
2019-03-25 13:20:18 -03:00 |
|
Joao Siebel
|
701911734b
|
Merge remote-tracking branch 'upstream/master' into network-indicator
|
2019-03-25 09:52:33 -03:00 |
|
Vitor Mateus
|
7d5e47666c
|
Fix End Meeting errors #7021
|
2019-03-19 17:06:13 -03:00 |
|
Anton Georgiev
|
c9b6a7c6c1
|
Update updateVoiceUser.js
|
2019-03-18 09:12:25 -04:00 |
|
Anton Georgiev
|
d8c55bb603
|
only process chat msgs when requested from html5
|
2019-03-15 18:39:48 +00:00 |
|
Fred Dixon
|
60ff3662c0
|
Merge pull request #7029 from capilkey/ff-transfer-resend
Add transfer DTMF resend for Firefox users
|
2019-03-14 17:26:10 -04:00 |
|
Chad Pilkey
|
242a9f019f
|
add transfer dtmf resend for firefox users
|
2019-03-14 14:02:51 -07:00 |
|
Anton Georgiev
|
3623b85258
|
Merge pull request #7015 from jfsiebel/user-inactivity-update
Update inactivity modal
|
2019-03-14 14:02:56 -04:00 |
|
Anton Georgiev
|
5fe8d6a2c0
|
Merge pull request #6930 from Tainan404/issue-6919
Fix few breakout room bugs.
|
2019-03-14 13:05:54 -04:00 |
|
Tainan Felipe
|
eafd7f6673
|
Add user verification in 2 spots and Fiz join breakout opening into breakout
|
2019-03-14 13:45:20 -03:00 |
|
Tainan Felipe
|
0727f87cf9
|
add user verification and open join modal to free join breakout
|
2019-03-14 11:57:06 -03:00 |
|
Gustavo Trott
|
68821c7e0b
|
Add callback to screenshare remove
|
2019-03-14 10:15:31 -03:00 |
|
Joao Siebel
|
3cfc64ac89
|
Merge remote-tracking branch 'upstream/master' into user-inactivity-update
|
2019-03-14 09:29:52 -03:00 |
|
Joao Siebel
|
cb3763ca31
|
Adjust messages when removed or by inactivity. close #6911 close #6928
|
2019-03-12 15:02:52 -03:00 |
|
gustavotrott
|
e5c26c60ef
|
Implement slow connection indicator
|
2019-03-11 21:34:34 -03:00 |
|
Anton Georgiev
|
2420f0e0da
|
Merge pull request #6967 from capilkey/recording-button-style
Recording button style
|
2019-03-11 15:18:17 -04:00 |
|
Anton Georgiev
|
612be6e5d7
|
Merge pull request #6965 from antobinary/fix-6963
Refrain from logging on multiple lines
|
2019-03-11 14:18:35 -04:00 |
|
Chad Pilkey
|
9940846ff9
|
clean up issues introduced in #6869
|
2019-03-08 18:02:46 -08:00 |
|
Anton Georgiev
|
e174a2a197
|
Merge pull request #6869 from Tainan404/issue-6717
Add pending/guest users waiting to approval panel
|
2019-03-08 17:12:28 -05:00 |
|
Anton Georgiev
|
eda28fff24
|
refrain from logging on several lines
|
2019-03-08 21:12:00 +00:00 |
|
Anton Georgiev
|
f7170e14d9
|
keep CLIENT LOG on one line to facilitate parsing
|
2019-03-08 20:52:35 +00:00 |
|
Anton Georgiev
|
8380875e70
|
remove Verto code
|
2019-03-08 19:41:19 +00:00 |
|
Anton Georgiev
|
31acde212f
|
reduce log noise for common benign events
|
2019-03-08 16:00:16 +00:00 |
|
Anton Georgiev
|
156382baa8
|
declare variable baseModifier before using it (annotations)
|
2019-03-08 15:15:59 +00:00 |
|
Tainan Felipe
|
160c0669f8
|
Fix publishers access for moderators
|
2019-03-07 17:23:42 -03:00 |
|
Tainan Felipe
|
32f5168090
|
Fix viewer can view all breakout Rooms
|
2019-03-07 13:33:34 -03:00 |
|
Anton Georgiev
|
761c5a5743
|
Merge pull request #6924 from Tainan404/issue-6919
Breakout room edge cases.
|
2019-03-06 16:24:50 -05:00 |
|
Tainan Felipe
|
479839b0b6
|
Add publisher changes
|
2019-03-06 17:38:07 -03:00 |
|
Tainan Felipe
|
3d8501042a
|
Fix main meeting by viewing all server breakout rooms
|
2019-03-06 17:01:39 -03:00 |
|
Joao Siebel
|
c93e21f2d8
|
Merge remote-tracking branch 'upstream/master' into implement-user-inactivity-check
|
2019-03-05 15:06:54 -03:00 |
|
Anton Georgiev
|
e19fd13af1
|
Merge pull request #6809 from BobakOftadeh/fix-welcome-message
Fix links in welcome message
|
2019-03-04 09:15:20 -05:00 |
|
KDSBrowne
|
a33e85b0a8
|
exclude dail in users from polls
|
2019-03-01 07:12:12 +00:00 |
|
Joao Siebel
|
b5929dc4b5
|
Add activity check modal
|
2019-02-26 14:40:01 -03:00 |
|
Tainan Felipe
|
3648afcf3f
|
Add pending/guest users waiting to approval panel
|
2019-02-26 14:08:15 -03:00 |
|
bobakoftadeh
|
a9119a239e
|
Improve how target is added
|
2019-02-25 17:01:28 +00:00 |
|
bobakoftadeh
|
2c0d201345
|
Add target attribute
|
2019-02-22 22:08:44 +00:00 |
|
Anton Georgiev
|
3003ccf7ab
|
Merge pull request #6779 from gustavotrott/slide-text-for-accessibility
Add texts extracted from slides for accessibility
|
2019-02-22 11:00:34 -05:00 |
|
Anton Georgiev
|
d18923974d
|
Merge pull request #6822 from antobinary/presentation-download
Presentation download
|
2019-02-22 09:03:44 -05:00 |
|
Chad Pilkey
|
5827ec7ff5
|
increase call connect timeout and only apply to firefox
|
2019-02-21 13:58:27 -08:00 |
|
Joao Siebel
|
681df8a546
|
handle user inactivity inspect on server
|
2019-02-21 18:09:44 -03:00 |
|
Chad Pilkey
|
50670365c5
|
dont log ice closed if user requested hangup
|
2019-02-21 12:53:39 -08:00 |
|
Chad Pilkey
|
160ea38f5b
|
Replace double quotes in audio name with single quotes
|
2019-02-21 12:49:04 -08:00 |
|
Anton Georgiev
|
d709387c85
|
Merge pull request #6821 from capilkey/improved-html5-audio-errors
Useful HTML5 sip.js bridge errors
|
2019-02-21 15:30:36 -05:00 |
|
Anton Georgiev
|
a7c69f6d27
|
add toggle for presenter to set downloadable for presentations
|
2019-02-20 22:20:04 +00:00 |
|
Chad Pilkey
|
89b8189087
|
html5 sipjs bridge has useful errors now
|
2019-02-20 13:58:37 -08:00 |
|
Anton Georgiev
|
827be6e9cd
|
Merge pull request #6806 from jfsiebel/stop-sync-video
Stop external video sharing when current presenter leaves
|
2019-02-20 13:24:18 -05:00 |
|
Anton Georgiev
|
9438b45a46
|
use real link to presentation to download
|
2019-02-20 17:17:17 +00:00 |
|
Gustavo Trott
|
ff05c4f971
|
Update slides content
|
2019-02-20 13:38:52 -03:00 |
|
bobakoftadeh
|
4a66dab29f
|
Fix links in welcome message
|
2019-02-19 22:29:23 +00:00 |
|
Anton Georgiev
|
6dbaba16c1
|
Merge pull request #6774 from jfsiebel/whiteboard-drawing-problem
Prevent drawing problem
|
2019-02-19 13:58:17 -05:00 |
|
Anton Georgiev
|
e8593f626f
|
Merge pull request #6780 from BobakOftadeh/fix-clear-chat
Fix clear public chat
|
2019-02-19 13:48:15 -05:00 |
|
Anton Georgiev
|
40caed3924
|
Merge pull request #6734 from Tainan404/issue-6666
Allow re-invite user that didn't joined in meeting
|
2019-02-19 13:39:22 -05:00 |
|
bobakoftadeh
|
c2885fdafa
|
Improve GroupChatMsg remove query
|
2019-02-19 17:51:52 +00:00 |
|
Joao Siebel
|
c4623f999d
|
fix typo
|
2019-02-19 09:24:55 -03:00 |
|
Joao Siebel
|
6b66fa7a01
|
Adjust external video functions name
|
2019-02-19 09:19:13 -03:00 |
|
Joao Siebel
|
4a7a7fd661
|
stop sharing video if presenter leaves. close #6596
|
2019-02-19 09:14:29 -03:00 |
|
Tainan Felipe
|
8c1192c861
|
Re open join modal when a new join url is received
|
2019-02-18 09:44:14 -03:00 |
|
Anton Georgiev
|
d2397cba3e
|
handle change of downloadable pres status
|
2019-02-15 19:45:42 +00:00 |
|
bobakoftadeh
|
4044d52fea
|
Improved clear chat fix
|
2019-02-14 20:18:06 +00:00 |
|
bobakoftadeh
|
3b2e536972
|
Fix clear chat bug
|
2019-02-14 19:16:15 +00:00 |
|
Gustavo Trott
|
1695e5e967
|
Add texts extracted from slides for accessibility
|
2019-02-14 16:42:13 -02:00 |
|
Anton Georgiev
|
4b18d50b42
|
update npm packages versions
|
2019-02-13 19:44:21 +00:00 |
|
Joao Siebel
|
9cba56d0f9
|
fix drawing problem by guaranteeing points order. close #6038
|
2019-02-13 14:15:09 -02:00 |
|
Maxim Khlobystov
|
52525194fa
|
Make sure logContents is not duplicated
|
2019-02-12 15:13:35 -05:00 |
|
Anton Georgiev
|
e7383f78ee
|
Merge pull request #6760 from BobakOftadeh/fix-remove-presentations
Fix remove presentation feature
|
2019-02-11 18:19:02 -05:00 |
|
bobakoftadeh
|
9c81a06e68
|
Fix removing presentation feature
|
2019-02-11 23:02:32 +00:00 |
|
Anton Georgiev
|
38b743b895
|
Merge pull request #6711 from jfsiebel/sync-lock-settings-status
Sync meeting lock settings status
|
2019-02-11 17:34:44 -05:00 |
|
Anton Georgiev
|
a61e3e17d3
|
Revert "Fix error when user is not moderator"
|
2019-02-11 17:14:35 -05:00 |
|
Richard Alam
|
7c76930feb
|
Merge branch 'authenticate-sfu-pad-connections' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-authenticate-sfu-pad-connections
|
2019-02-09 08:27:12 -08:00 |
|
Anton Georgiev
|
d0f2e8806e
|
Merge branch 'master' into sync-lock-settings-status
|
2019-02-08 13:13:58 -05:00 |
|
Tainan Felipe
|
189d788744
|
Add verification for moderator and comments explaning pipe
|
2019-02-07 17:40:27 -02:00 |
|
Tainan Felipe
|
e4488b9769
|
Add breakoutProps to users collection
|
2019-02-07 15:56:33 -02:00 |
|
Tainan Felipe
|
a566fafcaa
|
Allow re-invite user that didn't joined in meeting
|
2019-02-07 14:42:47 -02:00 |
|
Anton Georgiev
|
69c70bcff2
|
Merge pull request #6729 from vitormateusalmeida/issue-6565
Fix error when user is not moderator
|
2019-02-07 10:46:06 -05:00 |
|
Vitor Mateus
|
879c99be90
|
Fix error when user is not moderator
|
2019-02-07 12:01:03 -02:00 |
|
Pedro Beschorner Marin
|
b5427737d7
|
Includes a minimal authentication step before SFU connections
|
2019-02-06 09:37:05 -02:00 |
|
Tainan Felipe
|
742040c57b
|
Merge remote-tracking branch 'upstream/master' into issue-6450
|
2019-02-05 13:01:20 -02:00 |
|
Joao Siebel
|
555ee1232a
|
sync meeting lock settings status and handle GetLockSettingsRespMsg message. close #6669
|
2019-02-04 14:07:20 -02:00 |
|
Anton Georgiev
|
cd531f91ff
|
Merge pull request #6702 from MaximKhlobystov/html5-logs
Improve logging
|
2019-02-01 16:03:23 -05:00 |
|
Maxim Khlobystov
|
b86a990612
|
Add logCode and build number to log messages
|
2019-02-01 14:12:06 -05:00 |
|
Chad Pilkey
|
f2ba2c8bc9
|
update the html5 sipjs logging with more messages
|
2019-01-31 15:15:29 -08:00 |
|
Chad Pilkey
|
d5189549bf
|
webrtc call is ready in Edge when ICE completed not connected
|
2019-01-29 16:11:20 -08:00 |
|
Joao Siebel
|
ba198e82c6
|
add unlock/lock individual attendee when the meeting is locked. close #6661
|
2019-01-29 13:17:09 -02:00 |
|
Anton Georgiev
|
82132d38cc
|
Merge pull request #6617 from jfsiebel/lock-settings-microphone-flow
Show audio modal when microphone is locked
|
2019-01-28 15:33:21 -05:00 |
|
Anton Georgiev
|
7349fcabb5
|
Merge pull request #6535 from KDSBrowne/2.2-add-create-br-to-manage-user-menu
Add create breakout room option to manage user menu
|
2019-01-28 13:44:15 -05:00 |
|
Chad Pilkey
|
032460480d
|
update the version of adapterjs and renable sipjs logging
|
2019-01-25 10:03:01 -08:00 |
|
Anton Georgiev
|
216c38b08d
|
Merge pull request #6545 from vitormateusalmeida/issue-6430
Fix chat alert (push and audio) #6430
|
2019-01-25 10:14:38 -05:00 |
|
Fred Dixon
|
566b245e3c
|
Merge pull request #6385 from pedrobmarin/keep-meeting-events
Created property keepEvents at bbb-web to make redis record the event…
|
2019-01-24 21:47:50 -05:00 |
|
Tainan Felipe
|
cfee36f8d7
|
Add time remaining notification bar status
|
2019-01-23 14:13:03 -02:00 |
|
Joao Siebel
|
0cc53db366
|
show audio modal when microphone is locked, and fix a problem with listenOnly connection. close #6574
|
2019-01-23 14:06:14 -02:00 |
|
Vitor Mateus
|
50047ea36b
|
Fix error on click in toast
|
2019-01-22 09:42:03 -02:00 |
|
KDSBrowne
|
4920265dc0
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-add-create-br-to-manage-user-menu
|
2019-01-21 17:02:18 +00:00 |
|
Lucas Zawacki
|
57fc7a81f0
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into youtube-2.2
|
2019-01-21 02:50:56 -03:00 |
|
Anton Georgiev
|
48425b65d3
|
Merge pull request #6547 from gustavotrott/safari-audio-video-fix
Fix problems with audio and video in Safari/Webview
|
2019-01-18 11:37:33 -05:00 |
|
Lucas Zawacki
|
68e6e75525
|
More syntax fixes better log for external video auth
|
2019-01-17 14:12:32 -03:00 |
|
Tainan Felipe
|
9054dbf8db
|
Clean up code for best reading
|
2019-01-16 15:41:21 -02:00 |
|
Lucas Zawacki
|
cff3c21212
|
Push start/stop external video events to REDIS
|
2019-01-16 10:57:48 -03:00 |
|
Lucas Zawacki
|
6d4d3daba3
|
Youtube video. Fix syntax, variable names, move some code into the service, remove unused code
|
2019-01-16 10:57:20 -03:00 |
|
Lucas Zawacki
|
dfea777fb3
|
Fixing youtube sync commits
|
2019-01-16 10:41:09 -03:00 |
|
Lucas Zawacki
|
550bbcd492
|
Share synchronized youtube video in presentation area
|
2019-01-14 14:40:27 -03:00 |
|
Vitor Mateus
|
a9989e1107
|
Fix chat alert (push and audio) #6430
|
2019-01-14 11:23:35 -02:00 |
|
Tainan Felipe
|
0918cc4084
|
Merge remote-tracking branch 'upstream/master' into issue-6392
|
2019-01-14 09:30:59 -02:00 |
|
Anton Georgiev
|
bd1150550f
|
Merge pull request #6516 from jfsiebel/save-chat-public-messages
Add Welcome Message back to save/copy chat
|
2019-01-09 15:20:17 -05:00 |
|
João Francisco Siebel
|
fa70c04375
|
add welcome message and moderator only message to save/copy chat feature and fix a race condition bug when clearing the chat. close #6314
|
2019-01-09 09:36:14 -02:00 |
|
Bobak Oftadeh
|
dd89bed5e8
|
Added checks to meetingId
|
2019-01-08 14:21:47 -08:00 |
|
Bobak Oftadeh
|
b41761350d
|
Improved checks for record time
|
2019-01-04 21:32:59 +00:00 |
|
Bobak Oftadeh
|
e4d97538a3
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testRecord
|
2019-01-03 20:28:27 +00:00 |
|
Bobak Oftadeh
|
eb5c061e8f
|
Implemented recording timer
|
2019-01-03 18:43:17 +00:00 |
|
Tainan Felipe
|
1529ff8043
|
Rename functions and variables
|
2018-12-28 09:51:41 -02:00 |
|
Tainan Felipe
|
53c935b7eb
|
Add breakout room invitation feature
|
2018-12-27 14:20:03 -02:00 |
|
Gustavo Trott
|
6d4cca9306
|
Fix audio in ios webview
|
2018-12-21 15:14:05 -02:00 |
|
Tainan Felipe
|
66bf810002
|
Fix countdown doesn't appearing in breakout room
|
2018-12-18 09:04:23 -02:00 |
|
Anton Georgiev
|
afa1a64e79
|
improve format of callbacks on collection document removal
|
2018-12-14 20:19:10 +00:00 |
|
Anton Georgiev
|
12745605b4
|
Merge pull request #6393 from jfsiebel/presenter-default-pod
Set presenter in default pod
🤞
|
2018-12-13 12:52:46 -05:00 |
|
João Francisco Siebel
|
8ce7f85dde
|
add meetingId to filter results and avoid a bug with multiple meetings
|
2018-12-13 15:45:46 -02:00 |
|
Anton Georgiev
|
fbb12b055e
|
Merge pull request #6276 from Tainan404/issue-6262
Add drag & drop grid for breakout rooms
|
2018-12-13 11:35:24 -05:00 |
|
João Francisco Siebel
|
e4eae33c8a
|
implement setPresenterInPodReqMsg method as attempt to close #6109 and close #5941
|
2018-12-12 10:28:08 -02:00 |
|
Pedro Beschorner Marin
|
ebffcb0848
|
Created property keepEvents at bbb-web to make redis record the events for all meetings
|
2018-12-11 18:37:31 -02:00 |
|
Anton Georgiev
|
55f116cc95
|
revert presenter assign 6270 6326
|
2018-12-06 19:07:51 +00:00 |
|
João Francisco Siebel
|
6a84618982
|
increase zoom increment factor to 25. close #6301
|
2018-12-05 09:00:12 -02:00 |
|
João Francisco Siebel
|
ec91afdd58
|
simplify assignPresenter flow
|
2018-11-30 17:34:00 -02:00 |
|
Anton Georgiev
|
ec3aa585ce
|
Merge pull request #6270 from jfsiebel/html5-set-presenter-default-pod
Set HTML5 client as presenter in default pod
|
2018-11-22 14:24:41 -02:00 |
|
Tainan Felipe
|
de66a7bd12
|
Add button for set free join status on create breakout room modal
|
2018-11-21 14:46:29 -02:00 |
|
Bobak Oftadeh
|
8f0142aac1
|
Improved check on lockSettingsProp
|
2018-11-21 16:39:34 +00:00 |
|
Bobak Oftadeh
|
ce2eb21b57
|
changed micLocked check
|
2018-11-21 12:59:30 +00:00 |
|
Bobak Oftadeh
|
70b533ba2e
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-21 12:25:53 +00:00 |
|
João Francisco Siebel
|
877b9335b3
|
rename variable and add comments for better understanding
|
2018-11-20 18:14:17 -02:00 |
|
João Francisco Siebel
|
d8a2cb3883
|
set html5 client as pod presenter. close #6109 and close #5941
|
2018-11-20 17:44:05 -02:00 |
|
Bobak Oftadeh
|
e6e40d8c84
|
removed ALLOW_MODERATOR_TO_UNMUTE_AUDIO check
|
2018-11-20 16:15:02 +00:00 |
|
Bobak Oftadeh
|
caabc100ac
|
fixed spacing in lock-modal styles
|
2018-11-19 20:07:39 +00:00 |
|
Bobak Oftadeh
|
4649fe7c76
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-16 13:32:29 -08:00 |
|
Bobak Oftadeh
|
15d4e84d55
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-16 12:06:57 -08:00 |
|
Bobak Oftadeh
|
bafa4c15cc
|
Added log message when meeting is muted
|
2018-11-15 14:07:47 -08:00 |
|
Bobak Oftadeh
|
5fb58cd604
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-11-15 12:55:57 -08:00 |
|
Bobak Oftadeh
|
31d59e21ec
|
Viewers join listen only when microphones are locked
|
2018-11-15 12:53:03 -08:00 |
|
Richard Alam
|
d1dad75898
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14
|
2018-11-14 08:47:21 -08:00 |
|
Bobak Oftadeh
|
cd6aae26e4
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-13 14:20:50 -08:00 |
|
Bobak Oftadeh
|
6dd6fb714f
|
Implemented listen-only on startup when viewer joins with mic locked settings
|
2018-11-13 14:18:26 -08:00 |
|
bobakoftadeh
|
c33723ac14
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-12 09:15:55 -08:00 |
|
Anton Georgiev
|
98ac77dc03
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands
|
2018-11-12 17:01:06 +00:00 |
|
bobakoftadeh
|
04421e631b
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-mange-b
|
2018-11-12 08:40:47 -08:00 |
|
bobakoftadeh
|
87f63baa5a
|
Improved interface for lock settings modal
|
2018-11-09 16:25:15 -08:00 |
|
João Francisco Siebel
|
076864ffd0
|
merge with master
|
2018-11-09 13:54:33 -02:00 |
|
Anton Georgiev
|
adbe9bb546
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands
|
2018-11-08 19:34:57 +00:00 |
|
bobakoftadeh
|
020ac800af
|
Implemented functionality of lock settings
|
2018-11-08 10:55:12 -08:00 |
|
Anton Georgiev
|
9555cd68b8
|
Merge pull request #6105 from KDSBrowne/start-poll-01
Add start, stop and publish a poll for Presenter
|
2018-11-08 13:52:36 -05:00 |
|
João Francisco Siebel
|
016efcc0eb
|
Remove ACL from client side. close #6138
|
2018-11-05 17:30:37 -02:00 |
|
KDSBrowne
|
538e248058
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-11-02 21:25:40 +00:00 |
|
Ghazi Triki
|
ff80b30df1
|
Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master
# Conflicts:
# bigbluebutton-html5/imports/ui/services/audio-manager/index.js
|
2018-11-02 21:02:02 +01:00 |
|
Bobak Oftadeh
|
a97a1ece37
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-11-02 09:17:07 -07:00 |
|
Anton Georgiev
|
357f341a3e
|
Merge branch 'master' into breakout-room-html5
|
2018-11-02 09:26:09 -04:00 |
|
Anton Georgiev
|
04883ffcdb
|
handle iframe toggleRecording and toggle self muting
|
2018-11-01 15:03:16 +00:00 |
|
Ghazi Triki
|
653fd74440
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
# bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
# bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
# bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
# bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
# bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
# bigbluebutton-config/bigbluebutton-release
# bigbluebutton-html5/client/compatibility/kurento-extension.js
# bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
|
2018-11-01 14:00:54 +01:00 |
|
Joao Siebel
|
97a0a2a13b
|
configurable shortcuts available. close #6169
|
2018-10-31 15:51:56 -03:00 |
|
KDSBrowne
|
38ae789b4a
|
fix userlist poll heading remaining after presenter toggle
|
2018-10-31 17:28:35 +00:00 |
|
KDSBrowne
|
89a885b2df
|
rename selectors and change to const
|
2018-10-31 14:03:48 +00:00 |
|
KDSBrowne
|
ee41c0bd93
|
adjust variable names / remove duplicate return
|
2018-10-30 13:17:40 +00:00 |
|
Bobak Oftadeh
|
6bde6b06f5
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-29 14:39:25 -07:00 |
|
Tainan Felipe
|
07d89a0132
|
Add intl to breakout room name
|
2018-10-29 16:29:45 -03:00 |
|
Chad Pilkey
|
7e99929214
|
[HTML5] delay the notfication that the echo test is connected
|
2018-10-29 09:41:05 -07:00 |
|
Tainan Felipe
|
fceeca3795
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-26 11:52:54 -03:00 |
|
Anton Georgiev
|
a5c2ddc602
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
|
2018-10-25 17:58:00 +00:00 |
|
KDSBrowne
|
3f521a6f6a
|
Merge branch 'html5-theming' into test-merge-anton
|
2018-10-25 16:33:56 +00:00 |
|
KDSBrowne
|
47218ea351
|
Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton
|
2018-10-25 16:18:31 +00:00 |
|
Fred Dixon
|
c807da095f
|
Update sip.js
Fix #6167
|
2018-10-24 16:26:20 -04:00 |
|
Anton Georgiev
|
ef9f248607
|
Merge branch 'master' into html5-theming
|
2018-10-24 14:58:59 -04:00 |
|
Chad Pilkey
|
81983ae1e1
|
Stop HTML5 ejecting from voice on reconnect and fix voice user creation
|
2018-10-24 11:40:38 -07:00 |
|
Anton Georgiev
|
cde6311a5d
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
|
2018-10-24 18:26:13 +00:00 |
|
Anton Georgiev
|
57dc55b559
|
drop metadata configs; use userdata configs for autoSwap
|
2018-10-23 20:44:17 +00:00 |
|
Tainan Felipe
|
cf08440a25
|
Remove function
|
2018-10-23 15:16:34 -03:00 |
|
Tainan Felipe
|
c53a007438
|
Remove chages on modifier
|
2018-10-23 15:15:10 -03:00 |
|
Tainan Felipe
|
958bd406a6
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-23 14:53:46 -03:00 |
|
Tainan Felipe
|
c2538be574
|
Remove consoles
|
2018-10-23 14:27:48 -03:00 |
|
Tainan Felipe
|
1bc8ae0b21
|
add join audio only, and imporov UX
|
2018-10-23 14:18:09 -03:00 |
|
Oswaldo Acauan
|
f71d32a464
|
Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP
wip
wip
format
wip
Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
|
2018-10-23 14:21:58 -02:00 |
|
Bobak Oftadeh
|
0cde376e67
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-22 10:06:18 -07:00 |
|
João Francisco Siebel
|
f936e319de
|
implement configurable whiteboard tools. close #5826
|
2018-10-19 14:05:56 -03:00 |
|
João Francisco Siebel
|
252bacb917
|
Add multiUserPenOnly parameter in yml
|
2018-10-18 14:03:11 -03:00 |
|
KDSBrowne
|
bae71203a5
|
Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router
|
2018-10-17 20:34:05 +00:00 |
|
Tainan Felipe
|
bd01d7e4aa
|
to squash
|
2018-10-16 14:55:20 -03:00 |
|
Anton Georgiev
|
b2df10c635
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
|
2018-10-16 16:06:37 +00:00 |
|
KDSBrowne
|
45eeb1d400
|
Merge remote-tracking branch 'Upstream/master' into start-poll-01
|
2018-10-16 15:19:24 +00:00 |
|
Bobak Oftadeh
|
0a3568cc74
|
Added mute meeting settings to yml file
|
2018-10-15 15:24:56 -07:00 |
|