Commit Graph

392 Commits

Author SHA1 Message Date
Anton Georgiev
2539d55048 addressing a race condition causing Auth timeout 2018-12-11 23:46:21 +00:00
Anton Georgiev
f375d4ab14
Merge pull request #6359 from jfsiebel/unread-chat-notification
Fix unread chat notification.
2018-12-10 13:36:33 -05:00
Tainan Felipe
bbc249483c Fix liter errors 2018-12-10 15:05:17 -02:00
Tainan Felipe
e59e04a23f testing async await to join 2018-12-10 13:52:25 -02:00
João Francisco Siebel
46d65489d9 fix unread chat notification. close #6258 2018-12-10 09:28:29 -02:00
Anton Georgiev
452a12287b improve signal for audio join/leave when in iframe 2018-11-28 21:42:24 +00:00
Anton Georgiev
fea8c267cc improve on listeners for state outside iframe 2018-11-13 17:14:30 +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
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
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -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
Anton Georgiev
30c43795af work on chat alert 2018-10-16 17:48:27 +00:00
Anton Georgiev
b2df10c635 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-16 16:06:37 +00:00
Anton Georgiev
27a41753f9 hooked on error pages via Session 2018-10-12 17:05:30 +00:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +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
João Francisco Siebel
ebad6cf6a4 remove debug 2018-09-14 14:53:29 -03:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Anton Georgiev
885539bb2a
Merge pull request #6057 from prlanzarin/listen-only-fallback
Add SIP.js listen only as fallback when SFU is enabled
2018-09-11 13:50:10 -04:00
prlanzarin
fe9835b5f7 Add SIP.js listen only as fallback when SFU is enabled 2018-09-11 17:09:29 +00: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
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
681422dc61 fix listenOnly being interpreted as muted audio (client side) 2018-09-06 18:44:59 +00: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
b4052f7052 Resolving listen only stream correctly 2018-08-29 19:59:33 +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
prlanzarin
a9b98b6f7f Handling fake audio tag play exception, reduced timeout to match sound length and removed permission fallback from audio 2018-08-27 20:56:51 +00:00
Anton Georgiev
ed173b813a fix linting 2018-08-13 19:52:44 +00:00
Anton Georgiev
ff3b19a3bf add log on successful and unsuccessful login 2018-08-10 17:51:12 +00:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support 2018-08-01 14:24:00 -04:00
Joao Siebel
03389a8adc fix unread message counter for private chats 2018-07-31 14:13:36 -03:00
João Francisco Siebel
655483576f fix unread messages counter on public chat and remove some old chat configurations 2018-07-27 10:44:21 -03:00
Lucas Fialho Zawacki
2fc85f75e1 New Logging format for listenonly audio and screenshare 2018-07-25 19:08:24 -03:00
Lucas Fialho Zawacki
b667c53590 Get more detailed logs from the video component 2018-07-25 18:53:12 -03:00
prlanzarin
7d70ff371c Fixed webkit thing with a candid hack 2018-07-25 16:55:13 +00:00
prlanzarin
6e87e9c67b Initial fake audio for webkit autoplay fix 2018-07-25 15:14:38 +00:00
Bobak Oftadeh
0db93d35b9 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-20 09:42:11 -07:00
Tainan Felipe
5b84652fc4 Add speak icon when is voice only 2018-07-16 15:17:49 -03:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
Tainan Felipe
957a2ef02c Tiny fixes in chat and notifications (#5807)
* don't notify old messages when user reload the client

* fix chat height
2018-07-04 14:12:08 -03:00
Anton Georgiev
915c1bae8b
Merge pull request #5757 from Tainan404/issue-5714
Add some messages about audio errors
2018-07-03 11:22:45 -04:00
Anton Georgiev
52a0c68d64
Merge pull request #5792 from prlanzarin/audio-state-fix
Fixed audio state bug (#5519)
2018-07-03 10:18:49 -04:00
prlanzarin
19f2802ef9 Fixed full audio exit when kurento listen only is enabled 2018-07-02 16:50:09 +00:00
prlanzarin
769143ad48 Fixed audio state bug regarding ICE connection 2018-07-02 15:36:48 +00:00
Paulo Lanzarin
7d414e8b7d
Merge branch 'v2.0.x-release' into sfu-opt-audio 2018-06-27 14:44:11 -03:00
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Tainan Felipe
7dc251fc5a add treater of webrtc error 2018-06-27 10:56:03 -03:00
Anton Georgiev
3546e49379 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into breakouts-improvements-3 2018-06-20 16:02:06 +00:00
Anton Georgiev
7b8d568a54 fix redundant offer to join audio re breakouts 2018-06-20 15:36:26 +00:00
Anton Georgiev
22616a132b reset isEchoTest so value is always correct 2018-06-19 15:40:19 +00:00
Tainan Felipe
46807039a4 add a small style for toast notification and add a content prop in toast 2018-06-12 14:21:31 -03:00
Tainan Felipe
39399fc235 revert unread counter for count by messages 2018-06-08 15:40:35 -03:00
Tainan Felipe
b180a7c350 add messages for chat notification and add link to chat 2018-05-29 13:43:11 -03:00
Anton Georgiev
d6f91228d6
Merge pull request #5436 from Tainan404/issue-5419
Clear session storage to enter
2018-05-15 07:23:31 -04:00
Tainan Felipe
84b2342fef remove changes in audio-maneger 2018-05-14 13:48:41 -03:00
Anton Georgiev
13e6eb1a05
Merge pull request #5404 from Tainan404/implement-feedback-screen
Implement feedback screen
2018-05-14 10:19:53 -04:00
Anton Georgiev
45ab9da9d1 add logging for failing audio 2018-05-10 18:11:49 +00:00
Tainan Felipe
8c93916f2c remove changes on reactive.js 2018-05-09 16:04:07 -03:00
Tainan Felipe
0707924a47 pass rating to meeting-ended and create feedback endpoint 2018-05-09 15:07:40 -03:00
Tainan Felipe
10a90b4180 WIP 2018-05-08 13:30:00 -03:00
Tainan Felipe
9d95cef783 fix mute proptypes 2018-05-02 14:03:58 -03:00
prlanzarin
42ed428461 Added config to enable kurento listen only bridge 2018-05-02 15:49:57 +00:00
Tainan Felipe
19c233adc4 Clear session storage to enter 2018-04-30 15:52:47 -03:00
Anton Georgiev
8cbbdb1e1d
Merge pull request #5371 from Tainan404/issue-5366
set audio messages in a own function.
2018-04-23 16:16:44 -04:00
Anton Georgiev
f8be0d2cd8
Merge pull request #5364 from jfsiebel/fix-media-tab-indication
Fix problem on joining audio in Firefox
2018-04-23 13:01:40 -04:00
Tainan Felipe
60ae723dd4 add function setAudioMessages in audio manager service 2018-04-19 16:57:54 -03:00
João Francisco Siebel
f122fc5a4b Fix problem in firefox on joining audio 2018-04-18 11:15:17 -03:00
Anton Georgiev
7a78bda94b
Merge pull request #5348 from jfsiebel/fix-media-tab-indication
Fix media tab indication on audio exit
2018-04-17 13:46:58 -04:00
João Francisco Siebel
5bfc76dca5 fix getTracks of undefined 2018-04-17 14:09:05 -03:00
João Francisco Siebel
16788eed87 Remove all media tracks on exit audio 2018-04-13 09:39:26 -03:00
Oswaldo Acauan
5918fc4483 Impl new webcam design 2018-04-09 11:39:27 -03:00
Tainan Felipe
d206ffde93 Comply lock setting 'see other viewer's webcams' 2018-04-04 10:10:46 -03:00
Oswaldo Acauan
df0a53d67c Merge branch 'fix-4690' of https://github.com/oswaldoacauan/bigbluebutton into fix-4690 2018-04-03 10:20:19 -03:00
Oswaldo Acauan
21550c1d3c Fix wrong connecting state when joining mic or echo test 2018-04-03 10:19:50 -03:00
Oswaldo Acauan
1465c83fb6
Merge branch 'v2.0.x-release' into fix-4690 2018-04-02 12:50:45 -03:00
Oswaldo Acauan
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03:00
Oswaldo Acauan
5141b71d4f Prevent infinity loop when joining listen only 2018-03-15 16:30:50 -03:00
Oswaldo Acauan
bcaa8b2f6d Remove getUserMedia in the first join as listen only 2018-03-15 15:57:25 -03:00
Anton Georgiev
42809a61f0
Merge pull request #5099 from jfsiebel/screenshare-data-saving-setting
Implement screen share data saving setting
2018-03-05 11:54:48 -05:00
Oswaldo Acauan
2f741df97b Impl user-session based connections on server. Fix #5150
Implement a connectionId for each user, each time a user try to validate we change their connectionId
and end all other connections of that user.
2018-02-20 11:26:36 -03:00
João Francisco Siebel
6bb031076b Resolve merge problems 2018-02-19 14:00:43 -03:00
Tainan Felipe Pauli de Almeida
38e3ce3013 Merge remote-tracking branch 'upstream/v2.0.x-release' into lock-settings 2018-02-06 13:21:22 -02:00
Joao Siebel
eddc480851 Implement screenshare data saving setting. Fix #5029 2018-02-06 11:33:48 -02:00
Anton Georgiev
f789842ccb
Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user
Prevent kicked user's ability to rejoin meeting via back btn
2018-01-30 15:10:46 -05:00
KDSBrowne
6b1e39008c move if condition for User.ejected 2018-01-29 20:23:56 -08:00
KDSBrowne
aa4a7ef48c clean up code 2018-01-29 11:07:02 -08:00
KDSBrowne
90bfea5d77 check if user was ejected 2018-01-29 10:17:52 -08:00
Tainan Felipe Pauli de Almeida
fc5ae9b07e apply lock settings on webcam sharing 2018-01-29 09:52:07 -02:00
KDSBrowne
d0f6e4f3a2 add console logs to determin flow 2018-01-26 14:17:34 -08:00
Anton Georgiev
748ee1279a
Merge pull request #4941 from MaximKhlobystov/mute-button-icon-update-fix
[HTML5 Client] Fix for Mute/Unmute button's icon update.
2018-01-16 14:06:30 -02:00
Maxim Khlobystov
893067139b Declared the muteHandle variable. 2018-01-16 10:56:31 -05:00
Maxim Khlobystov
d9955ae286 Small cleanup. 2018-01-15 16:13:18 -05:00
Maxim Khlobystov
1394984be7 Made the mute/unmute observer work. 2018-01-15 16:01:57 -05:00
Tainan Felipe
8ae1fd1820 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends 2018-01-11 09:19:56 -02:00
Maxim Khlobystov
aeb1aeb14b Made sure the mute/unmute button is updated when Flash client mutes/unmutes HTML5 client. 2018-01-10 15:51:10 -05:00
Maxim Khlobystov
12e474fa01 Doing the mute/unmute flag change inside the Audio Manager instead of using Mongo observer. 2018-01-10 15:41:21 -05:00
Oswaldo Acauan
eb4c89aefc Fix bug when users re-validate after refresh 2017-12-19 10:19:47 -02:00
Oswaldo Acauan
ced25948dd Fix 401 on page refresh 2017-12-18 13:52:04 -02:00
Tainan Felipe
bbbb64b4fd fix error in logoutURL 2017-12-13 16:59:24 -02:00
Oswaldo Acauan
b7fa508d9d Simplify auth code and remove clearCredentials on errors. Fix #4812 2017-12-13 16:20:47 -02:00
Anton Georgiev
a30026a5ed
Merge pull request #4804 from OZhurbenko/fix-edge-default-locale
Fixed a problem with the default locale selection in Edge
2017-12-12 16:16:38 -02:00
Oleksandr Zhurbenko
15f8099b84 Fixes a default locale selection for Edge, Windows 10 2017-12-12 09:05:43 -08:00
Gabriel Carvalho de Campes
7d333e7245 removes unwanted change in auth 2017-11-17 17:17:16 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8 fix permission overlay positioning, localizes messages 2017-11-17 17:01:52 -02:00
Gabriel Carvalho de Campes
effb21fc1f Changes and enhancements on audio, wIP 2017-11-17 09:52:48 -02:00
Gabriel Carvalho de Campes
36c9d85749 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-11-16 09:13:47 -02:00
Gabriel Carvalho de Campes
92b1081186 add permission overlay on audio 2017-11-08 16:41:15 -02:00
Gabriel Carvalho de Campes
d144aa0d00
Fixes settings service
settings service was missing a `||`
2017-11-07 14:21:43 -02:00
Maxim Khlobystov
bc1a4c473c
Merge pull request #4581 from Gcampes/locale-browser-default
Set initial locale to be the browser one
2017-11-06 11:16:36 -05:00
Gabriel Carvalho de Campes
24f66860f8 fix for browsers that do not support navigator.languages 2017-11-06 10:21:21 -02:00
Gabriel Carvalho de Campes
fa52daf34a change initial locale setting 2017-11-06 10:06:05 -02:00
Anton Georgiev
63eb812f85
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
2017-11-02 10:41:45 -02:00
Gabriel Carvalho de Campes
e55ee0d28e fix listen only dead end on permissions denied 2017-11-02 10:10:01 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Gabriel Carvalho de Campes
00bf09c4f9 Fix issue with locales 2017-10-27 09:36:27 -02:00
Gabriel Carvalho de Campes
cf73251feb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-26 16:26:19 -02:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
Oleksandr Zhurbenko
df3325e42f Fixed a bug introduced in #4524 2017-10-25 16:12:17 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
gcampes
d32330b208 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-24 11:19:58 -02:00
Oswaldo Acauan
e76459be65 Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:11:18 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
gcampes
ff35ad9602 delete unused files, cleanup code 2017-10-23 10:41:09 -02:00
Oswaldo Acauan
8af4d227db Fix notification service exports 2017-10-20 17:27:00 -02:00
Oswaldo Acauan
11908b8ecf Fix file extension and turn eslint rule off 2017-10-20 17:09:01 -02:00
Oswaldo Acauan
9f910fa26e Move hoc and service to separate dir's 2017-10-20 17:01:07 -02:00
gcampes
029a13d2a0 better error handling, code cleanup 2017-10-20 08:11:51 -02:00
Oswaldo Acauan
0686a596e9 Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-19 08:07:42 -02:00
gcampes
b15322e7f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-18 17:42:49 -02:00
gcampes
1dda597fca Toast notifications on audio and overall changes 2017-10-18 17:40:01 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
gcampes
2ae020ba9a Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor-notifications 2017-10-13 10:43:27 -03:00
gcampes
03be5d9e59 changes join listen only 2017-10-12 18:39:32 -03:00
gcampes
f89e189a88 fixes listenonly issue 2017-10-12 16:22:10 -03:00
Oleksandr Zhurbenko
430ddc0d3b Removing unnecessary 2x from the collections, publishers, subscriptions and logs 2017-10-12 12:07:02 -07:00
Oswaldo Acauan
b8261123d0 Add toast notifications 2017-10-12 15:53:33 -03:00
gcampes
fafbba06cb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-12 13:58:39 -03:00
gcampes
6b44504e5d Adds timeout to transfer, fix css, remove logs 2017-10-12 11:49:50 -03:00
gcampes
ceea7b7ed6 Implements audio transfer from echo test 2017-10-12 09:50:23 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
gcampes
3cba60201e Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-11 18:22:36 -03:00
gcampes
f943e5dd08 changes error handlers in audio 2017-10-11 18:04:10 -03:00
gcampes
f8c50b8ef7 wire up audio errors to notifications. WIP 2017-10-11 09:05:57 -03:00
gcampes
02cdcb2562 changes to styles and texts in audio flow 2017-10-10 15:03:29 -03:00
gcampes
fae131732b changes audiocontext on ios 2017-10-09 18:23:05 -03:00
gcampes
317c3e5ee9 changes to bridge and audio components. WIP 2017-10-09 17:48:10 -03:00
gcampes
40795950c2 updates to the audio manager 2017-10-04 17:49:11 -03:00
KDSBrowne
d689e7d166 fix isVoiceUser prop in mappedUser service 2017-10-04 11:45:58 -07:00
gcampes
81a430039d add echo test component. WIP 2017-10-03 17:42:10 -03:00
Oswaldo Acauan
ef5eefc786 Revert wrong isLocked mapping 2017-10-03 16:26:32 -03:00
Oswaldo Acauan
32632151d5 Fix bug when user wasnt in voiceConf 2017-10-03 16:22:26 -03:00
gcampes
37456c9db4 updates do sip bridge 2017-09-29 17:42:34 -03:00
gcampes
a26f622ba9 gets audio to work 2017-09-29 10:58:13 -03:00
gcampes
d15f0e1183 linter autofix 2017-09-29 10:42:08 -03:00
gcampes
cbb897b23f audio connects. WIP 2017-09-29 10:38:10 -03:00
Klaus
b947e27086 Fix makeCall from component, and user.isLocked from mapUser 2017-09-28 15:19:57 -03:00
gcampes
152527d1ab Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-26 14:25:11 -03:00
gcampes
ea637a1e49 first changes to audio components and services. WIP 2017-09-19 16:31:04 -03:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Oswaldo Acauan
78e88c8189 Fix unread counter 2017-08-04 15:20:54 -03:00
Oswaldo Acauan
b53636ec19 Fix avatar colors and text capitalization 2017-08-03 09:36:26 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
11cf4b8d78 A few fixes on client 2017-08-01 10:41:24 -03:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03:00
Klaus
baf36d9d5f Fix the html5 2.0 user logout 2017-07-14 13:59:02 -03:00
Klaus
111ad9171b Remove strings and add constants 2017-07-12 17:15:50 -03:00
Klaus
e1004b64d3 Filtering correct the messages 2017-07-12 10:54:54 -03:00
Klaus
73f49bb46a Sending public message 2017-07-12 09:42:16 -03:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Klaus Klein
ca09b69555 Merge branch 'Acl' into Refactor2x
* Acl:
  Add check to undefined role
  Lint to eslint
  Missing merge file
  Fix lint problems
  Change Acl lookup
  Change ACL to be more extensible
  Fix a few review comments
  Acl refactor working
  Mostly working, still problems with user subs
  Code refactored
2017-06-19 11:28:17 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Klaus Klein
b574859ab2 Merge remote-tracking branch 'upstream/master' into Acl
* upstream/master:
  Improve lint script
  Update package-lock with the new packages
  Add missing packages and fix formating
  Switched from 2 deprecated packages
  Corrected findDOMNode import for the poll shape
  Switched from the deprecated react-addons-css-transition-group package to a recommended one
  Updated react-meteor-data to remove a new React 15 warning
  Updated main packages
  Switched to prop-types package to remove new React 15 warnings
  Improve ESLint rules
  Linter auto fix
  Change lint import configs to our pattern
  Remove autofix script
  Replace JSCS in favor of ESLint
2017-06-05 13:52:37 -03:00
Klaus Klein
d701966434 Fix lint problems 2017-06-05 13:40:36 -03:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
Klaus Klein
fc73992a63 Fix a few review comments 2017-06-01 17:40:55 -03:00
KDSBrowne
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -07:00
Anton Georgiev
49a1f09536 minor improve syntax based on review comment 2017-05-17 11:24:12 -04:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
Anton Georgiev
2e9c519e1a switch console logs for logClient 2017-05-12 08:24:06 -04:00
Anton Georgiev
a4dcf72975 do not allow meteor calls if credentials are null 2017-05-11 15:18:34 -04:00
Klaus Klein
b2195da345 Fix client reconnection timeout 2017-05-05 11:30:15 -03:00
Klauswk
b668b24cac Merge branch 'ClientLog' into test-3865 2017-05-03 14:31:13 -03:00
Anton Georgiev
038405f907 some changes to logClient api 2017-05-03 13:19:21 -04:00
Klauswk
74c2219fc9 Update index.js 2017-05-03 14:09:33 -03:00
Klauswk
b0b455e591 Merge branch 'master' into ClientLog 2017-05-03 13:40:57 -03:00
Klauswk
30b7c3c1e4 Merge branch 'master' into AddServerCallback 2017-04-28 17:28:45 -03:00
Klaus Klein
31ae8854c9 Lint problems fixed 2017-04-28 17:01:02 -03:00
Klaus Klein
5a4f05a41a Fix requests on PR #3865 2017-04-28 14:12:08 -03:00
Klaus Klein
1c8e78d1c1 Merge with master 2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3 Add client log, HTML5 2017-04-28 10:47:07 -03:00
Klaus Klein
b99b73f334 Fix the double auth problem 2017-04-26 16:56:29 -03:00
Klaus Klein
15ea8921dc Fix lint problems 2017-04-26 10:53:01 -03:00
Klaus Klein
e56546137b Change callServer function name 2017-04-26 10:47:44 -03:00