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 |
|
Fred Dixon
|
18c3836886
|
Merge pull request #6222 from fcecagno/webhooks-on-1.1
Fix webhooks
|
2018-11-03 23:42:58 -04:00 |
|
Felipe Cecagno
|
f2c4cb7165
|
add external meeting id to rap-archive-started from mapping
|
2018-11-04 00:27:01 -03:00 |
|
Ghazi Triki
|
0f41551530
|
Add meetingid GET parameter to endCallbackUrl.
|
2018-11-03 17:06:16 +01:00 |
|
KDSBrowne
|
8378606889
|
move presenter and poll check to UserPolls
|
2018-11-02 21:43:49 +00:00 |
|
Richard Alam
|
ccf79b8bca
|
Merge pull request #6214 from riadvice/merge-2.x-release-into-master
Merge 2.0-RC7 release into master
|
2018-11-02 17:39:48 -04: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 |
|
Ghazi Triki
|
827a900d9a
|
Update MainApplicationShell code style.
|
2018-11-02 20:58:12 +01:00 |
|
Ghazi Triki
|
a52e907593
|
Fix API calls.
|
2018-11-02 20:57:54 +01:00 |
|
Ghazi Triki
|
2ca74819ce
|
Improve freemaker templates.
|
2018-11-02 20:57:33 +01:00 |
|
Richard Alam
|
0ce0845ca7
|
Merge pull request #6219 from riadvice/fix-meta-storage
Fix storing meeting metadata
|
2018-11-02 12:58:56 -04:00 |
|
Ghazi Triki
|
56a7038d8a
|
Fix storing meeting metadata
|
2018-11-02 17:51:15 +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
|
50bc9135e0
|
Merge pull request #6217 from bigbluebutton/revert-6081-full-width-cameras
Revert "Make it so that cameras use the full space of the video window"
|
2018-11-02 09:24:33 -04:00 |
|
Ghazi Triki
|
0ff63f9cde
|
Remove HTML escaping in freemaker templates, it is automatic since version 2.3.24 and fixed metadata display.
|
2018-11-01 21:52:53 +01:00 |
|
Anton Georgiev
|
cc453e027d
|
Merge pull request #6201 from capilkey/html5-delay-echo-test
[HTML5] delay the notfication that the echo test is connected
|
2018-11-01 16:06:53 -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 |
|
Anton Georgiev
|
615fca3a48
|
add demo_iframe.jsp for #6215
|
2018-11-01 17:52:03 +00: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
|
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 |
|
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 |
|
Anton Georgiev
|
fe82032f89
|
Merge pull request #6205 from Tainan404/fix-cursor-video-dock
Add pointer cursor when hover over the video dropdown
|
2018-10-30 11:12:01 -04: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 |
|