Ghazi Triki
|
fc4028d6de
|
Redis refactoring : remove duplicate classes, factorisation and build configuration update.
|
2018-11-09 20:19:46 +01:00 |
|
Ghazi Triki
|
6b1fa41777
|
Updated bbb-fsesl-client project to use sbt 1.2.6 and scala 2.12.7
|
2018-11-09 10:33:45 +01:00 |
|
Ghazi Triki
|
0614ccd763
|
Updated akka-bbb-apps project to use sbt 1.2.6 and scala 2.12.7
|
2018-11-08 14:53:00 +01:00 |
|
Ghazi Triki
|
3c758cc9d1
|
Replace lettuce methods by custom commands.
|
2018-11-07 21:02:54 +01:00 |
|
Ghazi Triki
|
21cb59487c
|
Move RedisStorageService from bigbluebutton-web to bbb-common-message and replace jedis with lettuce-core.
|
2018-11-06 18:54:27 +01:00 |
|
Ghazi Triki
|
e812160ee9
|
Fix bbb-common-message unit tests.
|
2018-11-06 15:45:42 +01:00 |
|
Ghazi Triki
|
d330c6687b
|
Updated bbb-common-web project to use sbt 1.2.6 and scala 2.12.7
|
2018-11-06 14:43:03 +01:00 |
|
Ghazi Triki
|
acd42835b4
|
Updated bbb-common-message project to use sby 1.2.6 and scala 2.12.7
|
2018-11-05 21:11:58 +01:00 |
|
Richard Alam
|
eaf41f719d
|
Merge pull request #6220 from riadvice/meetingid-for-end-meeting-callback
Add `meetingid` GET parameter to endCallbackUrl
|
2018-11-05 12:23:13 -05:00 |
|
Ghazi Triki
|
0f41551530
|
Add meetingid GET parameter to endCallbackUrl.
|
2018-11-03 17:06:16 +01: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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Joao Siebel
|
97a0a2a13b
|
configurable shortcuts available. close #6169
|
2018-10-31 15:51:56 -03:00 |
|
Tainan Felipe
|
7243d3bbc3
|
Fix css variable was not working
|
2018-10-30 13:19:22 -03: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 |
|
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 |
|
Tainan Felipe
|
07d89a0132
|
Add intl to breakout room name
|
2018-10-29 16:29:45 -03: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 |
|
Tainan Felipe
|
32dd8c4740
|
migrate to session
|
2018-10-26 12:16:29 -03:00 |
|
Anton Georgiev
|
35921df58d
|
Merge pull request #6198 from antobinary/fix-chat-toggle
Updated package-lock.json
|
2018-10-26 11:13:17 -04:00 |
|
Tainan Felipe
|
fceeca3795
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-26 11:52:54 -03:00 |
|
Anton Georgiev
|
8dfdaa0f29
|
added "repository" to package.json
|
2018-10-26 14:35:42 +00:00 |
|
Anton Georgiev
|
4a1de5c924
|
updated packages to fix vulnerabilities (npm audit)
|
2018-10-26 14:21:25 +00:00 |
|
João Francisco Siebel
|
b9aff5a6f1
|
handle empty tool list. close #6171
|
2018-10-26 11:17:41 -03:00 |
|
Anton Georgiev
|
627972ed02
|
updated package-lock.json
|
2018-10-26 14:05:55 +00:00 |
|
Anton Georgiev
|
9b93cfc985
|
Merge pull request #6196 from antobinary/fix-chat-toggle
Recover toggle PublicChat
|
2018-10-26 08:43:09 -04:00 |
|
Anton Georgiev
|
05da6ff047
|
toggle PublicChat
|
2018-10-26 12:36:51 +00:00 |
|
Chad Pilkey
|
952f777c59
|
Merge pull request #6195 from bigbluebutton/tack-sip-conn-ids
Track sip conn ids
|
2018-10-25 19:24:18 -04:00 |
|
Richard Alam
|
e1e07db885
|
- we still need to remove the connection from the global audio list but not send the global audio left event
to akka-apps
|
2018-10-25 16:21:47 -07:00 |
|
Richard Alam
|
82bff6d573
|
- check if the client reconnected and when the old connection cleans up, do not hangup the
user from the voice conference
|
2018-10-25 15:56:09 -07:00 |
|