Tainan Felipe
|
0918cc4084
|
Merge remote-tracking branch 'upstream/master' into issue-6392
|
2019-01-14 09:30:59 -02:00 |
|
Anton Georgiev
|
bd1150550f
|
Merge pull request #6516 from jfsiebel/save-chat-public-messages
Add Welcome Message back to save/copy chat
|
2019-01-09 15:20:17 -05:00 |
|
João Francisco Siebel
|
fa70c04375
|
add welcome message and moderator only message to save/copy chat feature and fix a race condition bug when clearing the chat. close #6314
|
2019-01-09 09:36:14 -02:00 |
|
Bobak Oftadeh
|
dd89bed5e8
|
Added checks to meetingId
|
2019-01-08 14:21:47 -08:00 |
|
Bobak Oftadeh
|
b41761350d
|
Improved checks for record time
|
2019-01-04 21:32:59 +00:00 |
|
Bobak Oftadeh
|
e4d97538a3
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testRecord
|
2019-01-03 20:28:27 +00:00 |
|
Bobak Oftadeh
|
eb5c061e8f
|
Implemented recording timer
|
2019-01-03 18:43:17 +00:00 |
|
Tainan Felipe
|
1529ff8043
|
Rename functions and variables
|
2018-12-28 09:51:41 -02:00 |
|
Tainan Felipe
|
53c935b7eb
|
Add breakout room invitation feature
|
2018-12-27 14:20:03 -02:00 |
|
Tainan Felipe
|
66bf810002
|
Fix countdown doesn't appearing in breakout room
|
2018-12-18 09:04:23 -02:00 |
|
Anton Georgiev
|
afa1a64e79
|
improve format of callbacks on collection document removal
|
2018-12-14 20:19:10 +00:00 |
|
Anton Georgiev
|
12745605b4
|
Merge pull request #6393 from jfsiebel/presenter-default-pod
Set presenter in default pod
🤞
|
2018-12-13 12:52:46 -05:00 |
|
João Francisco Siebel
|
8ce7f85dde
|
add meetingId to filter results and avoid a bug with multiple meetings
|
2018-12-13 15:45:46 -02:00 |
|
Anton Georgiev
|
fbb12b055e
|
Merge pull request #6276 from Tainan404/issue-6262
Add drag & drop grid for breakout rooms
|
2018-12-13 11:35:24 -05:00 |
|
João Francisco Siebel
|
e4eae33c8a
|
implement setPresenterInPodReqMsg method as attempt to close #6109 and close #5941
|
2018-12-12 10:28:08 -02:00 |
|
Anton Georgiev
|
55f116cc95
|
revert presenter assign 6270 6326
|
2018-12-06 19:07:51 +00:00 |
|
João Francisco Siebel
|
6a84618982
|
increase zoom increment factor to 25. close #6301
|
2018-12-05 09:00:12 -02:00 |
|
João Francisco Siebel
|
ec91afdd58
|
simplify assignPresenter flow
|
2018-11-30 17:34:00 -02:00 |
|
Anton Georgiev
|
ec3aa585ce
|
Merge pull request #6270 from jfsiebel/html5-set-presenter-default-pod
Set HTML5 client as presenter in default pod
|
2018-11-22 14:24:41 -02:00 |
|
Tainan Felipe
|
de66a7bd12
|
Add button for set free join status on create breakout room modal
|
2018-11-21 14:46:29 -02:00 |
|
Bobak Oftadeh
|
8f0142aac1
|
Improved check on lockSettingsProp
|
2018-11-21 16:39:34 +00:00 |
|
Bobak Oftadeh
|
ce2eb21b57
|
changed micLocked check
|
2018-11-21 12:59:30 +00:00 |
|
Bobak Oftadeh
|
70b533ba2e
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-21 12:25:53 +00:00 |
|
João Francisco Siebel
|
877b9335b3
|
rename variable and add comments for better understanding
|
2018-11-20 18:14:17 -02:00 |
|
João Francisco Siebel
|
d8a2cb3883
|
set html5 client as pod presenter. close #6109 and close #5941
|
2018-11-20 17:44:05 -02:00 |
|
Bobak Oftadeh
|
e6e40d8c84
|
removed ALLOW_MODERATOR_TO_UNMUTE_AUDIO check
|
2018-11-20 16:15:02 +00:00 |
|
Bobak Oftadeh
|
caabc100ac
|
fixed spacing in lock-modal styles
|
2018-11-19 20:07:39 +00:00 |
|
Bobak Oftadeh
|
4649fe7c76
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-16 13:32:29 -08:00 |
|
Bobak Oftadeh
|
15d4e84d55
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-16 12:06:57 -08:00 |
|
Bobak Oftadeh
|
bafa4c15cc
|
Added log message when meeting is muted
|
2018-11-15 14:07:47 -08:00 |
|
Bobak Oftadeh
|
5fb58cd604
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-11-15 12:55:57 -08:00 |
|
Bobak Oftadeh
|
31d59e21ec
|
Viewers join listen only when microphones are locked
|
2018-11-15 12:53:03 -08:00 |
|
Richard Alam
|
d1dad75898
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14
|
2018-11-14 08:47:21 -08:00 |
|
Bobak Oftadeh
|
cd6aae26e4
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-13 14:20:50 -08:00 |
|
Bobak Oftadeh
|
6dd6fb714f
|
Implemented listen-only on startup when viewer joins with mic locked settings
|
2018-11-13 14:18:26 -08:00 |
|
bobakoftadeh
|
c33723ac14
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-12 09:15:55 -08:00 |
|
Anton Georgiev
|
98ac77dc03
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands
|
2018-11-12 17:01:06 +00:00 |
|
bobakoftadeh
|
04421e631b
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-mange-b
|
2018-11-12 08:40:47 -08:00 |
|
bobakoftadeh
|
87f63baa5a
|
Improved interface for lock settings modal
|
2018-11-09 16:25:15 -08:00 |
|
João Francisco Siebel
|
076864ffd0
|
merge with master
|
2018-11-09 13:54:33 -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 |
|
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 |
|
João Francisco Siebel
|
016efcc0eb
|
Remove ACL from client side. close #6138
|
2018-11-05 17:30:37 -02: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
|
357f341a3e
|
Merge branch 'master' into breakout-room-html5
|
2018-11-02 09:26:09 -04:00 |
|
Anton Georgiev
|
04883ffcdb
|
handle iframe toggleRecording and toggle self muting
|
2018-11-01 15:03:16 +00: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 |
|