Commit Graph

272 Commits

Author SHA1 Message Date
KDSBrowne
6e1c000381 only show top divider with 2 or more presentations 2021-08-09 22:39:04 +00: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
Tainan Felipe
baf7afc883 Decrease amount of imports in dropdown 2021-05-31 15:28:27 -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
88a1edcc06 Fix userlist item button, Fix polling close button 2021-05-19 11:51:31 -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
Vitor Mateus De Almeida
340e0ba052 fix layout broken after opne close shared notes 2021-04-26 20:04:34 -03: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
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
Ramon Souza
3715266883 add selectRandomUser flag 2021-03-19 15:54:54 -03: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
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
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
KDSBrowne
e9d4f8e42c adds a select random user feature for presenter 2020-08-28 17:23:27 +00:00
Tainan Felipe
1fedde7d8f Remove unsafe lifecycle from all dropdown related components 2020-08-07 17:43:33 -03:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03: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
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
62d50a6bad add picture dropzone / bug fixes 2020-02-25 19:29:14 +00: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
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
Anton Georgiev
43f0ec01a4 accommodate for configuration without shortcuts - do not show error 2019-11-05 16:36:03 -05:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
KDSBrowne
c580ef3199 fix visible take presenter option for current presenter 2019-07-02 18:03:33 +00:00
KDSBrowne
ba9c9c431a add enabled poll prop in settings.yml 2019-07-02 14:54:37 +00:00
Joao Siebel
8f0783d34f update variable name 2019-06-26 13:29:34 -03:00
Joao Siebel
512ceaa8e0 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-06-21 15:03:37 -03:00
Anton Georgiev
bb370c9304 move "write cc" trigger to user-options menu 2019-06-20 15:13:26 +00:00
Anton Georgiev
2abd68c130 cc icon, first round cc ui changes 2019-06-12 19:28:00 +00: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
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
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
34b39a2b0a Closed captions prototype in a big commit 2019-05-22 18:33:20 -03:00
Tainan Felipe
25047f57a9 Remove stop video button of video modal 2019-04-24 14:19:35 -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
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
341ca37add fix for issue #7027 2019-03-14 19:34:53 +00: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
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
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
Tainan Felipe
9054dbf8db Clean up code for best reading 2019-01-16 15:41:21 -02: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
550bbcd492 Share synchronized youtube video in presentation area 2019-01-14 14:40:27 -03: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
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
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
KDSBrowne
86c7e745c5 fix lint errors 2018-12-18 15:15:51 +00: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
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
27e012ac56 Add drag and drop grid to sort user by room 2018-11-27 10:44:22 -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
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
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Tainan Felipe
cfd2e3f94b Add create breakout rooms modal 2018-09-28 11:42:07 -03:00
Tainan Felipe
adbf0f0098 Add breakout room button 2018-09-25 14:03:09 -03:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
589a9eb1fd add btn to toggle poll url 2018-09-14 16:29:19 +00:00
Bobak Oftadeh
e1fbc5059b Desktop share button moved to the action bar component 2018-07-20 10:07:10 -07:00
Maxim Khlobystov
c7464d6dc4 Tiny cleanup. 2018-06-21 11:25:47 -04:00
Maxim Khlobystov
c26de92c16 Disable screenshare init on mobile. 2018-06-21 11:04:00 -04:00
KDSBrowne
d96ed9da3a edit names of access key constants 2018-05-01 17:02:45 -07:00
KDSBrowne
5fa65b4390 use shortcut config in components 2018-04-30 14:09:56 -07:00
KDSBrowne
782bd1c65b resolve lint issue 2018-04-03 18:04:25 -07:00
KDSBrowne
8801a21f18 add access keys 2018-03-23 08:42:56 -07:00
João Francisco Siebel
bfc2f6bc24 Fix when to see the record indicator 2018-02-28 11:10:00 -03:00
João Francisco Siebel
8f43508b4f Linter some code and simplify action button logic display 2018-02-20 15:23:35 -03:00
João Francisco Siebel
56a9bf70ff Change end to stop in labels 2018-02-19 15:42:22 -03:00
João Francisco Siebel
c2076c5260 Fix logic for showing start/end recording 2018-02-19 13:30:21 -03:00
João Francisco Siebel
919c2aa644 Implement start/stop recording logic 2018-02-15 17:42:50 -02:00
Augusto Bennemann
975525fe9b Fix keys usage on actions-dropdown 2018-01-17 19:51:33 -02:00
Augusto Bennemann
10cdd603bc Fix null child element 2018-01-17 11:34:35 -02:00
Augusto Bennemann
5bf96b3c84 Screenshare button conditional rendering 2018-01-17 01:17:07 -02:00
Augusto Bennemann
90adda6a93 Display either 'start' or 'stop' screenshare button, if screenshare enabled on config 2018-01-16 17:12:41 -02:00
Anton Georgiev
980a6490ec
Merge pull request #4832 from KDSBrowne/x.0.3-fix-console-warnings
Fix Invalid prop 'children[2]' supplied to `DropdownList`
2018-01-09 13:28:17 -02:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
KDSBrowne
3fd964d3ca remove import not being used 2018-01-03 09:04:28 -08:00
KDSBrowne
ed3d58f0f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into x.0.3-fix-console-warnings 2018-01-03 08:56:22 -08:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
KDSBrowne
0868e98240 add comment to actions-dropdown component 2017-12-15 20:32:17 -08:00
KDSBrowne
f1cd5f2d6e move _.uniqueId() out of render function 2017-12-15 20:25:41 -08:00
KDSBrowne
b59106912a fix console warnings 2017-12-14 09:31:05 -08:00
Joao Siebel
845692b9e5 Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels 2017-12-14 09:01:38 -02:00
Joao Siebel
0d2276e8c5 Change actions button icon 2017-12-11 15:09:09 -02:00
Joao Siebel
8740b7aac6 Hide labels from actions, status, mute/unmute and join/leave audio buttons 2017-12-11 11:48:50 -02:00
Tainan Felipe
c7c58fea51 remove whitespace and changes in package.json 2017-11-23 15:40:38 -02:00
Tainan Felipe
cb46c8f70c fix design issues
fix design issues
2017-11-13 10:58:04 -02:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
e96fc385f1 Handling HTML5 screensharing stop
The action bar stop button is temporary
2017-11-06 15:39:55 +00:00
Tainan Felipe
8e2f29e667 changed assign of the function 2017-10-24 08:52:44 -02:00
Tainan Felipe
98b23640fd solve bug no disppear modal presentation-upload 2017-10-12 21:12:00 -03:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
Oswaldo Acauan
bb94ed6b25 Remove unused defaultProps 2017-09-29 10:51:41 -03:00
Oswaldo Acauan
4ac554af56 Fix typo 2017-09-29 10:51:17 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03:00
KDSBrowne
b80fb29fb2 switch to callback ref 2017-06-10 12:21:13 -07:00
KDSBrowne
c189faceff fix merge conflicts 2017-06-08 11:00:06 -07:00