BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,515 Commits 13 Branches 260 Tags 1.1 GiB
a5ce2b7d12
Commit Graph

109 Commits

Author SHA1 Message Date
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