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

412 Commits

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