Commit Graph

1041 Commits

Author SHA1 Message Date
Ramon Souza
99c41ca79e remove unused code 2021-08-12 15:47:37 -03:00
Ramon Souza
4b2e60cdcc fix poll menu in actions bar 2021-08-12 15:42:02 -03:00
Anton Georgiev
773e8385af
Merge pull request #12970 from KDSBrowne/bbb-remaining-menus
Update Dropdowns To Menus
2021-08-12 14:38:04 -04:00
KDSBrowne
d9f9a94a7a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into bbb-remaining-menus 2021-08-11 02:44:51 +00:00
KDSBrowne
3663290397 update public chat / video list item dropdown to menu 2021-08-11 02:44:34 +00:00
KDSBrowne
6e1c000381 only show top divider with 2 or more presentations 2021-08-09 22:39:04 +00:00
Ramon Souza
f4df88bf8d fix screenshare with hidden presentation 2021-08-09 16:12:41 -03:00
Vitor Mateus De Almeida
145ca61d40 linting some files 2021-08-09 11:24:02 -03:00
KDSBrowne
773800cdc5 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into bbb-remaining-menus 2021-08-08 17:30:16 +00:00
KDSBrowne
f72e075472 restore shortcuts for menus 2021-08-08 17:22:01 +00:00
KDSBrowne
4e28cb0347 update actions / settings dropdown to menu 2021-08-08 17:13:47 +00:00
Vitor Mateus De Almeida
1b18977eac rename all NewLayout.. to Layout.. 2021-08-05 08:03:24 -03:00
Vitor Mateus De Almeida
abf089ae73 remove layout manager legacy 2021-08-05 01:22:07 -03:00
Ramon Souza
2ef6d30a01 fix actions bar size calculation - new layouts 2021-07-22 11:04:38 -03:00
Anton Georgiev
84324e0eff
Merge pull request #12781 from ramonlsouza/hide-presentation-new-lm
feat: Webcam area size change when presentation is hidden - new layouts
2021-07-19 16:25:38 -04:00
Ramon Souza
43eda61beb set presentation isOpen on toggleSwapLayout 2021-07-16 15:48:48 -03:00
Ramon Souza
c29bcad680 close breakout creation modal if user loses moderator status 2021-07-16 14:37:03 -03:00
Gustavo Trott
3052266e94 Removes duplicated code 2021-07-12 16:46:26 -03:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name 2021-07-12 16:31:38 -03:00
germanocaumo
2c262483d2 fix(poll): Respect maxCustom property in quick-polls
More than 5 answers are now of Custom type poll and answers passed directly.
Increase A-I slide options detection
2021-06-18 14:02:09 +00:00
germanocaumo
77dc1d603d fix: quick-polls error after merge 2021-06-17 13:02:04 +00:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
Ramon Souza
dd4ca6937d create breakout form improvements 2021-06-15 13:17:03 -03:00
Anton Georgiev
078c2da44f
Merge pull request #12560 from ramonlsouza/issue-12557
fix: add minimum duration for breakout room
2021-06-14 17:34:50 -04:00
Gustavo Trott
37dea2215b Translates dynamically breakout room Names when default name is being used 2021-06-14 16:59:27 -03:00
germanocaumo
a4fc9c1a27 fix(poll): remove wrong argument in quick-polls 2021-06-14 17:44:12 +00:00
Gustavo Trott
61b99b7f7b Adds possibility to give to breakout rooms a name 2021-06-11 16:06:56 -03:00
Ramon Souza
385bdf1568 add minimum duration for breakout room 2021-06-11 13:24:36 -03:00
germanocaumo
df504cf2d5 refactor(quick-poll): Remove unneeded code for poll answers
The answers are already translated in the UI based on type.
2021-06-08 13:26:07 +00:00
germanocaumo
0be7c6c9f5 fix(poll): fix client crash with A-F as options and quick-poll type 2021-06-07 19:21:21 +00:00
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
Tainan Felipe
baf7afc883 Decrease amount of imports in dropdown 2021-05-31 15:28:27 -03:00
germanocaumo
c213b88451 refactor(poll): improve poll types code
this also fixes certain poll type detection for other languages than english,
so that the correct poll type is sent in the events (they were being detected as custom)
2021-05-26 17:52:55 +00:00
Ramon Souza
69c1a7028d add padding to action bar dropdowns 2021-05-24 10:50:22 -03:00
Vitor Mateus De Almeida
41965d49ed Fix problem with slides with a quick poll 2021-05-20 12:12:08 -03:00
Vitor Mateus De Almeida
047b573d10 Fix auto resize when open/close panels 2021-05-19 19:29:03 -03:00
Vitor Mateus De Almeida
444b29a346 Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-05-19 11:54:22 -03:00
Vitor Mateus De Almeida
88a1edcc06 Fix userlist item button, Fix polling close button 2021-05-19 11:51:31 -03:00
Ramon Souza
098746d3c0 add setting to enable/disable raise hand action button 2021-05-18 13:39:09 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03:00
Ramon Souza
ffb067a8a3 fix action buttons visibility 2021-05-12 11:07:18 -03:00
KDSBrowne
383d01becf improve keyboard accessibility for br managment 2021-05-03 20:00:19 +00:00
Anton Georgiev
457492d611
Merge pull request #12263 from ramonlsouza/issue-12242
Change open presentation button position
2021-05-03 15:23:09 -04:00
Ramon Souza
cc5a9502f4 change open presentation icon position 2021-05-03 16:04:54 -03:00
Ramon Souza
9d590a74d3 remove unused imports 2021-05-03 09:24:07 -03:00
Vitor Mateus De Almeida
340e0ba052 fix layout broken after opne close shared notes 2021-04-26 20:04:34 -03:00
Ramon Souza
509d9c0936 Merge remote-tracking branch 'upstream/develop' into issue-12042 2021-04-22 08:45:06 -03:00
Anton Georgiev
ad19234fc6
Merge pull request #12059 from vitormateusalmeida/issue-11610
Fix layout doesn't update when screen is shared
2021-04-20 08:44:27 -04:00
Ramon Souza
419e5af2a6 fix usedId value 2021-04-19 17:16:05 -03:00
Ramon Souza
40c9d87f63 reduce component re-render on containers that use usersContext 2021-04-19 14:57:55 -03:00
Anton Georgiev
93aa62c283
Merge pull request #12078 from KDSBrowne/bbb-br-manage-access
Make Breakout Rooms User Assignment Keyboard Accessible
2021-04-19 11:22:16 -04:00
KDSBrowne
35d07deb18 remove unused import / event listeners on unmount 2021-04-19 11:18:34 +00:00
KDSBrowne
f46f7961e3 make breakout room assignment accessible via keyboard 2021-04-19 00:46:07 +00:00
Vitor Mateus De Almeida
573066756d Merge remote-tracking branch 'upstream/v2.3.x-release' into issue-11610 2021-04-16 18:05:26 -03:00
Vitor Mateus De Almeida
3374e638bb fix layout doesn't update when screen is shared 2021-04-16 18:02:47 -03:00
Ramon Souza
56c33ed36d add meetingId to userscontext 2021-04-15 09:12:21 -03:00
Ramon Souza
e7366485aa removing unused imports 2021-04-13 08:43:08 -03:00
Anton Georgiev
74a2a6683f
Merge pull request #11915 from daminebenq/add-raise-hand-test-spec
Add missing Connection Status and Hand raising specs
2021-04-09 10:15:03 -04:00
Anton Georgiev
3f8d619ef1
Merge pull request #11927 from PhMemmel/order-presentations-alphabetically
Update order of presentation lists
2021-04-09 08:48:13 -04:00
Anton Georgiev
5189abb225
Merge pull request #11911 from Tainan404/issue-11795
Fix client crashing because users object is missing
2021-04-08 12:30:01 -04:00
Ramon Souza
5f693eb0f6 presenter menu scrollable 2021-04-08 10:53:57 -03:00
Philipp Memmel
c20b8164ef update order of presentation lists 2021-04-07 17:11:17 +02:00
Anton Georgiev
7949563d25
Merge pull request #11892 from ramonlsouza/localized-quick-poll
Localized quick poll answers
2021-04-07 08:41:59 -04:00
Mohamed Amine Ben Salah
9a151fb4c2 Add raise hand test spec to user.test.js suite 2021-04-06 21:09:43 -03:00
Tainan Felipe
e4563defde Fix client crashing because users object is missing 2021-04-06 16:58:11 -03:00
Anton Georgiev
b699790251
Merge pull request #11773 from PhMemmel/reflect-hand-raised-state-in-button-style
Hand raise button now reflects hand raised state
2021-04-06 13:45:17 -04:00
Ramon Souza
3d6314012f localized quick poll answers 2021-04-05 14:50:50 -03:00
Ramon Souza
05a0d5afbf move browser info to helper + remove unused libs 2021-04-01 08:14:24 -03:00
Ramon Souza
9218262e0a all device info moved to helper 2021-03-31 14:13:36 -03:00
Anton Georgiev
85a84f7cbf
Revert "Change browser detection library from browser-detect to bowser" 2021-03-30 13:16:10 -04:00
Anton Georgiev
027658ac5c
Merge pull request #11806 from ramonlsouza/mobile-detect
Change browser detection library from browser-detect to bowser
2021-03-30 12:28:13 -04:00
Ramon Souza
3fa193005b change browser detection lib to bowser 2021-03-30 09:53:47 -03:00
KDSBrowne
f26cee6d91 fix raise hand button overlapping others 2021-03-27 17:40:38 +00:00
Philipp Memmel
f05566d946 hand raise button now reflects hand raised state 2021-03-27 14:26:59 +01:00
Anton Georgiev
70ef985fde
Merge pull request #11703 from KDSBrowne/bbb-move-raiseHand
Move Raise Hand Functionality To Actions Bar Button
2021-03-22 14:24:32 -04:00
KDSBrowne
d89e6a8c3a move debounce to service 2021-03-22 18:02:31 +00:00
KDSBrowne
8e9718eb0b add debounce to raise hand toggle 2021-03-22 16:08:53 +00:00
KDSBrowne
6f5b9ceff5 adjust actions bar buttons position on mobile 2021-03-22 15:50:35 +00:00
Ramon Souza
34dc5ca79f increasing presentation menu width 2021-03-22 11:42:13 -03:00
KDSBrowne
4473fa084b add lower hand label 2021-03-21 23:56:00 +00:00
KDSBrowne
132dfb02d9 add raise hand shortcut and help entry 2021-03-21 23:47:15 +00:00
KDSBrowne
676abd1f85 move raise hand functionality to actions bar 2021-03-21 17:06:16 +00:00
Ramon Souza
3715266883 add selectRandomUser flag 2021-03-19 15:54:54 -03:00
prlanzarin
35f519206b Revert additional indentation to actions-bar component
I must have messed this up in the 2.2 - 2.3 merge or with vim somehow, mea culpa
2021-03-12 01:47:05 +00:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Ramon Souza
2923ea1641 fix 'restore presentation' button when presentation is disabled 2021-03-08 09:33:25 -03:00
Ramon Souza
47a21dfd98 quick poll fix 2021-03-04 13:34:23 -03:00
Mohamed Amine Ben Salah
2c9d8e4380 updates and adds specifications for polling 2021-03-01 18:47:08 -03:00
Ramon Souza
a3780209f3 Add property to settings.yml to enable/disable breakout invitations to moderators 2021-02-08 14:40:03 -03:00
Ramon Souza
f649f67655 current user identification on breakout room creation 2021-02-04 10:59:13 -03:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
Anton Georgiev
45c1ff6e40
Merge pull request #11175 from MaximKhlobystov/select-random-user
Presenter selecting a random viewer
2021-01-22 15:31:00 -05:00
Ramon Souza
6f9d60c520 code style 2021-01-20 11:39:47 -03:00
Ramon Souza
fe12208d6c better fix for issue #11181 2021-01-20 11:28:37 -03:00
prlanzarin
0a36da1e46 screensharing: remake error locales, split them into error classes
There are new locale strings for screensharing errors with a new format (Code X. #What to do) to make it easier for the end user
2021-01-13 09:43:28 -03:00
prlanzarin
6f16154035 screenshare: logging/trailing lines cleanup 2021-01-13 09:04:46 -03:00
Anton Georgiev
4f14086f72 set default value for isPresenter in case user removed 2020-12-18 15:37:45 +00:00
prlanzarin
c247bf46e7 screenshare: cleanup actions-bar onFailure callback 2020-12-15 17:45:57 +00:00
prlanzarin
1383ab4def screenshare/html5: rewrite most of the client side code
Added new SFU broker for screen sharing

Removed kurento-extension entirely

Added inbound and outbound reconnection procedures

Improve UI responsiveness when sharing

Add reconnection UI states

Redo error handling

Refactor actions-bar screen share components. Make it smarter with less prop drilling and less re-rendering. Also more readable. Still work to do in that I think

Add a connection retry procedure for screen presenters when they are sharing; try a configurable amount of times when failure is triggered, with configurable min and max reconn timeouts and timeout increase factor

Make local preview attachment smarter

ADD PARTIAL SUPPORT FOR AUDIO SHARING VIA SCREEN SHARING WITH GET DISPLAY MEDIA, RECORDING STILL NOT SUPPORTED!!!
2020-12-09 22:00:54 +00:00
Anton Georgiev
3930e164e6
Merge branch 'develop' into debug-window 2020-12-08 16:16:24 -05:00
KDSBrowne
42cdc51710 add z-index to actionbar elements 2020-11-06 20:48:06 +00:00
KDSBrowne
2f46c1fd28 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select 2020-11-02 16:16:29 +00:00
Joao Siebel
be8421db3c Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-21 13:57:17 -03:00
Anton Georgiev
e18d94dd23 resolve media/component issues after 2.2.28 merge 2020-10-21 14:50:06 +00:00
Vitor Mateus De Almeida
69eb26f281 Merge remote-tracking branch 'upstream/develop' into debug-window 2020-09-22 09:37:42 -03:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
mvasylenko
7ba421cc4a Configurable max number of breakout rooms
Use this wisely: breakoutRoomLimit parameter was introduced to controll max number of breakout rooms.
2020-09-10 11:59:21 -03:00
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
Joao Siebel
6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager 2020-09-08 16:36:01 -03:00
Vitor Mateus De Almeida
d26de05e9f Merge remote-tracking branch 'upstream/develop' into debug-window 2020-09-03 20:36:29 -03:00
Vitor Mateus De Almeida
849bb9a469 Add debug window 2020-09-03 20:35:57 -03:00
KDSBrowne
b33b5f3f01 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-remove-css-variable-duplicates 2020-09-01 21:17:25 +00:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
KDSBrowne
e9d4f8e42c adds a select random user feature for presenter 2020-08-28 17:23:27 +00:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -03:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Tainan Felipe
1fedde7d8f Remove unsafe lifecycle from all dropdown related components 2020-08-07 17:43:33 -03:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2
Add Layout Context and Layout Manager
2020-07-29 10:00:59 -04:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Vitor Mateus
ecc8f4a056 wip 2020-07-20 16:16:39 -03:00
Vitor Mateus
297154f78a The presentation gets the size from the layout manager 2020-07-20 16:02:53 -03:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
KDSBrowne
0cb1dc0a65 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-06-25 19:20:18 +00:00
Vitor Mateus
a1d4311cec wip 2020-06-04 20:01:17 -03:00
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
KDSBrowne
3f79eefb18 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-05-25 13:10:50 +00:00
Anton Georgiev
b6524e66c7
Fix typo closing parenthesis 2020-05-21 15:11:11 -04:00
Anton Georgiev
8609418cda
Merge pull request #9630 from KDSBrowne/issue-9543
Change prompt message when screen share not supported
2020-05-21 14:58:07 -04:00
KDSBrowne
f327f31e71 update not supported string to be browser agnostic (screen share) 2020-05-15 13:10:52 +00:00
Paulo Lanzarin
7541395781
screenshare: fix safari availability check 2020-05-14 15:23:07 -03:00
prlanzarin
e875408f8d screenshare: add support on Safari 12.1+ and make constraints configurable
This adds support for screensharing on Safari 12.1+ or whichever has getDisplayMedia enabled

To be conservative and backwards compatible, I`ve maintained the current gUM-based code available as a fallback for those still using older versions of FF or Chrome

Made screenshare constraints configurable. The constraints config will be piped directly to gDM, so it`s just a regular gDM constraint dictionary
2020-05-14 16:54:54 +00:00
Tainan Felipe
851189f3c1 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-11 11:42:03 -03:00
Tainan Felipe
450c3bdd47 Replace legacy react lifecycle in the action dropdown 2020-05-08 08:17:34 -03:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
KDSBrowne
1de9f2bfec show ss btn on safari (when selected display warning modal) 2020-04-13 15:31:16 +00:00
KDSBrowne
0bd6687387 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-04-01 22:55:52 +00:00
KDSBrowne
20cd9f539f reduce re-renders of actionbar / show all uploads dropped separately in toast 2020-04-01 22:54:47 +00:00
Vitor Mateus
5b9aafd0d3 The presentation gets the size from the layout manager 2020-03-25 09:52:23 -03:00
Mohamed Amine Ben Salah
23182917ee adds poll notification test spec 2020-03-20 11:42:04 -03:00
KDSBrowne
ab176c3e24 replace map with filter / move intl out of container / rename session variable / fix alignment 2020-03-10 12:58:14 +00:00
Anton Georgiev
0958e422aa
Merge pull request #8485 from KDSBrowne/move-quick-poll
Move quick poll button to presentation tool bar
2020-03-09 18:05:32 -04:00
KDSBrowne
c856a241d4 remove unused button className 2020-03-09 21:33:56 +00:00
KDSBrowne
4965fcc2aa Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-03-09 21:14:13 +00:00
Chad Pilkey
e4b522e941 fix client crash race condition with presentation pods 2020-03-09 18:10:46 +00:00
KDSBrowne
3881ce2410 fix quickpoll dropdown menu not displaying corretly on mobile 2020-03-04 18:46:45 +00:00
KDSBrowne
62d50a6bad add picture dropzone / bug fixes 2020-02-25 19:29:14 +00:00
Mohamed Amine Ben Salah
d2db75e9bb adds join Breakoutrooms Test Spec 2020-02-21 15:06:05 -03:00
KDSBrowne
a2655d1027 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-02-13 16:27:32 +00:00
KDSBrowne
29c69b47a5 unblock modal on presentation upload 2020-02-13 16:24:01 +00:00
KDSBrowne
b815272708 disable quick poll when active poll / make menu item use full width 2020-01-29 18:36:17 +00:00
Anton Georgiev
201a302826
Merge pull request #8552 from KDSBrowne/actions-pres-toggle
Add ability to switch presentations via actions menu (Presenter)
2020-01-28 12:17:12 -05:00
KDSBrowne
4fd0ae54d0 only show presentation toggle options to presenter 2020-01-27 15:48:35 +00:00
KDSBrowne
41e8e882e0 allow presentation toggle from actions btn 2020-01-25 01:02:36 +00:00
Tainan Felipe
11a8fb377b Show user who joined on breakout room in the invitation modal 2020-01-22 12:31:53 -03:00
KDSBrowne
d417050555 fix button outline displaying when no poll detected 2020-01-14 02:29:31 +00:00
KDSBrowne
5c6f94b4e9 remove dropdown menu for single quick poll 2020-01-10 20:18:43 +00:00
KDSBrowne
c30e58ea27 move quick poll from actions bar to presentation toolbar 2020-01-10 19:00:06 +00:00
Pedro Beschorner Marin
8e129fb961 Included multiple cameras UI 2019-12-18 14:44:56 -03:00
Pedro Beschorner Marin
3b591a086b Unified video providers 2019-12-10 09:02:16 -03:00
Pedro Beschorner Marin
4eb67c12be Multiple webcams first commit 2019-12-10 08:21:19 -03:00
Anton Georgiev
c2d90b1d2d
Merge pull request #8323 from KDSBrowne/issue-8290
Fix restore presentation button overlap (Mobile - Presenter)
2019-12-09 15:26:32 -05:00
KDSBrowne
de48d26106 fix padding for RTL layout 2019-11-12 15:32:11 +00:00
KDSBrowne
2024918a70 fix restore presentation btn overlap on mobile for presenter 2019-11-07 17:33:03 +00:00
Anton Georgiev
43f0ec01a4 accommodate for configuration without shortcuts - do not show error 2019-11-05 16:36:03 -05:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00
KDSBrowne
919a84d1d6 fix quick poll btn placement 2019-10-26 13:19:13 +00:00
Chad Pilkey
9b0b92b6a2
Merge pull request #8174 from KDSBrowne/issue-8160
Fix actions button misplacement in RTL mode
2019-10-21 17:05:47 -04:00
prlanzarin
3ac4acde6f Remove screensharing option from Safari by UA checks 2019-10-04 17:10:30 +00:00
KDSBrowne
6a478d1409 fix actions button misplacement in RTL 2019-10-02 16:51:53 +00:00
Chad Pilkey
1695352300 Merge remote-tracking branch 'upstream/master' into fix-breakout-start-stop-notify 2019-09-27 22:40:38 +00:00
Chad Pilkey
0a9854aa59 fix issues related to breakouts start/stop and page reload 2019-09-18 13:11:25 -07:00
Lucas Zawacki
5dd46f8f48 Fix video swap when there's no presentation and/or screenshare/external video 2019-09-17 16:55:52 -03:00
Lucas Zawacki
f548281a07 Fix random swappings happening outside of the media service 2019-09-16 19:06:02 -03:00
Anton Georgiev
620fe746da
Merge pull request #8098 from antobinary/external-video-player
Use react-player for external video playback and add arc player support
2019-09-12 08:18:17 -04:00
Anton Georgiev
43c0670ed8 Merge branch 'new-arc-player' of github.com:lfzawacki/bigbluebutton into external-video-player 2019-09-10 16:35:50 -04:00
prlanzarin
7779a5e3a9 Display error toasts for screensharing, improve logs a bit more 2019-09-10 16:20:40 +00:00
Anton Georgiev
03653df5fb obtain actions from container closer to where used 2019-09-06 18:01:12 -04:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
Anton Georgiev
c5856d43c8 moved static code outside of tracker 2019-09-04 14:32:58 -04:00
Anton Georgiev
f9efd8db96 remove unnecessary prop isBreakoutRoom 2019-08-29 12:32:29 -04:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00
Anton Georgiev
d4ac10d4b5
Merge pull request #8019 from jfsiebel/breakout-random-assign
Fix randomly assign problem in breakout rooms
2019-08-28 15:14:41 -04:00
Anton Georgiev
cdb03042ee
Merge pull request #7952 from KDSBrowne/issue-7148
Reduce chance of text Area displaying invisible border
2019-08-28 15:13:00 -04:00
Joao Siebel
b8ec29d8c7 Fix randomly assign problem in breakout rooms
The problem was caused because of PureComponent shallow
comparison, the users list in state are not changing his
reference

close #7905
2019-08-28 12:56:56 -03:00
Lucas Zawacki
546f4cdac5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-arc-player 2019-08-27 15:09:40 -03:00
Tainan Felipe
22d3708690 Remove the toggleRecording of the props 2019-08-21 15:43:10 -03:00
Tainan Felipe
932c5bf58c Fix nav bar performance issue and move recordProp to own collection 2019-08-21 14:42:37 -03:00
KDSBrowne
74ac34c407 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7148 2019-08-19 13:44:36 +00:00
Joao Siebel
9072799162 Change alert sound for screen share end
Also fix a problem with the screen share alert playing even when
no screen share was running

close #7911
2019-08-16 16:30:33 -03:00
Diego Benetti
c4462c4cb0 Fixes errors and improves parameters setting proccess 2019-08-02 15:38:38 -03:00
Anton Georgiev
311ad5706f
Merge pull request #7750 from diegobenetti/issue6956-turn-webcams-fullscreen-when-no-presentation
Turn webcams fullscreen when no presentation is selected
2019-08-01 13:34:35 -04:00
Diego Benetti
60919eb418 Fixes actionsBar component to check video sharing and video broadcasting 2019-08-01 13:30:11 -03:00
Anton Georgiev
2bf8fb5cca minor optimization using Fields in miniMongo 2019-07-24 17:59:04 +00:00
Diego Benetti
f13239674b Changes other parameters to the new pattern 2019-07-24 14:04:46 -03:00
Lucas Zawacki
a2068d06b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-react-player 2019-07-16 17:33:27 -03:00
Diego Benetti
aa0c777cee Parameter enableExternalVideo changed to externalVideoPlayer 2019-07-15 16:31:28 -03:00
Diego Benetti
f7a58c3279 Changes the position of the parameter enableExternalVideo in the settings.yml file 2019-07-15 13:26:57 -03:00
Lucas Fialho Zawacki
e98333c45e Use react-player for external video 2019-07-12 20:08:55 +00:00
Diego Benetti
cc6d4ecd41
Merge branch 'master' into issue6956-turn-webcams-fullscreen-when-no-presentation 2019-07-08 14:01:32 -03:00
Diego Benetti
0c2aefa45a Swaps layout when meeting has no presentation 2019-07-08 11:33:32 -03:00
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
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
Maxim Khlobystov
b0cfc662c1 Fix the selectors in presentation tests 2018-11-30 15:56:21 -05:00
Tainan Felipe
d1ae927f6f Add warn message and open the breakouts room when create 2018-11-29 17:47:04 -02:00
Tainan Felipe
fee219ed07 Fix console warning 2018-11-29 14:58:39 -02: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
Tainan Felipe
27e012ac56 Add drag and drop grid to sort user by room 2018-11-27 10:44:22 -02: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
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
KDSBrowne
149b4f091a move render functions from app to panel-manager 2018-11-20 15:28:00 +00:00
KDSBrowne
99e15b20ba add panel manager component 2018-11-19 23:29:48 +00:00
Anton Georgiev
e3729a7bf3 better updates 2018-11-12 22:09:04 +00:00
Anton Georgiev
98ac77dc03 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-12 17:01:06 +00: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
Oswaldo Acauan
a8c1df7f22 Upgrade all npm and meteor packages and fix compatibility issues introduced 2018-11-06 12:59:53 -02:00
KDSBrowne
c552b3522c prevent breakout and poll pane both open 2018-11-05 17:52:06 +00:00
Tainan Felipe
fd8a63fbbb Change the method permissions for moderator 2018-11-05 10:27:56 -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
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
Joao Siebel
97a0a2a13b configurable shortcuts available. close #6169 2018-10-31 15:51:56 -03:00
Tainan Felipe
07d89a0132 Add intl to breakout room name 2018-10-29 16:29:45 -03:00
KDSBrowne
ee73ec4dd3 remove left over react-router code 2018-10-28 17:02:54 +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
KDSBrowne
6a16b379d7 fix actions poll toggle not working when userlist is closed 2018-10-26 12:54:35 +00:00
KDSBrowne
8f24fcfd01 make userlist-poll btn toggle menu 2018-10-26 12:37:29 +00:00
KDSBrowne
3ced879e41 clean up togglePollMenu() 2018-10-25 22:41:45 +00:00
KDSBrowne
3f521a6f6a Merge branch 'html5-theming' into test-merge-anton 2018-10-25 16:33:56 +00:00
KDSBrowne
abd5e8a224 update styling / fix bugs 2018-10-24 14:17:13 +00:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -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
KDSBrowne
c8b993a3a9 remove use of router in polling 2018-10-18 14:31:17 +00:00
KDSBrowne
26404c87f7 remove button color type 'primary-outlined' 2018-10-02 23:08:32 +00:00
KDSBrowne
b241b93b8a replace indexOf() with includes() 2018-10-02 20:30:32 +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