KDSBrowne
|
10d5d0706e
|
remove visible recording label / add missing formatted string / fix recording icon
|
2018-11-07 02:20:19 +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 |
|
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 |
|
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 |
|
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 |
|
Anton Georgiev
|
05da6ff047
|
toggle PublicChat
|
2018-10-26 12:36:51 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|