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

5025 Commits

Author SHA1 Message Date
Tainan Felipe
de66a7bd12 Add button for set free join status on create breakout room modal 2018-11-21 14:46:29 -02:00
KDSBrowne
f9ec2c3759 fix null event error in firefox 2018-11-12 16:45:37 +00:00
Anton Georgiev
ce26a3ed5e
Merge branch 'master' into remove-client-side-acl 2018-11-12 11:29:43 -05:00
Tainan Felipe
460cbdbcde Re-add settings 2018-11-12 09:46:20 -02:00
João Francisco Siebel
076864ffd0 merge with master 2018-11-09 13:54:33 -02:00
Tainan Felipe
164835d49b
Merge branch 'master' into breakout-room-html5 2018-11-09 13:49:15 -02: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
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
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
Tainan Felipe
060435d54e Rename from Breakout-room to breakout-room 2018-11-06 13:42:30 -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
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
5ea3ff2a7c Add permissioin on acl to moderator end breakout 2018-11-01 15:04:56 -03: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
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
f4f34757ca set isPollOpen default 2018-10-31 18:20:03 +00:00
KDSBrowne
38ae789b4a fix userlist poll heading remaining after presenter toggle 2018-10-31 17:28:35 +00:00
KDSBrowne
89a885b2df rename selectors and change to const 2018-10-31 14:03:48 +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
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
Tainan Felipe
a0a2b7605f Rename function breakouts to findBreakouts 2018-10-29 16:36:45 -03:00