Commit Graph

582 Commits

Author SHA1 Message Date
Fred Dixon
aedb653fd5
Merge pull request #7738 from KDSBrowne/closed-captioning-access
Fix accessibility issues in closed captions
2019-07-06 22:50:28 -04:00
KDSBrowne
55b1ca8c77 fix accessibility issues in captions reader menu 2019-07-05 19:44:12 +00:00
Anton Georgiev
f095f04fd3
Merge pull request #7702 from capilkey/fix-user-roles
Clean up user roles
2019-07-04 14:57:19 -04:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Anton Georgiev
ed264351d0
Merge pull request #7709 from antobinary/logging-structure
Logging structure - add extraInfo: {}
2019-07-02 17:08:48 -04:00
Anton Georgiev
25ac147924
Merge pull request #7710 from KDSBrowne/issue-7705
Add enabled poll property in settings.yml
2019-07-02 16:04:42 -04:00
KDSBrowne
c580ef3199 fix visible take presenter option for current presenter 2019-07-02 18:03:33 +00:00
Anton Georgiev
fb1c294312 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logging-structure 2019-07-02 15:41:57 +00:00
KDSBrowne
ba9c9c431a add enabled poll prop in settings.yml 2019-07-02 14:54:37 +00:00
Anton Georgiev
c79ec06cf7
Merge pull request #7636 from diegobenetti/issue7325-autoswaplayout-screenshare
Fixes performance bug when youtube video is shared
2019-07-02 10:16:46 -04:00
Anton Georgiev
3fcb95ab44 log structure {logCode, extraInfo}, comment 2019-06-28 21:45:50 +00:00
Chad Pilkey
f0930e2d23 refactor user role management to follow proper format 2019-06-28 21:02:12 +00:00
Anton Georgiev
6575ee3f48
Merge pull request #7626 from Tainan404/issue-7517
Fix DOM injection in number of rooms select
2019-06-26 15:36:57 -04:00
Tainan Felipe
720208daae Add less than minimum verification 2019-06-26 16:27:51 -03:00
Tainan Felipe
4fdc4856b2 Change zero to min breakout rooms 2019-06-26 16:25:07 -03:00
Tainan Felipe
fc9c088163 Disable random users in create breakout when number of rooms is invalid 2019-06-26 15:01:32 -03:00
Tainan Felipe
4c31b5e4e0 Remove breakout room grid when number of webcams is invalid 2019-06-26 14:43:03 -03:00
Anton Georgiev
a66aa70707
Merge branch 'master' into issue7325-autoswaplayout-screenshare 2019-06-26 12:40:30 -04:00
Joao Siebel
8f0783d34f update variable name 2019-06-26 13:29:34 -03:00
Diego Benetti
0055634ce7 Fixes the condition to render the toggle presentation button 2019-06-25 11:06:15 -03:00
Joao Siebel
6aed3fd037 disabled other UI items 2019-06-24 15:06:02 -03:00
Joao Siebel
cf7dec7cb1 disabled screen share button when disconnected 2019-06-21 16:51:26 -03:00
Joao Siebel
512ceaa8e0 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-06-21 15:03:37 -03:00
Anton Georgiev
5db531ed8d move cc consumer button to the left in action bar 2019-06-20 15:13:45 +00:00
Anton Georgiev
607b640cb6 modified styles and selector def values cc menus 2019-06-20 15:13:36 +00:00
Anton Georgiev
bb370c9304 move "write cc" trigger to user-options menu 2019-06-20 15:13:26 +00:00
Tainan Felipe
a319ed8e57 Fix DOM injection in number of rooms select 2019-06-14 10:54:59 -03:00
Chad Pilkey
87eef25830 add comments for breakout room assign randomizer 2019-06-13 10:36:22 -07:00
Chad Pilkey
3a9076338f improve breakout room randomizer 2019-06-12 15:58:56 -07:00
Anton Georgiev
2abd68c130 cc icon, first round cc ui changes 2019-06-12 19:28:00 +00:00
Joao Siebel
c6c8ca400b Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-06-12 15:56:14 -03:00
Joao Siebel
7f7845c47b disable some UI actions when meteor is down 2019-06-12 15:40:58 -03:00
Joao Siebel
6c9e0def4b exit from audio when not connected and disable button 2019-06-03 11:28:05 -03:00
Diego Benetti
e520797ddd Merge remote-tracking branch 'upstream/master' into issue7390-datasaving-screenshare 2019-05-31 10:23:50 -03:00
Anton Georgiev
ac36732849
Merge branch 'master' into closed-captions-prototype 2019-05-29 11:51:45 -04:00
Anton Georgiev
6adc608fd0 closed captions linting part3 2019-05-29 14:31:27 +00:00
Diego Benetti
b9eb5cca1f Locks screenshare option when datasaving screenshare setting is disabled 2019-05-28 17:46:29 -03:00
Anton Georgiev
28f3329a16 improve mobile view for reader-menu 2019-05-28 19:24:06 +00:00
KDSBrowne
73ece483cf add time units to aria labels for + - btns 2019-05-24 16:53:58 +00:00
Anton Georgiev
6aa8546575
Use polling icon for Start Polling 2019-05-23 17:13:52 -04:00
Pedro Beschorner Marin
741122df96 Closed captions cleanup 2019-05-23 11:51:01 -03:00
Pedro Beschorner Marin
a37ae9cb70 Better management of captions activation 2019-05-22 18:33:20 -03:00
Pedro Beschorner Marin
34b39a2b0a Closed captions prototype in a big commit 2019-05-22 18:33:20 -03:00
Tainan Felipe
8ee73c37cc ignore dial-in-user in create breakout room list 2019-05-22 17:06:21 -03:00
Ghazi Triki
28132b5b25 Fix media and action bar styles for RTL. 2019-05-15 18:04:00 +01:00
Ghazi Triki
1f6326f7fd Change layout direction for RTL languages.
Update styles for RTL layout.
2019-05-14 14:17:19 +01:00
KDSBrowne
8566b66132 add time to + and - room time buttons 2019-05-08 13:19:43 +00:00
KDSBrowne
f4db35234b fix contrast issue in create breakout room modal 2019-05-07 19:13:03 +00:00
Anton Georgiev
47b90cf0e3
Merge branch 'master' into set-lock-settings-on-meeting-create 2019-05-03 10:46:42 -04:00
Anton Georgiev
dd949f6ee5
Merge pull request #7326 from Tainan404/issue-7292
Fix create breakout room missing some users.
2019-05-02 11:45:22 -04:00
Pedro Beschorner Marin
a0590c12ea Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create 2019-05-02 11:05:34 -03:00
Tainan Felipe
10c4e8ee88 Fix create breakout room missing some users 2019-04-30 16:24:04 -03:00
Tainan Felipe
25047f57a9 Remove stop video button of video modal 2019-04-24 14:19:35 -03:00
KDSBrowne
ea711def9e move screenshare alert to service / fit audio alert on meeting end 2019-04-15 21:39:07 +00:00
KDSBrowne
009f55e7a5 move audio alert to a function 2019-04-15 15:07:01 +00:00
Pedro Beschorner Marin
fb51bc15d9 Adapted breakout room record checkbox to use record value from props 2019-04-15 10:50:27 -03:00
KDSBrowne
a90c39af3f add screen share off sound notification 2019-04-14 23:27:18 +00:00
Tainan Felipe
792dc1a553 Add record checkbox for allow record breakout room 2019-04-12 14:00:15 -03:00
Pedro Beschorner Marin
87435c515c Merge remote-tracking branch 'master' into set-lock-settings-on-meeting-create 2019-04-12 13:58:58 -03:00
Pedro Beschorner Marin
9579b6086d Disabling breakout rooms on HTML5 client based on breakoutProps 2019-04-10 11:58:34 -03:00
Tainan Felipe
b4062b5056 Open breakout room in new tab automatically when request new join url 2019-04-04 14:40:07 -03:00
KDSBrowne
07ec47f2ef fix Actions Youtube option not working 2019-04-02 18:57:29 +00:00
Chad Pilkey
51c6c65624
Merge pull request #7089 from KDSBrowne/2.2-Imp-poll-result
Improvements to poll panel and options
2019-04-02 13:45:07 -04:00
Chad Pilkey
b18c05debd
Merge pull request #7093 from KDSBrowne/2.2-Imp-quick-poll
Improvements to quick poll menu options
2019-04-01 17:07:15 -04:00
bobakoftadeh
b266fb11b4 Remove breakout room option from actions-dropdown 2019-03-28 21:39:23 +00:00
KDSBrowne
2e0e2a98a7 fix for issue #6682 / make poll panel resizable 2019-03-28 15:58:10 +00:00
KDSBrowne
1b8ff2f9fe add improvements suggested in PR #6838 2019-03-24 17:28:01 +00:00
Chad Pilkey
7ade56cb2c fix button outlines and clean up video button and video preview 2019-03-22 15:45:44 -07:00
Chad Pilkey
d3656ef022 clean up of the buttons. simplified and reduced 2019-03-19 10:11:48 -07:00
KDSBrowne
341ca37add fix for issue #7027 2019-03-14 19:34:53 +00:00
Anton Georgiev
718c32a615
Merge pull request #6889 from KDSBrowne/2.2-Edge-support-01
Fix whiteboard toolbar icons not rendering
2019-03-07 14:06:14 -05: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
57afed26a1 Fix starting breakout room with null duration value 2019-03-06 17:22:20 -03:00
Anton Georgiev
ea904c9111
Set default breakout duration to 15 mins 2019-03-06 12:04:37 -05:00
KDSBrowne
761c11581b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-Edge-support-01 2019-03-05 02:52:49 +00:00
Anton Georgiev
aac229b833
Merge pull request #6838 from gustavotrott/quick-poll-implement
Quick poll implement
2019-03-04 08:53:18 -05:00
Tainan Felipe
8801842289 Fix breakoutRoom items don't appearing 2019-02-26 17:35:39 -03:00
Gustavo Trott
9eaec3bfba Avoid error when quickPollOptions is undefined 2019-02-26 09:46:40 -03:00
Gustavo Trott
c6b725a36b Resolve conflicts 2019-02-25 09:24:00 -03:00
Gustavo Trott
3f21c82330 implement quick poll feature 2019-02-21 18:01:39 -03:00
Anton Georgiev
f896924490
Merge pull request #6791 from jfsiebel/share-video-label
Update share youtube video label
2019-02-21 12:32:15 -05:00
Anton Georgiev
6cbac32a83
Merge pull request #6813 from Tainan404/issue-6666
Change flat function to reduce for compatibility with EDGE
2019-02-20 13:26:21 -05:00
Tainan Felipe
57f09f1e8e Change flat function to reduce for compatiblite with EDGE 2019-02-20 09:38:15 -03: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
Joao Siebel
cc7dccb4ba update labels 2019-02-15 15:36:28 -02:00
Joao Siebel
78f03f1b32 Update action label when a video is already been shared. close #6604 2019-02-15 15:32:03 -02:00
Anton Georgiev
101cf6af19
Merge pull request #6699 from pedrobmarin/fixes-6667
Reset to default view if screenshare or sync'ed video is initiated
2019-02-12 15:25:25 -05:00
Anton Georgiev
51e3cac2ff
Merge pull request #6761 from capilkey/fix-html5-ismoderator-check
Fix ActionBar moderator check
2019-02-12 14:30:23 -05:00
Chad Pilkey
b7ab7d2306 fix actionbar moderator check 2019-02-11 15:35:36 -08:00
Pedro Beschorner Marin
882026497f
Merge branch 'master' into fixes-6667 2019-02-08 16:29:32 -02:00
Tainan Felipe
1c03f9572c Add ^ to regExp 2019-02-08 10:05:29 -02:00
Anton Georgiev
12a880b9bd recording toggle - allow clicking on the text; restyling 2019-02-07 22:49:54 +00:00
Tainan Felipe
189d788744 Add verification for moderator and comments explaning pipe 2019-02-07 17:40:27 -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
6b1db968d2
Merge pull request #6686 from KDSBrowne/2.2-accessibility-update-02
Improve create breakoutroom modal accessibility
2019-02-06 11:52:43 -05:00
Anton Georgiev
cd531f91ff
Merge pull request #6702 from MaximKhlobystov/html5-logs
Improve logging
2019-02-01 16:03:23 -05:00
Anton Georgiev
5447037dcd
Update bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx
Co-Authored-By: MaximKhlobystov <MaximKhlobystov@users.noreply.github.com>
2019-02-01 16:02:55 -05:00
Maxim Khlobystov
b86a990612 Add logCode and build number to log messages 2019-02-01 14:12:06 -05:00
Pedro Beschorner Marin
5ae4182b2f Swap back the layout if screenshare or external video starts 2019-02-01 13:32:43 -02:00
KDSBrowne
ba94cbc782 remove htmlFor attribute from div element 2019-01-30 15:21:53 +00:00
KDSBrowne
f602611e44 improve create breakoutroom modal accessibility / fix pre-existing lint errors 2019-01-30 02:15:01 +00: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
Anton Georgiev
38afdcf22b
Merge pull request #6640 from pedrobmarin/master-presentation-ui
New UI for presentation/video swap and fullscreen buttons
2019-01-28 12:33:47 -05:00
Tainan Felipe
f1221b89e9 Allow start breakout rooms without users on rooms 2019-01-28 15:04:32 -02:00
Pedro Beschorner Marin
5b760b46ef Fixed share video button for locked users 2019-01-28 11:24: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
KDSBrowne
03dbc4de14 ensure unique key for dropdown element 2019-01-21 16:53:13 +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
0190ef4528 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logout-endmeeting-menu 2019-01-17 18:53:32 +00:00
Anton Georgiev
ff3898224b
Merge branch 'master' into master-presentation-ui 2019-01-16 17:33:29 -05:00
KDSBrowne
ec1d7255ab Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-add-create-br-to-manage-user-menu 2019-01-16 22:22:17 +00:00
Tainan Felipe
471730ad88 Exclude moderator in the Randomly Assign 2019-01-16 16:58:03 -02:00
Tainan Felipe
9054dbf8db Clean up code for best reading 2019-01-16 15:41:21 -02:00
Lucas Zawacki
69c89cb555 Fix some linter errors and add translation 2019-01-16 13:50:24 -03:00
Tainan Felipe
f1fb776913 Remove console.log 2019-01-16 14:36:32 -02:00
Lucas Zawacki
9b2bc7c219 Correctly unmount youtube player area 2019-01-16 10:40:49 -03:00
Lucas Zawacki
e883d3a2b0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui 2019-01-15 10:31:12 -03:00
Lucas Zawacki
2c98ecb2b8 Aesthetic fixes to buttons 2019-01-15 10:16:01 -03:00
Lucas Zawacki
550bbcd492 Share synchronized youtube video in presentation area 2019-01-14 14:40:27 -03:00
Tainan Felipe
3ccddd60d5 Remove left overs from merge 2019-01-14 10:23:41 -02:00
Tainan Felipe
0918cc4084 Merge remote-tracking branch 'upstream/master' into issue-6392 2019-01-14 09:30:59 -02:00
KDSBrowne
6205059070 edit formatted string / use ternary operator / omit passing Auth.userId 2019-01-11 19:15:31 +00:00
KDSBrowne
484403f4c1 fix console error for array elements missing keys 2019-01-10 18:51:19 +00:00
KDSBrowne
f11fed7bd7 add take presenter role to actions menu 2019-01-10 16:10:45 +00:00
Bobak Oftadeh
09147faaac Fixed conflicts after merge 2019-01-03 20:50:43 +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
Lucas Zawacki
094a0e4f3e Don't use camera button for swap anymore 2019-01-02 17:31:23 -03:00
Lucas Zawacki
6101ca5c13 Close presentation via a button in the top corner 2019-01-02 16:08:33 -03: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
Vitor Mateus
fe63234dbb Fix proptype warnings 2018-12-20 17:39:04 -02:00
Tainan Felipe
2b74ed9d4f Merge remote-tracking branch 'upstream/master' into issue-6260 2018-12-19 16:58:52 -02:00
Anton Georgiev
85d2e162c5
Merge pull request #6404 from Tainan404/issue-6261
Add mobile version to sort user on create breakout rooms
2018-12-19 13:40:07 -05:00
Tainan Felipe
ce974d0740 Fix linter errors 2018-12-19 15:08:01 -02:00
KDSBrowne
86c7e745c5 fix lint errors 2018-12-18 15:15:51 +00:00
Tainan Felipe
ff44815bdc Remove useless code 2018-12-17 13:48:31 -02:00
Tainan Felipe
ee7eb8f582 Add free join checkbox to render 2018-12-17 13:41:50 -02:00
Tainan Felipe
b7f5a1d73b Add random assignment feature 2018-12-17 11:48:42 -02:00
Tainan Felipe
1577f074b1 Remove left over from merge 2018-12-17 08:33:41 -02: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
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
KDSBrowne
8b30fe00b3 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-10 02:12:42 +00:00