Vitor Mateus De Almeida
|
880963e0e7
|
Merge remote-tracking branch 'upstream/develop' into layout
|
2020-07-06 13:36:38 -03:00 |
|
Vitor Mateus
|
a1d4311cec
|
wip
|
2020-06-04 20:01:17 -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 |
|
Vitor Mateus
|
5b9aafd0d3
|
The presentation gets the size from the layout manager
|
2020-03-25 09:52:23 -03: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
|
41e8e882e0
|
allow presentation toggle from actions btn
|
2020-01-25 01:02:36 +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 |
|
KDSBrowne
|
2024918a70
|
fix restore presentation btn overlap on mobile for presenter
|
2019-11-07 17:33:03 +00: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
|
4a335a1db6
|
reduce db probes for getAvailableActions; simplify SaveUsernames
|
2019-09-06 16:28:02 -04: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 |
|
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 |
|
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 |
|
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 |
|
Joao Siebel
|
18670fdaf2
|
Merge remote-tracking branch 'upstream/master' into reconnection-improvement
|
2019-07-04 15:09:06 -03: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
|
5db531ed8d
|
move cc consumer button to the left in action bar
|
2019-06-20 15:13:45 +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 |
|
Diego Benetti
|
e520797ddd
|
Merge remote-tracking branch 'upstream/master' into issue7390-datasaving-screenshare
|
2019-05-31 10:23:50 -03: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 |
|
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
|
ea711def9e
|
move screenshare alert to service / fit audio alert on meeting end
|
2019-04-15 21:39:07 +00:00 |
|
bobakoftadeh
|
b266fb11b4
|
Remove breakout room option from actions-dropdown
|
2019-03-28 21:39:23 +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
|
78f03f1b32
|
Update action label when a video is already been shared. close #6604
|
2019-02-15 15:32:03 -02: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 |
|
Pedro Beschorner Marin
|
5b760b46ef
|
Fixed share video button for locked users
|
2019-01-28 11:24:03 -02: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
|
ff3898224b
|
Merge branch 'master' into master-presentation-ui
|
2019-01-16 17:33:29 -05:00 |
|
Lucas Zawacki
|
69c89cb555
|
Fix some linter errors and add translation
|
2019-01-16 13:50:24 -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
|
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
|
f11fed7bd7
|
add take presenter role to actions menu
|
2019-01-10 16:10:45 +00: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 |
|
KDSBrowne
|
86c7e745c5
|
fix lint errors
|
2018-12-18 15:15:51 +00: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 |
|
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
|
538e248058
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-11-02 21:25:40 +00: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 |
|
KDSBrowne
|
cf23293e10
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-09-25 12:44:38 +00:00 |
|
KDSBrowne
|
589a9eb1fd
|
add btn to toggle poll url
|
2018-09-14 16:29:19 +00:00 |
|
João Francisco Siebel
|
4c35608c2b
|
Add users-settings collection and handle dynamic configuration
|
2018-09-13 15:09:30 -03:00 |
|
KDSBrowne
|
78c81880db
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5782-move-set-status
|
2018-08-01 15:43:31 +00:00 |
|
Bobak Oftadeh
|
e1fbc5059b
|
Desktop share button moved to the action bar component
|
2018-07-20 10:07:10 -07:00 |
|
KDSBrowne
|
6a4a3ee160
|
remove emoji service functions from action-bar
|
2018-07-09 17:08:19 +00:00 |
|
KDSBrowne
|
341d19fa52
|
remove old way of setting emoji status
|
2018-07-09 16:14:07 +00:00 |
|
KDSBrowne
|
7896ab9fa8
|
fix menu functionality bugs / add status options
|
2018-07-08 18:53:52 +00:00 |
|
Lucas Fialho Zawacki
|
65a2fb592f
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor
|
2018-03-20 17:22:11 +00: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
|
c2076c5260
|
Fix logic for showing start/end recording
|
2018-02-19 13:30:21 -03:00 |
|
Lucas Fialho Zawacki
|
388fee31b6
|
Renaming files to better suit html5 structure
|
2018-02-19 04:23:05 +00:00 |
|
João Francisco Siebel
|
919c2aa644
|
Implement start/stop recording logic
|
2018-02-15 17:42:50 -02:00 |
|
KDSBrowne
|
57424ecedd
|
add css class to align btns as presenter for small mobile screens
|
2018-01-10 07:44:21 -08:00 |
|
Oleksandr Zhurbenko
|
ce1f40ac9a
|
Updated Meteor to 1.6.0.1
|
2018-01-07 22:17:18 -08:00 |
|
prlanzarin
|
3a72afa350
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
|
2017-12-21 17:37:07 +00:00 |
|
prlanzarin
|
24e4317f9a
|
Removed unused methods from actions bar component
|
2017-12-08 16:32:08 +00:00 |
|
Tainan Felipe
|
d15bb139bb
|
refactor emoji menu
|
2017-11-23 15:20:27 -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
|
2166b56304
|
Added toggle options for kurento video/screensharing in the HTML5 config yaml
Also made cam button respond to those config values
|
2017-11-10 21:08:40 +00:00 |
|
prlanzarin
|
e96fc385f1
|
Handling HTML5 screensharing stop
The action bar stop button is temporary
|
2017-11-06 15:39:55 +00:00 |
|
gcampes
|
d32330b208
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-24 11:19:58 -02:00 |
|
prlanzarin
|
67da01e81c
|
Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare
|
2017-10-10 17:10:03 +00:00 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
gcampes
|
62fe06516f
|
Change audio modal styles and structure. WIP
|
2017-09-25 17:28:36 -03:00 |
|
Augusto Bennemann
|
d0592a7acb
|
HTML5 video: share and unshare buttons
|
2017-09-20 00:12:10 -03:00 |
|
gcampes
|
ea637a1e49
|
first changes to audio components and services. WIP
|
2017-09-19 16:31:04 -03:00 |
|
Augusto Bennemann
|
31f2e1cac7
|
HTML5 ScreenShare Presenter
|
2017-09-12 17:47:06 -03:00 |
|
Oswaldo Acauan
|
e6412275a6
|
Linter auto fix
|
2017-06-02 19:25:02 +00:00 |
|
KDSBrowne
|
df76d33cba
|
set files permission to 644
|
2017-05-16 09:22:59 -07:00 |
|
KDSBrowne
|
6537a0e28c
|
Fix client lint issues except those which are comment related
|
2017-05-16 08:37:17 -07:00 |
|
Oswaldo Acauan
|
d434ba6893
|
Fix the audio-modal
|
2017-05-01 16:52:57 -03:00 |
|
Anton Georgiev
|
450d2f3435
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
|
2017-04-17 11:37:49 -04:00 |
|
KDSBrowne
|
a8067b7bd8
|
clean up render function
|
2017-04-05 12:43:50 -07:00 |
|
KDSBrowne
|
12ff717033
|
fix ability to click actions btn
|
2017-04-05 09:14:37 -07:00 |
|
KDSBrowne
|
694baed724
|
use cx import to handle styles
|
2017-03-29 10:44:20 -07:00 |
|
KDSBrowne
|
67fbb8ddef
|
remove hidden duplicate component
|
2017-03-29 06:56:54 -07:00 |
|
Anton Georgiev
|
eae765cc69
|
move styles.sccs to audio-test
|
2017-03-27 11:45:24 -04:00 |
|
KDSBrowne
|
1edb4ec736
|
remove console log
|
2017-03-24 08:37:33 -07:00 |
|