BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,322 Commits 13 Branches 260 Tags 1.1 GiB
3a2b8f969f
Commit Graph

3252 Commits

Author SHA1 Message Date
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
KDSBrowne
718942668e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-recording-label 2018-11-08 19:15:17 +00:00
KDSBrowne
32dd7ce944 use calc() instead of new variables 2018-11-08 19:13:14 +00:00
Anton Georgiev
423d3a5819
Merge pull request #6225 from Tainan404/add-meteor-disconnect 
Add meteor disconnect
 2018-11-08 14:03:04 -05:00
bobakoftadeh
020ac800af Implemented functionality of lock settings 2018-11-08 10:55:12 -08:00
Anton Georgiev
9555cd68b8
Merge pull request #6105 from KDSBrowne/start-poll-01 
Add start, stop and publish a poll for Presenter
 2018-11-08 13:52:36 -05:00
Maxim Khlobystov
9b27c89bc8 Adjustments to the autoShareWebcam 2018-11-07 16:45:52 -05:00
Maxim Khlobystov
a2c490f4f6 Stopping the tracks to avoid fetching two cameras at the same time + Making the constraints less restricted 2018-11-07 16:16:36 -05:00
Maxim Khlobystov
91dad9d882 Fixing some linter error 2018-11-07 14:30:36 -05:00
KDSBrowne
565b55e8e7 remove unused styles 2018-11-07 13:00:21 +00:00
KDSBrowne
10d5d0706e remove visible recording label / add missing formatted string / fix recording icon 2018-11-07 02:20:19 +00:00
Maxim Khlobystov
9f67ce4106 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-06 18:17:52 -05:00
Maxim Khlobystov
90f38561c3 Add Webcam Settings to choose a camera 2018-11-06 18:10:56 -05:00
bobakoftadeh
856459e989 Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C 2018-11-06 13:47:38 -08:00
Bobak Oftadeh
edc941da9e Implementation of lock-view modal menu 2018-11-06 13:39:07 -08:00
Tainan Felipe
060435d54e Rename from Breakout-room to breakout-room 2018-11-06 13:42:30 -02:00
Oswaldo Acauan
2ac4490366 Fix tippy wait option to the new version 2018-11-06 13:41:11 -02:00
Oswaldo Acauan
a8c1df7f22 Upgrade all npm and meteor packages and fix compatibility issues introduced 2018-11-06 12:59:53 -02:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
KDSBrowne
c552b3522c prevent breakout and poll pane both open 2018-11-05 17:52:06 +00:00
Tainan Felipe
958e7b06ba Remove the intl id 2018-11-05 14:02:04 -02:00
Tainan Felipe
50d8995600 Add the meteor disconnect on meeting ended and error screen 2018-11-05 13:51:39 -02:00
Tainan Felipe
1768c49169 Add the meteor disconnect on meeting ended and error screen 2018-11-05 13:48:57 -02:00
Tainan Felipe
fd8a63fbbb Change the method permissions for moderator 2018-11-05 10:27:56 -02:00
KDSBrowne
8378606889 move presenter and poll check to UserPolls 2018-11-02 21:43:49 +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
Ghazi Triki
ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master 
# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
 2018-11-02 21:02:02 +01:00
Bobak Oftadeh
a97a1ece37 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-11-02 09:17:07 -07:00
Anton Georgiev
bada73b7e7
Merge pull request #6178 from Tainan404/breakout-room-html5 
Add presenter POV for breakout room on HTML5.
 2018-11-02 11:16:33 -04:00
Anton Georgiev
6c8722969c
Merge pull request #6206 from Tainan404/fix-cursor-video-dock 
Apply transparency on connecting animation on video item.
 2018-11-02 11:02:15 -04:00
Anton Georgiev
357f341a3e
Merge branch 'master' into breakout-room-html5 2018-11-02 09:26:09 -04:00
Anton Georgiev
70ac42f6bb
Merge pull request #6199 from jfsiebel/configurable-whiteboard-tools-improvement 
Configurable whiteboard tools improvement
 2018-11-01 16:01:21 -04:00
Anton Georgiev
4940b45bb1
Merge pull request #6210 from jfsiebel/configurable-shortcut-list 
Configurable available shortcuts
 2018-11-01 15:56:44 -04:00
Anton Georgiev
41c7791272
Merge pull request #6192 from Tainan404/fix-presentation-hover 
Remove behavior that add opacity when hover the presentation area.
 2018-11-01 14:50:47 -04:00
KDSBrowne
9e483a181e move live-result sort to service 2018-11-01 18:20:35 +00:00
Tainan Felipe
d87b231dfe Allow moderator end all breakouts 2018-11-01 14:55:35 -03:00
Tainan Felipe
5aa86f8ccb Clear setIntervel when unmount the component 2018-11-01 13:53:27 -03:00
KDSBrowne
deac142296 move check for non presenter 2018-11-01 15:53:34 +00:00
Anton Georgiev
04883ffcdb handle iframe toggleRecording and toggle self muting 2018-11-01 15:03:16 +00:00
Tainan Felipe
7f56e7c2aa Fix notification doesn't appear after second breakout invoking 2018-11-01 11:07:01 -03:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Tainan Felipe
c23c37f1be Fix notifications duplicating 2018-11-01 08:47:46 -03:00
KDSBrowne
ecf0304a01 move poll container functions to service 2018-10-31 19:13:19 +00:00
Joao Siebel
97a0a2a13b configurable shortcuts available. close #6169 2018-10-31 15:51:56 -03:00
KDSBrowne
38ae789b4a fix userlist poll heading remaining after presenter toggle 2018-10-31 17:28:35 +00:00
KDSBrowne
0e26d2a6c1 add early returns to renderPollStats() 2018-10-31 13:28:32 +00:00
KDSBrowne
a8ef2cb8b5 rename getPollStats and getInputFields 2018-10-31 13:18:33 +00:00
KDSBrowne
291461d4fd add sort to users in live-results 2018-10-30 20:05:56 +00:00
KDSBrowne
b95e3a7825 condense getRespondents and getUnresponsive into single function 2018-10-30 19:18:32 +00:00
Anton Georgiev
4b4390214f
Revert "Make it so that cameras use the full space of the video window" 2018-10-30 14:25:21 -04:00
Tainan Felipe
7243d3bbc3 Fix css variable was not working 2018-10-30 13:19:22 -03:00
KDSBrowne
76e3759039 add formated message 2018-10-30 15:57:10 +00:00
KDSBrowne
ee41c0bd93 adjust variable names / remove duplicate return 2018-10-30 13:17:40 +00:00
Tainan Felipe
c6284a0fbb Add poiter cursor the hover over the video dropdown 2018-10-30 09:47:18 -03:00
Bobak Oftadeh
6bde6b06f5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-29 14:39:25 -07:00
Bobak Oftadeh
b3a496bfc0 Improved user-manage menu styles and implementation 2018-10-29 14:36:10 -07:00
Tainan Felipe
a0a2b7605f Rename function breakouts to findBreakouts 2018-10-29 16:36:45 -03:00
Tainan Felipe
07d89a0132 Add intl to breakout room name 2018-10-29 16:29:45 -03:00
KDSBrowne
3fc941bd49 prevent users interacting with elements behind polling modal like view 2018-10-29 16:57:19 +00:00
KDSBrowne
78a5ff6fc9 edit poll pane close btn 2018-10-29 16:14:05 +00:00
KDSBrowne
bba899c4a7 prevent poll closing on poll pane hide 2018-10-29 15:27:50 +00:00
KDSBrowne
ee73ec4dd3 remove left over react-router code 2018-10-28 17:02:54 +00:00
Tainan Felipe
0e1f805c30 remove log 2018-10-26 17:26:24 -03:00
Tainan Felipe
0d22580b1c Change to count 2018-10-26 16:57:37 -03:00
KDSBrowne
7f396f3590 remove container not being used 2018-10-26 16:06:11 +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
João Francisco Siebel
b9aff5a6f1 handle empty tool list. close #6171 2018-10-26 11:17:41 -03:00
KDSBrowne
9adf429b32 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-26 13:23:32 +00:00
KDSBrowne
6a16b379d7 fix actions poll toggle not working when userlist is closed 2018-10-26 12:54:35 +00:00
KDSBrowne
4462e050ee fix polling title misalignment 2018-10-26 12:49:14 +00:00
KDSBrowne
8f24fcfd01 make userlist-poll btn toggle menu 2018-10-26 12:37:29 +00:00
Anton Georgiev
05da6ff047 toggle PublicChat 2018-10-26 12:36:51 +00:00
KDSBrowne
d5eae7c288 remove comment left over from merge 2018-10-26 01:47:48 +00:00
KDSBrowne
0551691684 edit css styles 2018-10-26 01:40:15 +00:00
KDSBrowne
3ced879e41 clean up togglePollMenu() 2018-10-25 22:41:45 +00:00
KDSBrowne
935eb1289d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-25 18:39:26 +00:00
KDSBrowne
c49b72f926 fix mobile poll response view 2018-10-25 18:33:02 +00:00
Anton Georgiev
c80e379de6
Merge pull request #6104 from Tainan404/zoom-implementation 
Add fit-to-width  for html5
 2018-10-25 14:31:29 -04:00
KDSBrowne
2b61b8a2a0 fix style conflict 2018-10-25 18:23:43 +00:00
KDSBrowne
188118d9ea Merge branch 'test-merge-anton' into t 2018-10-25 18:19:25 +00:00
Anton Georgiev
14543bb478 adjust chat title 2018-10-25 18:03:25 +00:00
Anton Georgiev
a5c2ddc602 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-25 17:58:00 +00:00
KDSBrowne
5d8c4dc909 change polling title color 2018-10-25 17:48:23 +00:00
KDSBrowne
da30345649 fix style issues after merge 2018-10-25 17:44:03 +00:00
KDSBrowne
95bb36df82 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-25 17:25:26 +00:00
KDSBrowne
5c62507f0e prevent offline users being displayed in live results 2018-10-25 17:20:32 +00:00
KDSBrowne
ec5af5b855 fix merge issues 2018-10-25 16:54:29 +00:00
KDSBrowne
3f521a6f6a Merge branch 'html5-theming' into test-merge-anton 2018-10-25 16:33:56 +00:00
KDSBrowne
47218ea351 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton 2018-10-25 16:18:31 +00:00
KDSBrowne
de51ab6fd6 position polling in center screen for mobile 2018-10-25 16:07:24 +00:00
Anton Georgiev
ff837fdd09 drop unnecessary Boolean() wrapper 2018-10-25 15:20:37 +00:00
Oswaldo Acauan
41cfdaaf30 Fix colors and sizes 2018-10-25 10:46:31 -02:00
Tainan Felipe
ab064f47c9 fiz zoom when fit to width out 2018-10-24 16:50:49 -03:00
Oswaldo Acauan
458b2f442f Merge branch 'html5-theming' of github.com:oswaldoacauan/bigbluebutton into css-variables 2018-10-24 17:32:21 -02:00
Oswaldo Acauan
1de297c1e2 Fix line-heights and convert scss calculations to calc() 2018-10-24 17:32:09 -02:00
Anton Georgiev
ef9f248607
Merge branch 'master' into html5-theming 2018-10-24 14:58:59 -04:00
Bobak Oftadeh
262bd32bc6 Cleaned up user-options component and container 2018-10-24 11:34:11 -07:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Tainan Felipe
69e1404ed1 Fix intl 2018-10-24 14:54:19 -03:00
Oswaldo Acauan
8696b831d3 Change SCSS variables to CSS variables missed while merging with upstream 2018-10-24 15:10:15 -02:00
Tainan Felipe
7677d19159 Remove behavior that add opacity when hover the presentation 2018-10-24 14:09:32 -03:00
João Francisco Siebel
a42946658f improve toolbar when have only one tool 2018-10-24 13:26:23 -03:00
Anton Georgiev
ffbc11162e fixed linter errors 2018-10-24 15:33:39 +00:00
KDSBrowne
e951b9180f prevent other menus covering polling options 2018-10-24 14:50:47 +00:00
KDSBrowne
9c3a21641b prevent chat / poll pane being open at the same time 2018-10-24 14:29:51 +00:00
KDSBrowne
abd5e8a224 update styling / fix bugs 2018-10-24 14:17:13 +00:00
Anton Georgiev
e888f5dc14 removed dummy button examples visible without presentation 2018-10-24 14:01:07 +00:00
Anton Georgiev
74c51e37c8 drop obsolete || false check 2018-10-24 12:46:05 +00:00
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +00:00
Tainan Felipe
2b5c9a32b4 Add intl 2018-10-23 17:34:09 -03:00
Tainan Felipe
60e0446d89 Fix zoom keeps after fit to width 2018-10-23 16:58:13 -03:00
Tainan Felipe
4d7861f0be Add intl message 2018-10-23 16:29:19 -03: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
Bobak Oftadeh
0cde376e67 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-22 10:06:18 -07:00
Anton Georgiev
591adc89e6
Merge pull request #6168 from jfsiebel/configurable-whiteboard-tools-list 
Configurable whiteboard tools
 2018-10-22 13:00:14 -04:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage 
User manage button
 2018-10-22 10:54:18 -04:00
João Francisco Siebel
f936e319de implement configurable whiteboard tools. close #5826 2018-10-19 14:05:56 -03:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
c191d3b6e8 clean up styles values 2018-10-18 14:59:26 +00:00
KDSBrowne
c8b993a3a9 remove use of router in polling 2018-10-18 14:31:17 +00:00
KDSBrowne
bae71203a5 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router 2018-10-17 20:34:05 +00:00
KDSBrowne
defaea03fd add sound notification when poll starts 2018-10-16 22:07:42 +00:00
KDSBrowne
94cdc0aee3 add sound notification when poll starts 2018-10-16 22:06:50 +00:00
Anton Georgiev
1b9a73a31c use Session.equals syntax 2018-10-16 17:52:18 +00:00
Anton Georgiev
30c43795af work on chat alert 2018-10-16 17:48:27 +00:00
Bobak Oftadeh
062d96cbc1 Merge branch 'user-manage' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-b 2018-10-16 10:34:35 -07:00
KDSBrowne
7b0498eb1a use - as symbol for users who have not responded to poll 2018-10-16 17:31:41 +00:00
Bobak Oftadeh
3a0ce3c57f Altered CSS variables 2018-10-16 10:24:10 -07:00
Bobak Oftadeh
e3a1210dcf Improved clear status function 2018-10-16 09:14:51 -07:00
Anton Georgiev
b2df10c635 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-16 16:06:37 +00:00
Bobak Oftadeh
10b096e9b0 Merge branch 'user-manage' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-b 2018-10-16 08:52:14 -07:00
Anton Georgiev
58f8738084 Merge branch 'post-router-style-fix' of github.com:KDSBrowne/bigbluebutton into remove-react-router 2018-10-16 15:51:18 +00:00
Bobak Oftadeh
e582978662 Adjusted dropdown position 2018-10-16 08:38:39 -07:00
KDSBrowne
45eeb1d400 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-16 15:19:24 +00:00
KDSBrowne
e795cacd97 fix styles for hide public chat btn 2018-10-16 14:33:42 +00:00
Bobak Oftadeh
0a3568cc74 Added mute meeting settings to yml file 2018-10-15 15:24:56 -07:00
Anton Georgiev
0d1b085d54 improved on logic for open private chat 2018-10-15 20:03:17 +00:00
KDSBrowne
dcd6e5dbf9 add propTypes to poll and live-result components 2018-10-15 19:58:07 +00:00
KDSBrowne
6c377b97bf add formatted strings 2018-10-15 19:05:50 +00:00
KDSBrowne
7629b8ba7b fix chat-list-item style and userlist toggle aria-label 2018-10-15 17:49:17 +00:00
KDSBrowne
262038520b improve styling / fix bugs 2018-10-15 14:36:26 +00:00
Bobak Oftadeh
65276a5423 Altered user manage button styles 2018-10-12 14:19:30 -07:00
Anton Georgiev
717a1e2db2 recovered logout functionality including feedback 2018-10-12 21:14:28 +00:00
Anton Georgiev
27a41753f9 hooked on error pages via Session 2018-10-12 17:05:30 +00:00
Bobak Oftadeh
21b84a5303 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-12 09:17:19 -07:00
KDSBrowne
9b42940d63 move polling options for viewer 2018-10-12 15:05:53 +00:00
Bobak Oftadeh
52aa4fd3c1 Mute meeting functionality implemented 2018-10-11 14:27:56 -07:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
prlanzarin
7f3d3c0d32 Fixed reconnecting webcam viewers and session overlaps 2018-10-11 18:23:26 +00:00
KDSBrowne
bc5592ef67 update css styles 2018-10-11 03:20:58 +00:00
KDSBrowne
a955a7c0f1 replace createContainer with withTracker 2018-10-11 03:01:59 +00:00
KDSBrowne
dc8bd0345d edit live-result style values 2018-10-10 19:04:09 +00:00
KDSBrowne
5654f08b43 clean up code 2018-10-10 18:25:35 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
João Francisco Siebel
74dfa52071 handle system messages on main public chat 2018-10-08 11:22:45 -03:00
Anton Georgiev
497db01167 added meteor/session; userList without router 2018-10-05 19:23:16 +00:00
KDSBrowne
eefef1c207 remove the need for using findDOMNode() 2018-10-05 13:43:27 +00:00
Bobak Oftadeh
e5ae59908c Altered lock viewers label 2018-10-04 15:16:09 -07:00
prlanzarin
2741022cb2 Updated kurento-utils WebRTC calls, added permission request on listen only for safari 
Also fixed a resource leak on listen only fallback and transitioned the SFU listen only from a tag-based approach to MediaStream
 2018-10-03 18:39:55 +00:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
KDSBrowne
7f2d8138ba replace for loop with range() and map() 2018-10-03 14:39:23 +00:00
KDSBrowne
28d46b7ca8 change formatted message id's / replace reduce with map 2018-10-03 03:24:34 +00:00
KDSBrowne
c2e785b8c4 add poll max custom fields to config 2018-10-02 23:59:45 +00:00
KDSBrowne
26404c87f7 remove button color type 'primary-outlined' 2018-10-02 23:08:32 +00:00
KDSBrowne
8c60d03ccc add comment to explain regex 2018-10-02 20:45:41 +00:00
KDSBrowne
b241b93b8a replace indexOf() with includes() 2018-10-02 20:30:32 +00:00
Anton Georgiev
308beb874c Auth logged in 2018-10-02 19:53:13 +00:00
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +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
KDSBrowne
b9736e9c08 fix poll results not displaying correctly for presenter 2018-09-28 14:40:53 +00:00
KDSBrowne
e1440de236 fix private chat not working 2018-09-27 16:27:05 +00:00
Bobak Oftadeh
f4a6947313 Moved isModerator check to the user-options container 2018-09-26 09:04:53 -07:00
Tainan Felipe
33655682f0 change modal overlay color for client consistency 2018-09-25 17:29:54 -03:00
Tainan Felipe
adbf0f0098 Add breakout room button 2018-09-25 14:03:09 -03:00
KDSBrowne
491f841401 prevent user access to poll panel after presenter is lost 2018-09-25 16:54:07 +00:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
Tainan Felipe
9e496a0c93 Add fit to width feature 2018-09-25 09:47:49 -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
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings 
Custom user settings
 2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
João Francisco Siebel
a445e0d2e5 make whiteboard tools list configurable 2018-09-21 16:42:39 -03:00
João Francisco Siebel
3c3a5ae59a implement multiUserPenOnly configuration 2018-09-21 13:42:00 -03:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Anton Georgiev
7ca66965da
Merge pull request #6086 from oswaldoacauan/fix-6012 
Fix fuzzy chat font rendering.
 2018-09-19 14:40:32 -04:00
Anton Georgiev
8df901e0bf
Merge pull request #6087 from Tainan404/zoom-implementation 
Zoom call only for presenter
 2018-09-19 14:15:41 -04:00
Tainan Felipe
61c4c62e54 Zoom call only for presenter 2018-09-19 15:13:09 -03:00
Oswaldo Acauan
750f1bc35a Fix fuzzy chat font rendering. Closes #6012 2018-09-19 14:57:39 -03:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window 
Extended the Width of the Chat Area
 2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
Tainan Felipe
7d202ada62 Remove comment 2018-09-19 09:55:47 -03:00
Tainan Felipe
24e0fc55cd Remove unused code 2018-09-19 09:09:45 -03:00
Lucas Zawacki
1d38dc4f2e Make it so that cameras use the full space of the video window 2018-09-18 13:58:29 -03:00
Tainan Felipe
2d045b415c Put the hand by default in mobile 2018-09-18 11:16:11 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
ab75ffdddd Add pinch and double-tap zoom 2018-09-17 15:02:52 -03:00
João Francisco Siebel
ebad6cf6a4 remove debug 2018-09-14 14:53:29 -03:00
KDSBrowne
226adbe254 make poll menu render 2018-09-14 17:50:18 +00:00
KDSBrowne
589a9eb1fd add btn to toggle poll url 2018-09-14 16:29:19 +00:00
Anton Georgiev
f2092114e0
Merge pull request #6061 from BobakOftadeh/Userlist-spacing 
Fixed locked user to have the same height as a default user
 2018-09-13 15:25:06 -04:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
Bobak Oftadeh
5c3f6202b3 Fixed locked user to have the same height as a default user 2018-09-11 13:42:36 -07:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Anton Georgiev
885539bb2a
Merge pull request #6057 from prlanzarin/listen-only-fallback 
Add SIP.js listen only as fallback when SFU is enabled
 2018-09-11 13:50:10 -04:00
prlanzarin
fe9835b5f7 Add SIP.js listen only as fallback when SFU is enabled 2018-09-11 17:09:29 +00:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Anton Georgiev
7508f1d4f8
Merge pull request #6034 from KDSBrowne/02-iphone-polling-fix 
Fix poll answers not being displayed on mobile safari
 2018-09-10 10:08:51 -04:00
KDSBrowne
5f31deee11 use mq() instead of @media 2018-09-09 05:23:33 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Anton Georgiev
681422dc61 fix listenOnly being interpreted as muted audio (client side) 2018-09-06 18:44:59 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00
Tainan Felipe
e501b9e5cc Implement pan zoom 2018-09-04 14:37:36 -03:00
Anton Georgiev
73fd896fb0
Merge pull request #6032 from Tainan404/fix-safary-animaiton 
Split animation to own span to run in safari.
 2018-09-04 13:14:29 -04:00
Anton Georgiev
49c0e7b9b1
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2 
Better handling of screensharing ice connection state errors.
 2018-09-04 13:14:08 -04:00
Anton Georgiev
8e553ab0c6
Merge pull request #5855 from musickiper/discard-cur-annotation-via-right-click 
Add fuctionality for discard current annotation via right-click
 2018-09-04 11:13:00 -04:00
KDSBrowne
bf38c36b71 fix polling answer position in safari on mobile 2018-08-31 17:14:00 +00:00
Tainan Felipe
1f6b959efc Split animation and connection to own span to run in safari 2018-08-31 13:58:47 -03:00
Maxim Khlobystov
5825b635ba Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-30 16:07:52 -04:00
prlanzarin
dc767d9bdb Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown 2018-08-30 02:41:02 +00:00
Tainan Felipe
92ecd8d39d Fix misspelling 2018-08-29 17:24:44 -03:00
Tainan Felipe
ce6f1699f7 Add flash comment explaining mistery number 2018-08-29 17:20:42 -03:00
Anton Georgiev
065d932b64
Merge pull request #6020 from prlanzarin/autoplay-listen-only 
Resolving listen only stream correctly
 2018-08-29 16:10:52 -04:00
prlanzarin
b4052f7052 Resolving listen only stream correctly 2018-08-29 19:59:33 +00:00
Bobak Oftadeh
cacc5e1920 Extended the width of the chat area 2018-08-29 12:57:36 -07:00
Anton Georgiev
afd97601c5
Merge pull request #6019 from prlanzarin/autoplay-listen-only 
Improvements to Safari/Chrome autoplay policy
 2018-08-29 15:44:05 -04:00
prlanzarin
a7bfb985d3 Improvements to Safari/Chrome autoplay policies with placeholder buffer on audiocontext and bogus audio + upstarting audio tag as muted 2018-08-29 19:12:34 +00:00
Anton Georgiev
157ce58f04
Merge pull request #6018 from antobinary/lock-public-chat 
[HTML5] Comply with lock settings for chat
 2018-08-29 13:22:49 -04:00
Anton Georgiev
e03eccab2e combine isViewer and isLocked by using existing property from mapUser 2018-08-29 17:21:39 +00:00
Anton Georgiev
e756ce1548 comply to lock settings for chat 2018-08-29 16:00:53 +00:00
Tainan Felipe
742229e88f Fix lint errors 2018-08-28 16:30:37 -03:00
Tainan Felipe
70e29725ee Fix zoom display alignment 2018-08-28 14:14:02 -03:00
Tainan Felipe
9f6ed96b36 add zoom functions to component 2018-08-28 14:14:01 -03:00
Tainan Felipe
2815955236 state shared between presentation and overlay 2018-08-28 14:14:01 -03:00
Tainan Felipe
7c082c608a Add zoom tooll and styles 2018-08-28 14:14:01 -03:00
Tainan Felipe
257b4cc8ac port flash code to js and implement initial work in zoom 2018-08-28 14:14:01 -03:00
Tainan Felipe
25834dd4f8 zoom calc based in flash 2018-08-28 14:13:18 -03:00
Maxim Khlobystov
82a69fb902 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-28 12:49:06 -04:00
prlanzarin
a9b98b6f7f Handling fake audio tag play exception, reduced timeout to match sound length and removed permission fallback from audio 2018-08-27 20:56:51 +00:00
BobakOftadeh
2b61c00748 Prevented the presenataion title from pushing the dropdown menu off-screen (#5994) 
The dropdown menu is no longer pushed off screen on Firefox. #5972
 2018-08-23 14:29:28 -03:00
James Jung
4db30fe741 Delete useless logics, and make codes more readable 2018-08-23 13:07:56 -04:00
James Jung
3dd288c0ca Remove loop inside "addAnnotationToDiscardedList" 2018-08-23 12:35:26 -04:00
Maxim Khlobystov
fc3e46493e Linting. 2018-08-23 11:49:16 -04:00
James Jung
b0a93e5377 Move the placement of undoAnnotation from service.js to draw-listeners 
Make discardedList be updated on not only the side of the sender but also the side of receiver too
Add logic for preventing the size of discardedList getting bigger unlimitedly
 2018-08-23 11:42:34 -04:00
Maxim Khlobystov
242200ac91 Replaced Ice with ICE in strings. 2018-08-22 14:51:25 -04:00
Maxim Khlobystov
d67aba6c8a Listening to ice connection failures when screensharing. 2018-08-22 14:10:08 -04:00
Anton Georgiev
778e22d42f
Merge pull request #5991 from prlanzarin/sfu-cam-target-bitrate 
[HTML5] Added target bitrate option for WebRTC screenshare and webcam
 2018-08-21 10:02:56 -04:00
Anton Georgiev
666a59232e
Merge pull request #5993 from KDSBrowne/5980-chat-input-font-size 
Adjust chat input font size
 2018-08-21 09:52:56 -04:00
KDSBrowne
8df5df1322 increase chat text size 2018-08-21 12:47:05 +00:00
prlanzarin
ad353a6e84 Fixed isVideoBroadcasting check to return a bool 2018-08-20 19:44:38 +00:00
prlanzarin
9f9e248de7 Made webcam constraints configurable, removed fps limitations and resolution floor 
Also fixed handlePlayStop and stopWebRTCPeer exceptions
 2018-08-20 18:08:10 +00:00
KDSBrowne
b67aecc3aa make userlist emoji sort work 2018-08-17 15:01:41 +00:00
James Jung
86a0440703 Remove useless and error causing codes 2018-08-16 13:15:12 -04:00
Anton Georgiev
6459b84c83 Pulled HTML5 locales aug 15; Fix for locale switch edge case (#5984) 2018-08-15 13:58:23 -03:00
KDSBrowne
dfa09244c5 use JSX spread attributes 2018-08-15 15:02:48 +00:00
KDSBrowne
c0e1aeeff8 move position of clear status option in user-dropdown menu 2018-08-15 14:55:22 +00:00
KDSBrowne
29bcbea923 rename to alerts / missing from #5973 2018-08-15 02:35:58 +00:00
James Jung
bac2854b77 Add extra comments to make code more readable 2018-08-14 16:00:15 -04:00
KDSBrowne
fed85fba48 Update font size of chat input to match the text display in the chat area 2018-08-14 19:16:11 +00:00
James Jung
dc71cd0382 Move filter logic from service method to draw-stream listener, and makes code more readable 2018-08-14 14:47:09 -04:00
Anton Georgiev
cd851fcdbc
Merge pull request #5978 from antobinary/logs-work 
Logging additional cases in HTML5 client
 2018-08-14 13:42:34 -04:00
Anton Georgiev
823629cb30 add log when user fully joined and subscribed to collections 2018-08-14 17:29:03 +00:00
Anton Georgiev
67b5257e8d
Merge pull request #5977 from Tainan404/issue-5496 
fix toolbars losing border radius when overlap the presentation.
 2018-08-14 13:14:39 -04:00
Anton Georgiev
1e8a4cf1e7
Merge pull request #5973 from KDSBrowne/5963-notifications-rename 
Rename 'push notifications' to 'alerts'
 2018-08-14 13:13:31 -04:00
Anton Georgiev
f83374491b
Merge pull request #5971 from MaximKhlobystov/ice-connection-state-errors 
Better handling of video ice connection state errors.
 2018-08-14 13:12:12 -04:00
Anton Georgiev
aee7dfe70c
Merge pull request #5955 from KDSBrowne/5910-cam-audioIndicator-inconsistency 
Fix audio status icon inconsistent size on webcams
 2018-08-14 11:43:43 -04:00
Maxim Khlobystov
bfe48dc918 Uncommented the line that has been commented out for debugging purposes. 2018-08-14 10:40:52 -04:00
Tainan Felipe
71bd889446 fix toolbars losing border radius when overlap the presentation 2018-08-14 10:30:46 -03:00
Maxim Khlobystov
ed85f109a0 Listening to closed ice connection state in case an error doesn't result in failed state. 2018-08-13 16:26:45 -04:00
Anton Georgiev
7444e61d4d Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into logs-work 2018-08-13 20:05:07 +00:00
Anton Georgiev
ed173b813a fix linting 2018-08-13 19:52:44 +00:00
James Jung
3f8a10897a Initialize a list of discarded annotations, filter out discarded annotations inside AnnotationsStreamer added handler 2018-08-13 15:40:47 -04:00
KDSBrowne
d7b6d027a2 change name of formatted string id's 2018-08-13 19:16:22 +00:00
Anton Georgiev
8092fa1304
Merge pull request #5968 from BobakOftadeh/add-help-button 
Added help button to drop-down list
 2018-08-13 15:02:26 -04:00
Anton Georgiev
ca873cd6da
Merge pull request #5839 from KDSBrowne/5782-move-set-status 
Move set status menu to user item dropdown
 2018-08-13 15:00:04 -04:00
KDSBrowne
6c51f2e7e9 clean up code 2018-08-13 18:47:22 +00:00
KDSBrowne
d8982843fd remove UserAction wrapper 2018-08-13 16:27:56 +00:00
KDSBrowne
5d4f9c8981 change parameter name to something more meaningful 2018-08-13 15:05:15 +00:00
Maxim Khlobystov
fdf0615d04 Fixing linter errors in the video-provider component. 2018-08-12 18:40:53 -04:00
Maxim Khlobystov
cf1de23629 Properly handling ice connection state errors. 2018-08-12 18:39:39 -04:00
Bobak Oftadeh
55eb076dd9 Improved implementation of showHelpButton 2018-08-10 12:35:14 -07:00
Anton Georgiev
ff3b19a3bf add log on successful and unsuccessful login 2018-08-10 17:51:12 +00:00
Bobak Oftadeh
4d0b8418db Added help icon 2018-08-10 08:29:52 -07:00
Anton Georgiev
373bdae362
Merge pull request #5929 from jfsiebel/add-html5-group-chat-support 
Update chat messages in HTML5 to use new group chat messages
 2018-08-10 10:54:02 -04:00
Bobak Oftadeh
9feb47a1ca Option to disable the help button added 2018-08-09 15:40:52 -07:00
Bobak Oftadeh
7b9de769a7 Added help button to the drop-down list 2018-08-09 14:08:16 -07:00
KDSBrowne
fecbee16b5 change folder / component names & localized strings 2018-08-09 17:02:18 +00:00
KDSBrowne
f8026b1b9a toggle screenshare btn color 2018-08-07 23:10:24 +00:00
KDSBrowne
155b36f929 add desktop unshare icon 2018-08-07 23:02:11 +00:00
KDSBrowne
12f5fffa93 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5909-toggle-screenshare-icon 2018-08-05 23:47:16 +00:00
Anton Georgiev
56b9e515c4
Merge pull request #5959 from BobakOftadeh/indicator-performance-boost 
Pulse animation performance improved
 2018-08-03 16:34:56 -04:00