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 |
|
Joao Siebel
|
97a0a2a13b
|
configurable shortcuts available. close #6169
|
2018-10-31 15:51:56 -03: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
|
ee41c0bd93
|
adjust variable names / remove duplicate return
|
2018-10-30 13:17:40 +00:00 |
|
Bobak Oftadeh
|
6bde6b06f5
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-29 14:39:25 -07:00 |
|
Tainan Felipe
|
07d89a0132
|
Add intl to breakout room name
|
2018-10-29 16:29:45 -03:00 |
|
Chad Pilkey
|
7e99929214
|
[HTML5] delay the notfication that the echo test is connected
|
2018-10-29 09:41:05 -07:00 |
|
Tainan Felipe
|
fceeca3795
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-26 11:52:54 -03:00 |
|
Anton Georgiev
|
a5c2ddc602
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
|
2018-10-25 17:58:00 +00:00 |
|
KDSBrowne
|
3f521a6f6a
|
Merge branch 'html5-theming' into test-merge-anton
|
2018-10-25 16:33:56 +00:00 |
|
KDSBrowne
|
47218ea351
|
Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton
|
2018-10-25 16:18:31 +00:00 |
|
Fred Dixon
|
c807da095f
|
Update sip.js
Fix #6167
|
2018-10-24 16:26:20 -04:00 |
|
Anton Georgiev
|
ef9f248607
|
Merge branch 'master' into html5-theming
|
2018-10-24 14:58:59 -04:00 |
|
Chad Pilkey
|
81983ae1e1
|
Stop HTML5 ejecting from voice on reconnect and fix voice user creation
|
2018-10-24 11:40:38 -07:00 |
|
Anton Georgiev
|
cde6311a5d
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
|
2018-10-24 18:26:13 +00:00 |
|
Anton Georgiev
|
57dc55b559
|
drop metadata configs; use userdata configs for autoSwap
|
2018-10-23 20:44:17 +00:00 |
|
Tainan Felipe
|
cf08440a25
|
Remove function
|
2018-10-23 15:16:34 -03:00 |
|
Tainan Felipe
|
c53a007438
|
Remove chages on modifier
|
2018-10-23 15:15:10 -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
|
c2538be574
|
Remove consoles
|
2018-10-23 14:27:48 -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 |
|
Bobak Oftadeh
|
0cde376e67
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-22 10:06:18 -07:00 |
|
João Francisco Siebel
|
f936e319de
|
implement configurable whiteboard tools. close #5826
|
2018-10-19 14:05:56 -03:00 |
|
João Francisco Siebel
|
252bacb917
|
Add multiUserPenOnly parameter in yml
|
2018-10-18 14:03:11 -03:00 |
|
KDSBrowne
|
bae71203a5
|
Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router
|
2018-10-17 20:34:05 +00:00 |
|
Tainan Felipe
|
bd01d7e4aa
|
to squash
|
2018-10-16 14:55:20 -03:00 |
|
Anton Georgiev
|
b2df10c635
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
|
2018-10-16 16:06:37 +00:00 |
|
KDSBrowne
|
45eeb1d400
|
Merge remote-tracking branch 'Upstream/master' into start-poll-01
|
2018-10-16 15:19:24 +00:00 |
|
Bobak Oftadeh
|
0a3568cc74
|
Added mute meeting settings to yml file
|
2018-10-15 15:24:56 -07:00 |
|
KDSBrowne
|
6c377b97bf
|
add formatted strings
|
2018-10-15 19:05:50 +00:00 |
|
Bobak Oftadeh
|
21b84a5303
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-12 09:17:19 -07:00 |
|
Bobak Oftadeh
|
52aa4fd3c1
|
Mute meeting functionality implemented
|
2018-10-11 14:27:56 -07:00 |
|
KDSBrowne
|
a955a7c0f1
|
replace createContainer with withTracker
|
2018-10-11 03:01:59 +00:00 |
|
KDSBrowne
|
5654f08b43
|
clean up code
|
2018-10-10 18:25:35 +00:00 |
|
KDSBrowne
|
7673adee1b
|
implement live results for poll
|
2018-10-10 15:52:39 +00:00 |
|
João Francisco Siebel
|
74dfa52071
|
handle system messages on main public chat
|
2018-10-08 11:22:45 -03:00 |
|
prlanzarin
|
2741022cb2
|
Updated kurento-utils WebRTC calls, added permission request on listen only for safari
Also fixed a resource leak on listen only fallback and transitioned the SFU listen only from a tag-based approach to MediaStream
|
2018-10-03 18:39:55 +00:00 |
|
Anton Georgiev
|
02905fb90d
|
react-router removed, lots of code commented out, client loads
|
2018-10-03 16:14:10 +00:00 |
|
KDSBrowne
|
0f277a66d1
|
replace if condition in map() with filter()
|
2018-10-03 11:51:04 +00:00 |
|
Anton Georgiev
|
faac6a0d5d
|
maintain array of user roles so they are unique
|
2018-09-25 19:24:43 +00:00 |
|
KDSBrowne
|
cf23293e10
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-09-25 12:44:38 +00:00 |
|
Anton Georgiev
|
76180a0580
|
Merge pull request #6076 from jfsiebel/custom-user-settings
Custom user settings
|
2018-09-25 08:29:48 -04:00 |
|
KDSBrowne
|
86d48298c6
|
add ability to publish / stop poll
|
2018-09-24 22:43:54 +00:00 |
|
KDSBrowne
|
3430321a68
|
Merge remote-tracking branch 'upstream/master' into start-poll-01
|
2018-09-23 23:08:24 +00:00 |
|
KDSBrowne
|
8320493e6a
|
add ability to start custom poll
|
2018-09-23 23:05:13 +00:00 |
|
KDSBrowne
|
f3bd048d56
|
clean up code / add formatted messages / fix bugs
|
2018-09-23 22:57:03 +00:00 |
|
João Francisco Siebel
|
a445e0d2e5
|
make whiteboard tools list configurable
|
2018-09-21 16:42:39 -03:00 |
|
João Francisco Siebel
|
3c3a5ae59a
|
implement multiUserPenOnly configuration
|
2018-09-21 13:42:00 -03:00 |
|
João Francisco Siebel
|
b832921be2
|
fix settings list
|
2018-09-19 17:34:23 -03:00 |
|
João Francisco Siebel
|
bb58a3fde6
|
let server handle parameters
|
2018-09-19 17:32:17 -03:00 |
|
Anton Georgiev
|
8c0394f52e
|
Merge pull request #6085 from oswaldoacauan/fix-missing-stuff-on-meeting-removal
Fix not clearing pods and token when removing a meeting
|
2018-09-19 14:45:02 -04:00 |
|
Oswaldo Acauan
|
1c12b380a2
|
Fix not clearing pods and token when removing a meeting
|
2018-09-19 14:48:15 -03:00 |
|
Tainan Felipe
|
210dbbbeaf
|
Merge remote-tracking branch 'upstream/master' into zoom-implementation
|
2018-09-17 15:20:20 -03:00 |
|
João Francisco Siebel
|
e750ceb0a1
|
make a single makeCall in auth
|
2018-09-17 14:05:39 -03:00 |
|
João Francisco Siebel
|
4c35608c2b
|
Add users-settings collection and handle dynamic configuration
|
2018-09-13 15:09:30 -03:00 |
|
Oswaldo Acauan
|
88f7d6d7dd
|
Merge remote-tracking branch 'upstream/master' into upload-token
|
2018-09-11 16:17:38 -03:00 |
|
Oswaldo Acauan
|
5c9518bd27
|
Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948
|
2018-09-11 16:00:49 -03:00 |
|
Anton Georgiev
|
35c0a12373
|
Merge pull request #6055 from bigbluebutton/v2.0.x-release
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
|
2018-09-10 15:09:55 -04:00 |
|
Bobak Oftadeh
|
053e0f93fc
|
Fixed issue where unnecessary information was being published to the client.
|
2018-09-10 08:34:25 -07:00 |
|
Anton Georgiev
|
68e02efe80
|
add missing Meeting const in addUser.js
|
2018-09-06 22:33:32 +00:00 |
|
Anton Georgiev
|
1462810b96
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0
|
2018-09-06 22:06:40 +00:00 |
|
Anton Georgiev
|
49c0e7b9b1
|
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2
Better handling of screensharing ice connection state errors.
|
2018-09-04 13:14:08 -04:00 |
|
Maxim Khlobystov
|
5825b635ba
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2
|
2018-08-30 16:07:52 -04:00 |
|
prlanzarin
|
dc767d9bdb
|
Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown
|
2018-08-30 02:41:02 +00:00 |
|
prlanzarin
|
a7bfb985d3
|
Improvements to Safari/Chrome autoplay policies with placeholder buffer on audiocontext and bogus audio + upstarting audio tag as muted
|
2018-08-29 19:12:34 +00:00 |
|
Tainan Felipe
|
257b4cc8ac
|
port flash code to js and implement initial work in zoom
|
2018-08-28 14:14:01 -03:00 |
|
Tainan Felipe
|
25834dd4f8
|
zoom calc based in flash
|
2018-08-28 14:13:18 -03:00 |
|
Maxim Khlobystov
|
82a69fb902
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2
|
2018-08-28 12:49:06 -04:00 |
|
prlanzarin
|
4f99173d38
|
Using default input stream for SFU listne only
|
2018-08-28 15:24:06 +00:00 |
|
Maxim Khlobystov
|
fc3e46493e
|
Linting.
|
2018-08-23 11:49:16 -04:00 |
|
Maxim Khlobystov
|
242200ac91
|
Replaced Ice with ICE in strings.
|
2018-08-22 14:51:25 -04:00 |
|
Maxim Khlobystov
|
d67aba6c8a
|
Listening to ice connection failures when screensharing.
|
2018-08-22 14:10:08 -04:00 |
|
Anton Georgiev
|
a09ef26166
|
Merge pull request #5983 from jfsiebel/akka-add-sync-voice-user
Add SyncGetVoiceUsersRespMsg message in akka
|
2018-08-20 13:12:37 -04:00 |
|
Anton Georgiev
|
a0a46e5338
|
Merge branch 'akka-add-sync-voice-user' of github.com:jfsiebel/bigbluebutton into test-5983
|
2018-08-20 15:44:23 +00:00 |
|
Joao Siebel
|
c0b33de410
|
re-use function
|
2018-08-16 09:21:13 -03:00 |
|
Joao Siebel
|
04631f5e6e
|
remove 🐛
|
2018-08-15 14:31:07 -03:00 |
|
Joao Siebel
|
445d710b2a
|
handle SyncGetVoiceUsersRespMsg on meteor
|
2018-08-15 13:45:00 -03:00 |
|
Anton Georgiev
|
91b21540fa
|
Merge pull request #5970 from prlanzarin/html5-guest-always-accept
Added support for ALWAYS_ACCEPT guest policy in the HTML5 client
|
2018-08-14 15:00:06 -04:00 |
|