zhu
|
a0afca45b8
|
add dropzoneImagesLabel for images dropzone
|
2018-12-17 17:30:32 +08:00 |
|
zhu
|
01279fd804
|
separate pics or files upload in mobile device
|
2018-12-17 17:27:17 +08:00 |
|
zhu
|
b4d58fbd9c
|
notify user when selected files is rejected
|
2018-12-17 17:23:00 +08:00 |
|
zhu
|
fff59e38b4
|
Revert "Fix ios scrolling when drawing"
This reverts commit 83d5617109.
|
2018-12-17 17:13:57 +08:00 |
|
Anton Georgiev
|
1d4b21d9f7
|
handle meeting not found
|
2018-12-14 22:33:52 +00:00 |
|
Anton Georgiev
|
d12c01fb14
|
Merge pull request #6377 from KDSBrowne/hide-toolbar-onSwap
Hide presentation controls in swapped state
|
2018-12-14 15:32:48 -05:00 |
|
Tainan Felipe
|
2bab07044b
|
Remove merge conflict
|
2018-12-14 17:02:55 -02:00 |
|
Tainan Felipe
|
18ba3e402f
|
Merge remote-tracking branch 'upstream/master' into issue-6261
|
2018-12-14 17:01:19 -02:00 |
|
KDSBrowne
|
899c613c3c
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-12-14 17:28:30 +00:00 |
|
Tainan Felipe
|
b279dac9e9
|
Add mobile version to sort user on breakout rooms
|
2018-12-14 10:33:58 -02:00 |
|
Anton Georgiev
|
2258981559
|
revert controls for font size Close #6361
|
2018-12-13 21:47:43 +00:00 |
|
Anton Georgiev
|
d80d78589f
|
Merge pull request #6346 from KDSBrowne/html5-packages-upgrade
HTML5 packages upgrade
|
2018-12-13 14:43:47 -05:00 |
|
KDSBrowne
|
46d29fd553
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-12-13 19:14:52 +00: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 |
|
Bobak Oftadeh
|
5dfbafb30f
|
Implemented recording modal
|
2018-12-12 11:09:33 -08:00 |
|
KDSBrowne
|
775176d9cf
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-12-12 17:35:22 +00:00 |
|
Anton Georgiev
|
88575ccee8
|
Merge pull request #6386 from KDSBrowne/remove-active-tooltip
Remove tooltip for active buttons
|
2018-12-12 09:38:42 -05:00 |
|
KDSBrowne
|
f479059668
|
remove tooltip for active buttons
|
2018-12-12 14:01:33 +00:00 |
|
KDSBrowne
|
a9023965b0
|
Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade
|
2018-12-11 16:59:39 +00:00 |
|
KDSBrowne
|
f16366c305
|
hide toolbar when presentation is swapped
|
2018-12-11 16:28:37 +00:00 |
|
Tainan Felipe
|
eee11552b3
|
Change the css variable imports to app component
|
2018-12-11 09:46:42 -02:00 |
|
Bobak Oftadeh
|
49e705407c
|
Merge branch 'fix-modal-structure' of https://github.com/BobakOftadeh/bigbluebutton into record-indicator
|
2018-12-10 12:36:21 -08:00 |
|
Tainan Felipe
|
ac9dff0c3e
|
Merge branch 'master' into async-await-test
|
2018-12-10 15:23:16 -02:00 |
|
Tainan Felipe
|
bbc249483c
|
Fix liter errors
|
2018-12-10 15:05:17 -02:00 |
|
Tainan Felipe
|
e59e04a23f
|
testing async await to join
|
2018-12-10 13:52:25 -02:00 |
|
KDSBrowne
|
8b30fe00b3
|
Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade
|
2018-12-10 02:12:42 +00:00 |
|
KDSBrowne
|
5adac9c88b
|
adjust packages / fix bug
|
2018-12-10 01:08:16 +00:00 |
|
Anton Georgiev
|
d3da7259d7
|
Merge pull request #6340 from antobinary/logs-post
Handle logs that cannot be stringified/parsed
|
2018-12-07 17:21:01 -05:00 |
|
Anton Georgiev
|
69873070b6
|
Merge pull request #6322 from MaximKhlobystov/html5-tests-v3
Update for the automated tests
|
2018-12-07 16:46:38 -05:00 |
|
Anton Georgiev
|
20386334f6
|
Merge pull request #6295 from BobakOftadeh/micsLocked-check-fix
Fixed micsLocked check
|
2018-12-07 11:36:31 -05:00 |
|
Bobak Oftadeh
|
95ddb01666
|
Improved fix on VideoService.isLocked error
|
2018-12-06 22:41:09 +00:00 |
|
Maxim Khlobystov
|
f548b46672
|
Improve the client logs appearing on user join/subscription
|
2018-12-06 12:26:08 -05:00 |
|
Bobak Oftadeh
|
1c162a9658
|
Added option to use modal component without header border
|
2018-12-05 14:49:36 -08:00 |
|
Anton Georgiev
|
dbb2a63d56
|
handle logs that cannot be stringified/parsed
|
2018-12-05 21:38:19 +00:00 |
|
KDSBrowne
|
462f20d9bb
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade
|
2018-12-05 20:54:37 +00:00 |
|
KDSBrowne
|
39c75fd449
|
fix remaining bugs / console errors
|
2018-12-05 19:31:33 +00:00 |
|
Anton Georgiev
|
f322165e4e
|
Merge pull request #6331 from jfsiebel/improve-user-list-performace
Improve user-list-content performance
|
2018-12-05 12:32:15 -05:00 |
|
Joao Siebel
|
5d33da64b0
|
remove unnecessary meeting fetch
|
2018-12-05 15:06:03 -02:00 |
|
João Francisco Siebel
|
e1f3f259d6
|
fix messages for zoom controls
|
2018-12-05 09:40:35 -02: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
|
43b44ecc6a
|
Improve user-list-content performance. close #6268
|
2018-12-04 15:29:40 -02:00 |
|
Anton Georgiev
|
22a4c495a8
|
add logs for audio input/output devices to debug iOS
|
2018-12-03 21:24:18 +00:00 |
|
Maxim Khlobystov
|
b0cfc662c1
|
Fix the selectors in presentation tests
|
2018-11-30 15:56:21 -05:00 |
|
Maxim Khlobystov
|
835b07384a
|
Fix the selectors in whiteboard tests
|
2018-11-30 12:59:14 -05:00 |
|
Maxim Khlobystov
|
30adab4c34
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-tests-v3
|
2018-11-30 12:32:51 -05:00 |
|
Maxim Khlobystov
|
aa5a0f6dc9
|
Fix the selectors in user list tests and chat tests
|
2018-11-30 12:32:19 -05:00 |
|
Bobak Oftadeh
|
cdc6033c45
|
fixed VideoService.isLocked error
|
2018-11-30 16:41:08 +00:00 |
|
Anton Georgiev
|
362184db4e
|
display properly logs on html5 join
|
2018-11-29 22:37:51 +00:00 |
|
Anton Georgiev
|
5f5a7f00f2
|
change icon for clearing annotations in whiteboard
|
2018-11-29 20:35:34 +00:00 |
|
Tainan Felipe
|
d1ae927f6f
|
Add warn message and open the breakouts room when create
|
2018-11-29 17:47:04 -02:00 |
|
Bobak Oftadeh
|
e51a09de0f
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into micsLocked-check-fix
|
2018-11-29 18:08:43 +00:00 |
|
Anton Georgiev
|
2e0660db7c
|
Merge pull request #6307 from Tainan404/issue-6289
Change the buttons on actions bar to ghost buttons
|
2018-11-29 15:06:52 -02:00 |
|
Tainan Felipe
|
fee219ed07
|
Fix console warning
|
2018-11-29 14:58:39 -02:00 |
|
prlanzarin
|
01795860c8
|
Workaround on webcam viewer race condition when state changes rapidly
|
2018-11-28 22:27:44 +00:00 |
|
Tainan Felipe
|
3561681e75
|
Change the buttons on actions bar to ghost buttons
|
2018-11-28 10:59:03 -02:00 |
|
Tainan Felipe
|
eb989ea6bb
|
Add selected state
|
2018-11-27 16:00:15 -02:00 |
|
Anton Georgiev
|
bc9c553819
|
Merge pull request #6273 from KDSBrowne/2.2-manage-menu-alignment
Fix manage user menu alignment
|
2018-11-27 14:18:01 -02:00 |
|
KDSBrowne
|
06caa2460f
|
Remove calc()
|
2018-11-27 10:53:30 -05:00 |
|
KDSBrowne
|
55139a747e
|
Fix lint issue
|
2018-11-27 10:51:19 -05:00 |
|
Tainan Felipe
|
27e012ac56
|
Add drag and drop grid to sort user by room
|
2018-11-27 10:44:22 -02:00 |
|
KDSBrowne
|
320e7e5e97
|
remove px
|
2018-11-26 13:15:06 +00:00 |
|
Bobak Oftadeh
|
ad5cf5bd62
|
Fixed micsLocked check
|
2018-11-23 17:48:23 +00:00 |
|
Tainan Felipe
|
63a268b12f
|
Add intl to free join and change the state to true by dafault
|
2018-11-23 15:20:49 -02:00 |
|
KDSBrowne
|
c6851484bb
|
rename toggle handlers / remove reactive source from render
|
2018-11-23 12:37:18 +00:00 |
|
KDSBrowne
|
6d2836dfd3
|
clean up poll container render()
|
2018-11-23 04:08:48 +00:00 |
|
KDSBrowne
|
5c43613a47
|
replace switch in panel manager reander()
|
2018-11-23 03:37:39 +00:00 |
|
KDSBrowne
|
2a65b33bdc
|
change file EOL sequence from CRLF to LF
|
2018-11-22 20:55:49 +00:00 |
|
KDSBrowne
|
bf56dff85d
|
omit px
|
2018-11-22 20:52:07 +00:00 |
|
KDSBrowne
|
ff82c8831a
|
make chate scrollbar accessible with mouse
|
2018-11-22 20:27:45 +00:00 |
|
KDSBrowne
|
d2a77e80af
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-11-22 20:08:55 +00:00 |
|
KDSBrowne
|
49556ac13d
|
make menu position match design image
|
2018-11-22 17:33:05 +00:00 |
|
Tainan Felipe
|
a95281c274
|
Removes finally on meeting eneded component
|
2018-11-22 15:03:39 -02:00 |
|
Tainan Felipe
|
77417c63f7
|
Merge remote-tracking branch 'upstream/master' into Remove-finally
|
2018-11-22 15:02:23 -02:00 |
|
Tainan Felipe
|
dcfaae25cd
|
Removes the finally to have MS edge compatibility
|
2018-11-22 14:54:40 -02:00 |
|
Anton Georgiev
|
fa117ea684
|
Merge pull request #6271 from Tainan404/fiz-logout-handler
Fix logout URL handler isn't working on error screen
|
2018-11-22 14:47:05 -02:00 |
|
KDSBrowne
|
e6398ea56f
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-11-22 14:46:24 +00:00 |
|
Anton Georgiev
|
2e7a2aeda0
|
Merge pull request #6282 from BobakOftadeh/userlist-scroll-fix
Fixed user list scroll
|
2018-11-22 12:31:49 -02:00 |
|
Anton Georgiev
|
92683f741f
|
Merge pull request #6237 from BobakOftadeh/user-manage-C
Moderator menu (lock viewers implementation)
|
2018-11-22 12:09:39 -02:00 |
|
Bobak Oftadeh
|
98d8136367
|
Fixed user-list scroll
|
2018-11-22 13:48:06 +00:00 |
|
Tainan Felipe
|
f6f1e696e1
|
Fix linter
|
2018-11-21 14:46:29 -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 |
|
Anton Georgiev
|
addb3952e2
|
Merge pull request #6275 from prlanzarin/sfu-2.2-vb
Added voiceBridge prop to video-provider and forward it to SFU
|
2018-11-21 14:07:22 -02:00 |
|
Anton Georgiev
|
a216703cec
|
avoid race condition when detecting user join from outside iframe
|
2018-11-21 13:46:13 +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 |
|
KDSBrowne
|
948b88aee4
|
fix css indentations
|
2018-11-21 00:02:11 +00:00 |
|
KDSBrowne
|
b506634731
|
make manage menu fullscreen for small devices
|
2018-11-20 23:57:48 +00:00 |
|
KDSBrowne
|
b1a9228904
|
fix user manage menu alignment bug
|
2018-11-20 23:32:42 +00:00 |
|
Tainan Felipe
|
c660e656f7
|
Fix logout handler isn't working on error screen
|
2018-11-20 18:13:34 -02:00 |
|
KDSBrowne
|
86af1e0e9d
|
fix key warning for non resizable panels
|
2018-11-20 19:18:30 +00:00 |
|
KDSBrowne
|
38812065a5
|
make userlist open on join except on mobile phones
|
2018-11-20 16:37:15 +00:00 |
|
KDSBrowne
|
79c168d2a4
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-11-20 16:30:39 +00:00 |
|
Bobak Oftadeh
|
e6e40d8c84
|
removed ALLOW_MODERATOR_TO_UNMUTE_AUDIO check
|
2018-11-20 16:15:02 +00:00 |
|
KDSBrowne
|
149b4f091a
|
move render functions from app to panel-manager
|
2018-11-20 15:28:00 +00:00 |
|
Bobak Oftadeh
|
282fd4055d
|
removed option to unmute other users
|
2018-11-20 13:12:43 +00:00 |
|
prlanzarin
|
d652eb7f9b
|
Added voiceBridge prop to video-provider and forward it to SFU
|
2018-11-20 13:05:16 +00:00 |
|
Bobak Oftadeh
|
4d0e694724
|
improved meeting query
|
2018-11-20 12:46:21 +00:00 |
|
KDSBrowne
|
99e15b20ba
|
add panel manager component
|
2018-11-19 23:29:48 +00:00 |
|
Bobak Oftadeh
|
51ff9230fa
|
changed meeting query
|
2018-11-19 20:55:09 +00:00 |
|
Bobak Oftadeh
|
caabc100ac
|
fixed spacing in lock-modal styles
|
2018-11-19 20:07:39 +00:00 |
|
Bobak Oftadeh
|
15a252ecbf
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-19 19:00:58 +00:00 |
|
Bobak Oftadeh
|
89be9ef23f
|
Improved micsLocked implementation
|
2018-11-19 18:59:47 +00:00 |
|
Anton Georgiev
|
6135b52b08
|
Remove trailing spaces
|
2018-11-19 13:53:25 -03:00 |
|
Tainan Felipe
|
ae812d2358
|
Remove unsedvars and fix linter error
|
2018-11-19 14:14:26 -02:00 |
|
Tainan Felipe
|
da54c41510
|
Rename misspell function names
|
2018-11-19 13:40:42 -02:00 |
|
Tainan Felipe
|
b9cd478533
|
Merge remote-tracking branch 'upstream/master' into issue-6194
|
2018-11-19 12:05:17 -02: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 |
|
Anton Georgiev
|
557f22a7fb
|
Merge pull request #6161 from BobakOftadeh/user-manage-b
User manage button clear status, mute meeting implementation
|
2018-11-16 16:21:05 -05:00 |
|
Bobak Oftadeh
|
95564a6acd
|
cleaned up code for user-options
|
2018-11-16 13:08:53 -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
|
34d525e4c6
|
Moved api functions to the lock-viewers container
|
2018-11-16 12:04:21 -08:00 |
|
Anton Georgiev
|
fb0610076c
|
Merge pull request #6230 from MaximKhlobystov/webcam-choice
Webcam Settings modal for choosing a webcam
|
2018-11-16 14:33:54 -05:00 |
|
Maxim Khlobystov
|
ce5c20ba7c
|
Unsharing a webcam when page reloads.
|
2018-11-16 14:03:20 -05:00 |
|
Maxim Khlobystov
|
f29131b7f3
|
Fix the issue with a weird state of the camera dropdown.
|
2018-11-16 13:56:39 -05:00 |
|
Maxim Khlobystov
|
f0cb8ffa42
|
Using client logger for errors caught when switching between cameras in webcam settings modal.
|
2018-11-16 12:59:15 -05:00 |
|
Maxim Khlobystov
|
1013e967a4
|
Prevent the webcam settings modal from resizing when switching between cameras.
|
2018-11-16 12:49:46 -05:00 |
|
Tainan Felipe
|
b86d89f0fc
|
Re-add logger messages
|
2018-11-16 13:58:49 -02: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 |
|
Maxim Khlobystov
|
694ba0b4c7
|
Throwing a toast notification when there is a getUserMedia error on switching between webcams in the preview.
|
2018-11-15 15:00:11 -05:00 |
|
Maxim Khlobystov
|
3a313ad529
|
Make sure the video preview and audio modals don't interfere with each other.
|
2018-11-15 14:38:04 -05:00 |
|
Maxim Khlobystov
|
e9a6d387e4
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice
|
2018-11-14 17:20:43 -05:00 |
|
Maxim Khlobystov
|
e819ae2fd2
|
Make the webcam preview's border rounded
|
2018-11-14 16:17:44 -05:00 |
|
Maxim Khlobystov
|
6a546fca33
|
Using the constraints from the configuration file in webcam preview.
|
2018-11-14 16:12:02 -05:00 |
|
Tainan Felipe
|
5a3649791b
|
Transform joinRouterHandler and aunthenticatedRouteHandler in components
|
2018-11-14 15:11:10 -02: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 |
|
Anton Georgiev
|
2513409f3a
|
Merge pull request #6215 from antobinary/iframe-outside-commands
Handle iframe toggle recording and toggle self muting
|
2018-11-13 13:46:12 -05:00 |
|
Anton Georgiev
|
fea8c267cc
|
improve on listeners for state outside iframe
|
2018-11-13 17:14:30 +00:00 |
|
Anton Georgiev
|
e3729a7bf3
|
better updates
|
2018-11-12 22:09:04 +00:00 |
|
Bobak Oftadeh
|
91592a5d80
|
cleaned up code for moderator menu
|
2018-11-12 09:40:18 -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 |
|
KDSBrowne
|
f9ec2c3759
|
fix null event error in firefox
|
2018-11-12 16:45:37 +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 |
|
Anton Georgiev
|
ce26a3ed5e
|
Merge branch 'master' into remove-client-side-acl
|
2018-11-12 11:29:43 -05: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 |
|
Tainan Felipe
|
164835d49b
|
Merge branch 'master' into breakout-room-html5
|
2018-11-09 13:49:15 -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 |
|
KDSBrowne
|
718942668e
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-recording-label
|
2018-11-08 19:15:17 +00:00 |
|
KDSBrowne
|
32dd7ce944
|
use calc() instead of new variables
|
2018-11-08 19:13:14 +00:00 |
|
Anton Georgiev
|
423d3a5819
|
Merge pull request #6225 from Tainan404/add-meteor-disconnect
Add meteor disconnect
|
2018-11-08 14:03:04 -05: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 |
|
Maxim Khlobystov
|
9b27c89bc8
|
Adjustments to the autoShareWebcam
|
2018-11-07 16:45:52 -05:00 |
|
Maxim Khlobystov
|
a2c490f4f6
|
Stopping the tracks to avoid fetching two cameras at the same time + Making the constraints less restricted
|
2018-11-07 16:16:36 -05:00 |
|
Maxim Khlobystov
|
91dad9d882
|
Fixing some linter error
|
2018-11-07 14:30:36 -05:00 |
|
KDSBrowne
|
565b55e8e7
|
remove unused styles
|
2018-11-07 13:00:21 +00:00 |
|
KDSBrowne
|
10d5d0706e
|
remove visible recording label / add missing formatted string / fix recording icon
|
2018-11-07 02:20:19 +00:00 |
|
Maxim Khlobystov
|
9f67ce4106
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice
|
2018-11-06 18:17:52 -05:00 |
|
Maxim Khlobystov
|
90f38561c3
|
Add Webcam Settings to choose a camera
|
2018-11-06 18:10:56 -05:00 |
|
bobakoftadeh
|
856459e989
|
Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C
|
2018-11-06 13:47:38 -08:00 |
|
Bobak Oftadeh
|
edc941da9e
|
Implementation of lock-view modal menu
|
2018-11-06 13:39:07 -08:00 |
|
Tainan Felipe
|
060435d54e
|
Rename from Breakout-room to breakout-room
|
2018-11-06 13:42:30 -02:00 |
|
Oswaldo Acauan
|
2ac4490366
|
Fix tippy wait option to the new version
|
2018-11-06 13:41:11 -02:00 |
|
Oswaldo Acauan
|
a8c1df7f22
|
Upgrade all npm and meteor packages and fix compatibility issues introduced
|
2018-11-06 12:59:53 -02:00 |
|
João Francisco Siebel
|
016efcc0eb
|
Remove ACL from client side. close #6138
|
2018-11-05 17:30:37 -02:00 |
|
KDSBrowne
|
c552b3522c
|
prevent breakout and poll pane both open
|
2018-11-05 17:52:06 +00:00 |
|
Tainan Felipe
|
958e7b06ba
|
Remove the intl id
|
2018-11-05 14:02:04 -02:00 |
|
Tainan Felipe
|
50d8995600
|
Add the meteor disconnect on meeting ended and error screen
|
2018-11-05 13:51:39 -02:00 |
|
Tainan Felipe
|
1768c49169
|
Add the meteor disconnect on meeting ended and error screen
|
2018-11-05 13:48:57 -02:00 |
|
Tainan Felipe
|
fd8a63fbbb
|
Change the method permissions for moderator
|
2018-11-05 10:27:56 -02:00 |
|
KDSBrowne
|
8378606889
|
move presenter and poll check to UserPolls
|
2018-11-02 21:43:49 +00: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
|
bada73b7e7
|
Merge pull request #6178 from Tainan404/breakout-room-html5
Add presenter POV for breakout room on HTML5.
|
2018-11-02 11:16:33 -04:00 |
|
Anton Georgiev
|
6c8722969c
|
Merge pull request #6206 from Tainan404/fix-cursor-video-dock
Apply transparency on connecting animation on video item.
|
2018-11-02 11:02:15 -04:00 |
|
Anton Georgiev
|
357f341a3e
|
Merge branch 'master' into breakout-room-html5
|
2018-11-02 09:26:09 -04:00 |
|
Anton Georgiev
|
70ac42f6bb
|
Merge pull request #6199 from jfsiebel/configurable-whiteboard-tools-improvement
Configurable whiteboard tools improvement
|
2018-11-01 16:01:21 -04:00 |
|
Anton Georgiev
|
4940b45bb1
|
Merge pull request #6210 from jfsiebel/configurable-shortcut-list
Configurable available shortcuts
|
2018-11-01 15:56:44 -04:00 |
|
Anton Georgiev
|
41c7791272
|
Merge pull request #6192 from Tainan404/fix-presentation-hover
Remove behavior that add opacity when hover the presentation area.
|
2018-11-01 14:50:47 -04:00 |
|
KDSBrowne
|
9e483a181e
|
move live-result sort to service
|
2018-11-01 18:20:35 +00:00 |
|
Tainan Felipe
|
d87b231dfe
|
Allow moderator end all breakouts
|
2018-11-01 14:55:35 -03:00 |
|
Tainan Felipe
|
5aa86f8ccb
|
Clear setIntervel when unmount the component
|
2018-11-01 13:53:27 -03:00 |
|
KDSBrowne
|
deac142296
|
move check for non presenter
|
2018-11-01 15:53:34 +00:00 |
|
Anton Georgiev
|
04883ffcdb
|
handle iframe toggleRecording and toggle self muting
|
2018-11-01 15:03:16 +00:00 |
|
Tainan Felipe
|
7f56e7c2aa
|
Fix notification doesn't appear after second breakout invoking
|
2018-11-01 11:07:01 -03: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 |
|
KDSBrowne
|
ecf0304a01
|
move poll container functions to service
|
2018-10-31 19:13:19 +00: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
|
0e26d2a6c1
|
add early returns to renderPollStats()
|
2018-10-31 13:28:32 +00:00 |
|
KDSBrowne
|
a8ef2cb8b5
|
rename getPollStats and getInputFields
|
2018-10-31 13:18:33 +00:00 |
|
KDSBrowne
|
291461d4fd
|
add sort to users in live-results
|
2018-10-30 20:05:56 +00:00 |
|
KDSBrowne
|
b95e3a7825
|
condense getRespondents and getUnresponsive into single function
|
2018-10-30 19:18:32 +00:00 |
|
Anton Georgiev
|
4b4390214f
|
Revert "Make it so that cameras use the full space of the video window"
|
2018-10-30 14:25:21 -04:00 |
|
Tainan Felipe
|
7243d3bbc3
|
Fix css variable was not working
|
2018-10-30 13:19:22 -03:00 |
|
KDSBrowne
|
76e3759039
|
add formated message
|
2018-10-30 15:57:10 +00:00 |
|
KDSBrowne
|
ee41c0bd93
|
adjust variable names / remove duplicate return
|
2018-10-30 13:17:40 +00:00 |
|
Tainan Felipe
|
c6284a0fbb
|
Add poiter cursor the hover over the video dropdown
|
2018-10-30 09:47:18 -03: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 |
|
Bobak Oftadeh
|
b3a496bfc0
|
Improved user-manage menu styles and implementation
|
2018-10-29 14:36:10 -07:00 |
|
Tainan Felipe
|
a0a2b7605f
|
Rename function breakouts to findBreakouts
|
2018-10-29 16:36:45 -03:00 |
|
Tainan Felipe
|
07d89a0132
|
Add intl to breakout room name
|
2018-10-29 16:29:45 -03:00 |
|
KDSBrowne
|
3fc941bd49
|
prevent users interacting with elements behind polling modal like view
|
2018-10-29 16:57:19 +00:00 |
|
KDSBrowne
|
78a5ff6fc9
|
edit poll pane close btn
|
2018-10-29 16:14:05 +00:00 |
|
KDSBrowne
|
bba899c4a7
|
prevent poll closing on poll pane hide
|
2018-10-29 15:27:50 +00:00 |
|
KDSBrowne
|
ee73ec4dd3
|
remove left over react-router code
|
2018-10-28 17:02:54 +00:00 |
|
Tainan Felipe
|
0e1f805c30
|
remove log
|
2018-10-26 17:26:24 -03:00 |
|
Tainan Felipe
|
0d22580b1c
|
Change to count
|
2018-10-26 16:57:37 -03:00 |
|
KDSBrowne
|
7f396f3590
|
remove container not being used
|
2018-10-26 16:06:11 +00:00 |
|
Tainan Felipe
|
32dd8c4740
|
migrate to session
|
2018-10-26 12:16:29 -03:00 |
|
Tainan Felipe
|
fceeca3795
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-26 11:52:54 -03:00 |
|
João Francisco Siebel
|
b9aff5a6f1
|
handle empty tool list. close #6171
|
2018-10-26 11:17:41 -03:00 |
|
KDSBrowne
|
9adf429b32
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-10-26 13:23:32 +00:00 |
|
KDSBrowne
|
6a16b379d7
|
fix actions poll toggle not working when userlist is closed
|
2018-10-26 12:54:35 +00:00 |
|
KDSBrowne
|
4462e050ee
|
fix polling title misalignment
|
2018-10-26 12:49:14 +00:00 |
|
KDSBrowne
|
8f24fcfd01
|
make userlist-poll btn toggle menu
|
2018-10-26 12:37:29 +00:00 |
|
Anton Georgiev
|
05da6ff047
|
toggle PublicChat
|
2018-10-26 12:36:51 +00:00 |
|
KDSBrowne
|
d5eae7c288
|
remove comment left over from merge
|
2018-10-26 01:47:48 +00:00 |
|
KDSBrowne
|
0551691684
|
edit css styles
|
2018-10-26 01:40:15 +00:00 |
|
KDSBrowne
|
3ced879e41
|
clean up togglePollMenu()
|
2018-10-25 22:41:45 +00:00 |
|
KDSBrowne
|
935eb1289d
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-10-25 18:39:26 +00:00 |
|
KDSBrowne
|
c49b72f926
|
fix mobile poll response view
|
2018-10-25 18:33:02 +00:00 |
|
Anton Georgiev
|
c80e379de6
|
Merge pull request #6104 from Tainan404/zoom-implementation
Add fit-to-width for html5
|
2018-10-25 14:31:29 -04:00 |
|
KDSBrowne
|
2b61b8a2a0
|
fix style conflict
|
2018-10-25 18:23:43 +00:00 |
|
KDSBrowne
|
188118d9ea
|
Merge branch 'test-merge-anton' into t
|
2018-10-25 18:19:25 +00:00 |
|
Anton Georgiev
|
14543bb478
|
adjust chat title
|
2018-10-25 18:03:25 +00: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
|
5d8c4dc909
|
change polling title color
|
2018-10-25 17:48:23 +00:00 |
|
KDSBrowne
|
da30345649
|
fix style issues after merge
|
2018-10-25 17:44:03 +00:00 |
|
KDSBrowne
|
95bb36df82
|
Merge remote-tracking branch 'Upstream/master' into start-poll-01
|
2018-10-25 17:25:26 +00:00 |
|
KDSBrowne
|
5c62507f0e
|
prevent offline users being displayed in live results
|
2018-10-25 17:20:32 +00:00 |
|
KDSBrowne
|
ec5af5b855
|
fix merge issues
|
2018-10-25 16:54:29 +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 |
|
KDSBrowne
|
de51ab6fd6
|
position polling in center screen for mobile
|
2018-10-25 16:07:24 +00:00 |
|
Anton Georgiev
|
ff837fdd09
|
drop unnecessary Boolean() wrapper
|
2018-10-25 15:20:37 +00:00 |
|
Oswaldo Acauan
|
41cfdaaf30
|
Fix colors and sizes
|
2018-10-25 10:46:31 -02:00 |
|
Tainan Felipe
|
ab064f47c9
|
fiz zoom when fit to width out
|
2018-10-24 16:50:49 -03:00 |
|
Oswaldo Acauan
|
458b2f442f
|
Merge branch 'html5-theming' of github.com:oswaldoacauan/bigbluebutton into css-variables
|
2018-10-24 17:32:21 -02:00 |
|
Oswaldo Acauan
|
1de297c1e2
|
Fix line-heights and convert scss calculations to calc()
|
2018-10-24 17:32:09 -02:00 |
|
Anton Georgiev
|
ef9f248607
|
Merge branch 'master' into html5-theming
|
2018-10-24 14:58:59 -04:00 |
|
Bobak Oftadeh
|
262bd32bc6
|
Cleaned up user-options component and container
|
2018-10-24 11:34:11 -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 |
|
Tainan Felipe
|
69e1404ed1
|
Fix intl
|
2018-10-24 14:54:19 -03:00 |
|
Oswaldo Acauan
|
8696b831d3
|
Change SCSS variables to CSS variables missed while merging with upstream
|
2018-10-24 15:10:15 -02:00 |
|
Tainan Felipe
|
7677d19159
|
Remove behavior that add opacity when hover the presentation
|
2018-10-24 14:09:32 -03:00 |
|
João Francisco Siebel
|
a42946658f
|
improve toolbar when have only one tool
|
2018-10-24 13:26:23 -03:00 |
|
Anton Georgiev
|
ffbc11162e
|
fixed linter errors
|
2018-10-24 15:33:39 +00:00 |
|
KDSBrowne
|
e951b9180f
|
prevent other menus covering polling options
|
2018-10-24 14:50:47 +00:00 |
|
KDSBrowne
|
9c3a21641b
|
prevent chat / poll pane being open at the same time
|
2018-10-24 14:29:51 +00:00 |
|
KDSBrowne
|
abd5e8a224
|
update styling / fix bugs
|
2018-10-24 14:17:13 +00:00 |
|
Anton Georgiev
|
e888f5dc14
|
removed dummy button examples visible without presentation
|
2018-10-24 14:01:07 +00:00 |
|
Anton Georgiev
|
74c51e37c8
|
drop obsolete || false check
|
2018-10-24 12:46:05 +00:00 |
|
Anton Georgiev
|
57dc55b559
|
drop metadata configs; use userdata configs for autoSwap
|
2018-10-23 20:44:17 +00:00 |
|
Tainan Felipe
|
2b5c9a32b4
|
Add intl
|
2018-10-23 17:34:09 -03:00 |
|