BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,638 Commits 13 Branches 260 Tags 1.1 GiB
0e26d2a6c1
Commit Graph

1114 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
e5a4bd09b4 Handle CreateNewPresentationPod message 2018-04-05 12:59:26 -07:00
Anton Georgiev
2f0a33b738
Merge pull request #5296 from oswaldoacauan/fix-5183 
Sends a ejectUserFromVoice after removing a user
 2018-04-03 13:26:30 -04:00
Oswaldo Acauan
9802dc73af Improve ice connection event handlers 2018-04-03 13:49:45 -03:00
Oswaldo Acauan
3d74ad4847 Add event handlers for iceConnection errors 2018-04-03 10:50:18 -03:00
João Francisco Siebel
2ff45a9d7f Rename function name to match his functionality 2018-04-02 14:08:25 -03:00
Oswaldo Acauan
04b98036e7 Sends a ejectUserFromVoice after removing a user 
Fix wrong linter change
 2018-04-02 11:42:13 -03:00
João Francisco Siebel
c598270663 Enforce authToken to re-joining users, resolve #5261 2018-03-29 09:10:30 -03:00
Anton Georgiev
e1fc9a237e resolve "CLIENT LOG: [object Object]" 2018-03-21 19:39:11 +00:00
Anton Georgiev
07b867e52c
Merge pull request #5259 from oswaldoacauan/fix-ghost-and-reconnect-users 
Fix ghost and reconnecting users
 2018-03-19 14:07:46 -04:00
Oswaldo Acauan
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03:00
Oswaldo Acauan
16a61a891d Move userLeft out of subscription stop to socket close event. Closes #5240 2018-03-16 16:18:10 -03:00
Anton Georgiev
337bcd616c add logs to debug user join handler 2018-03-16 18:57:27 +00:00
Anton Georgiev
d17ca71a60
Merge pull request #5157 from jfsiebel/implement-start-stop-recording-html5 
Implement start stop recording html5
 2018-03-09 14:28:14 -05:00
Oswaldo Acauan
8b9cc79c3d Implement basic GroupChat messages. Closes #4987 2018-03-09 15:42:14 -03:00
Anton Georgiev
9d7d8edbe0 improve isDialInUser function - use same var 2018-03-07 11:42:13 -05:00
Anton Georgiev
89b7da5be2 resolve conflicting double definition of voiceUserId 2018-03-07 11:18:02 -05:00
Anton Georgiev
2abcb91a7f increase voice user logging level in production 2018-03-07 11:18:02 -05:00
João Francisco Siebel
efbf830e31 Change recording indicator to match #5127 changes 2018-02-23 13:26:33 -03:00
João Francisco Siebel
8f43508b4f Linter some code and simplify action button logic display 2018-02-20 15:23:35 -03:00
Oswaldo Acauan
b03966d0d1 Close all user connections when removed 2018-02-20 12:02:04 -03:00
Oswaldo Acauan
8219c28084 Remove debug code 2018-02-20 11:59:47 -03:00
Oswaldo Acauan
3d69023308 Add check for connection and validated status. Fix #5152 2018-02-20 11:37:17 -03: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
c2076c5260 Fix logic for showing start/end recording 2018-02-19 13:30:21 -03:00
João Francisco Siebel
919c2aa644 Implement start/stop recording logic 2018-02-15 17:42:50 -02:00
Anton Georgiev
32abdc8344
Merge pull request #5102 from MaximKhlobystov/handle-reconnected-voice-users 
[HTML5 Client] Adjustments in handling of reconnected voice users
 2018-02-09 14:50:32 -05:00
Oleksandr Zhurbenko
607e2decad Removed a comment 2018-02-08 08:42:32 -08:00
Oleksandr Zhurbenko
894e2b94f2 Fixed exceptions thrown on PresenterAssignedEvtMsg event 2018-02-07 15:10:15 -08:00
Oleksandr Zhurbenko
dddc388a10 Fixed an exception thrown on meeting destruction 2018-02-07 14:57:34 -08:00
Maxim Khlobystov
82a40e4d9a Handle voice users message to update the voice states properly on reconnect. 2018-02-06 11:23:51 -05: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
Tainan Felipe Pauli de Almeida
bc2da51bfb Comply lock setting 'Hide other viewer's webcams' 2018-02-06 09:43:14 -02:00
Richard Alam
b05237b075 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-26 12:51:39 -08:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.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/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
 2018-01-23 12:27:42 +01:00
Oleksandr Zhurbenko
946c731471 Fixed pencil rendering during the race condition between clear annotations and pencil's draw_end message 2018-01-22 15:07:29 -08:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
Anton Georgiev
a4d57ac4b6
Merge pull request #4963 from MaximKhlobystov/hangup-audio-userlist-fix 
[HTML5 Client] Fix for the issue with users disappearing from userlist when hanging up audio.
 2018-01-16 13:39:38 -02:00
Maxim Khlobystov
71c2d16918 Made sure user is removed from userlist only in case of dial-in (not web) users. 2018-01-15 11:47:19 -05:00
Anton Georgiev
44cf02424f Adjust user guesStatus User property to handle join in BBB 2.1 
Also add muteOnStart Meeting property and some logs for easier work on redis message handling
 2018-01-11 15:05:19 -05:00
Anton Georgiev
cf921edd8b Merge branch 'issue-4812' of github.com:oswaldoacauan/bigbluebutton into html5-on-2.1-take-2 2018-01-11 14:19:05 -05:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix 
Ghost flash webcams fix
 2018-01-08 10:18:52 -08:00
Oleksandr Zhurbenko
2de02c4f8d Linting 2018-01-07 16:25:56 -08:00
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
prlanzarin
dfb5170e5d Finished filtering out HTML5 and Flash webcams using stream name patterns 2018-01-04 16:24:50 +00:00
Anton Georgiev
f0e15af607
Merge pull request #4814 from oswaldoacauan/issue-4812 
Simplify authentication code/flow and Add subscriptions error handling
 2018-01-03 14:45:38 -02:00
Anton Georgiev
c9379eaa0f add muteOnStart param in Meeting structure 2017-12-22 15:22:24 -05:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Oswaldo Acauan
eb4c89aefc Fix bug when users re-validate after refresh 2017-12-19 10:19:47 -02:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700 
Improvements on Presentation Management
 2017-12-15 19:03:54 -02:00
Anton Georgiev
c9c6797fc9
Merge pull request #4788 from antobinary/audio-work-3 
Handle dial-in users in HTML5
 2017-12-15 13:44:51 -02:00
Oswaldo Acauan
0c89d81675 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-4812 2017-12-15 09:13:26 -02:00
Oswaldo Acauan
62454b826b Remove duplicated log 2017-12-13 16:20:29 -02:00
Anton Georgiev
38c87c7f75 poll voted - drop requesterId and rename event 2017-12-12 11:19:24 -05:00
prlanzarin
bdc89e0830 Refactored webcam share/unshare handlers 2017-12-08 16:52:37 +00:00
Anton Georgiev
085eb57556 add ejectUserFromVoice for moderator 2017-12-08 11:40:52 -05:00
Anton Georgiev
9f1a80078c handle join and leave of call-in user 2017-12-07 15:50:50 -05:00
Anton Georgiev
bf7c26f02b
Merge pull request #4712 from Tainan404/localize-public-clear 
Localize message from when clear the chat.
 2017-12-07 18:27:55 -02:00
Anton Georgiev
255d64d430
Merge pull request #4687 from Gcampes/audio-refactor-bugfixes 
Audio bugfixes and improvements
 2017-12-05 17:17:35 -02:00
Anton Georgiev
e5060ea6b4
Merge pull request #4734 from OZhurbenko/presenter-functionality-2x 
Whiteboard touch events support, bug fixes, improvements
 2017-12-04 18:59:59 -02:00
Oswaldo Acauan
807bd99f82 Fix stuck state on conversion failure 2017-11-28 10:26:00 -02:00
Oleksandr Zhurbenko
006b7c7af6 Corrected logging for the clearAnnotations method 2017-11-27 11:23:38 -08:00
Oswaldo Acauan
e8de534964 Add error handling on presentation upload and covnersion 2017-11-27 15:44:45 -02:00
Anton Georgiev
64f2613818 send requesterId rather than userId on request to akka-aps 2017-11-24 17:03:17 -05:00
Anton Georgiev
a73f5ec738 send muted boolean on user (un)mute 2017-11-24 17:02:14 -05:00
Tainan Felipe
6845aed0e0 localize message from when clear the chat 2017-11-21 16:31:53 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8 fix permission overlay positioning, localizes messages 2017-11-17 17:01:52 -02:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import 
Added chrome extension ID to HTML5 screenshare call
 2017-11-17 18:55:59 +00: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
Anton Georgiev
51652fc790
Merge pull request #4669 from jfsiebel/add-moderator-unmute-config 
add moderatorUnmute feature in HTML5 client
 2017-11-14 16:49:41 -02:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
 2017-11-11 03:41:37 +00:00
prlanzarin
e96fc385f1 Handling HTML5 screensharing stop 
The action bar stop button is temporary
 2017-11-06 15:39:55 +00:00
Joao Siebel
d38ee377a5 Fix problems with null values 2017-11-02 17:23:27 -02:00
Gabriel Carvalho de Campes
e55ee0d28e fix listen only dead end on permissions denied 2017-11-02 10:10:01 -02:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor 
[HTML5] Refactor Audio
 2017-10-31 15:39:37 -02:00
Joao Siebel
86264dcb11 Read allowModeratorToUnmuteAudio property from config 2017-10-30 17:15:43 -02:00
Joao Siebel
4a0fedce3d Remove the unmute flag from config, fix mute and unmute options for listen only user and check server-side 2017-10-30 16:27:17 -02:00
Anton Georgiev
a210f2476a Merge pull request #4572 from KDSBrowne/z07-change-role-refactor 
Change Role refactor
 2017-10-27 13:22:41 -02:00
KDSBrowne
4899b88f27 change condition in changeRole logger message 2017-10-27 08:10:53 -07: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
KDSBrowne
ec0daac263 add return to presenterAssigned handler 2017-10-26 08:13:43 -07:00
KDSBrowne
fa4c96491c remove meteor import 2017-10-25 12:05:29 -07:00
KDSBrowne
34313c6eaa replace strings with constants 2017-10-25 12:00:31 -07:00
KDSBrowne
092839228b make changeRole handle any role 2017-10-25 10:29:03 -07:00
Anton Georgiev
f7ba155f97 Merge pull request #4524 from oswaldoacauan/patch-3 
[HTML5] Fix logClient method name
 2017-10-24 17:04:38 -02:00
Anton Georgiev
9f2b364710 Merge pull request #4553 from OZhurbenko/fix-settings-cancel 
[HTML5] - Fix for Settings not being closed
 2017-10-24 16:58:40 -02: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
fda223e81d Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:01:58 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
Oswaldo Acauan
28c19ec82d Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-24 07:57:52 -02:00
Oleksandr Zhurbenko
6049223e3a Fixed a typo 2017-10-23 16:16:54 -07:00
Anton Georgiev
eb9dd49b75 Merge pull request #4551 from Tainan404/fix-errors-linter 
[HTML5] Fix issue introduced on #4488
 2017-10-23 15:53:32 -02:00
Tainan Felipe
5ac96e6979 solve merge issues 2017-10-23 13:47:14 -02:00
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
Anton Georgiev
4566d82a2a Merge pull request #4488 from Tainan404/fix-errors-linter 
[HTML5] Fix errors linter
 2017-10-23 12:27:38 -02:00
gcampes
ff35ad9602 delete unused files, cleanup code 2017-10-23 10:41:09 -02:00
Oswaldo Acauan
a26e20d76b Fix wrong prop name record => recording 2017-10-20 17:00:34 -02:00
gcampes
029a13d2a0 better error handling, code cleanup 2017-10-20 08:11:51 -02:00
gcampes
3bd709c629 Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor 2017-10-19 09:39:50 -02:00
Oswaldo Acauan
cbc3ea9e36 Add handlers for recording messages 2017-10-19 08:44:41 -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
Joao Siebel
da9e2ef3a4 Fix function name in updateVoiceUser 2017-10-18 10:30:33 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
Oswaldo Acauan
0dd371087b Fix logClient method name 2017-10-13 11:49:48 -03:00
Tainan Felipe
873d227819 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-13 10:35:38 -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
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
Tainan Felipe
e74c44dd9d fix errors linter 2017-10-12 14:02:46 -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
5ad95faffc changes verto bridge. WIP 2017-10-12 12:04:34 -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
1ec0c11fe4 Permissions fix 2017-10-11 19:01:07 -07:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
70b3a14aec Moved meetingDestruction to where it is supposed to be 2017-10-11 18:15:13 -07:00
Oleksandr Zhurbenko
2e61493a0c Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into merge-2.0-1.1-api 2017-10-11 18:12:09 -07:00
Oleksandr Zhurbenko
337f53e72b Moved files up to api/ 2017-10-11 18:09:35 -07:00
Oleksandr Zhurbenko
854ca6b409 Moved voice-users, whiteboard-multi-user, auddio and bbb 2017-10-11 18:07:27 -07:00
Oleksandr Zhurbenko
37fb59ffcc Merged 2.0 and 1.1 users api 2017-10-11 18:02:23 -07:00
Oleksandr Zhurbenko
b8a4dbb278 Merged 2.0 and 1.1 slides api 2017-10-11 17:59:35 -07:00
Oleksandr Zhurbenko
ea029e552e Adjusted naming 2017-10-11 17:56:34 -07:00
Oleksandr Zhurbenko
ad071d4edb Merged 2.0 and 1.1 annotations -> shapes api 2017-10-11 17:52:57 -07:00
Oleksandr Zhurbenko
75315d5b44 Changed the modifier's name 2017-10-11 17:41:50 -07:00
Oleksandr Zhurbenko
0e58027486 Merged 2.0 and 1.1 presentations api 2017-10-11 17:40:51 -07:00
Oleksandr Zhurbenko
d2e1ab842e Merged 2.0 and 1.1 polls api 2017-10-11 17:33:57 -07:00
Oleksandr Zhurbenko
82603d8ad5 Permissions fix 2017-10-11 15:18:48 -07:00
Oleksandr Zhurbenko
eb75c6d9fb Merged 2.0 and 1.1 meetings api 2017-10-11 15:17:42 -07:00
Oleksandr Zhurbenko
48d4736c71 Renamed deskshare to screenshare 2017-10-11 14:53:02 -07:00
Oleksandr Zhurbenko
bfa6541f96 Merged 2.0 and 1.1 screenshare apis 2017-10-11 14:52:19 -07:00
Oleksandr Zhurbenko
3f8e24c12e Merged 2.0 and 1.1 cursor apis 2017-10-11 14:34:23 -07:00
gcampes
79e7bc1909 adds missing code to bridge 2017-10-11 18:30:38 -03:00
Oleksandr Zhurbenko
47d9b53cc2 Merged 2.0 and 1.1 breakouts, chat, and captions 2017-10-11 14:25:18 -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
Anton Georgiev
a850d1c9c1 Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite 
[HTML5] Redis class refactor
 2017-10-11 17:40:28 -03:00
Anton Georgiev
aa39361360 Merge pull request #4483 from OZhurbenko/presenter-functionality-2x 
Fix for the Pencil Mongo additions
 2017-10-11 15:22:39 -03:00
Tainan Felipe
d6a6ff5eca remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
Oswaldo Acauan
c08f6a9c4f Fix file permissions 2017-10-11 12:22:08 -03:00
Tainan Felipe
a667e3d05b Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-11 11:46:16 -03:00
Anton Georgiev
351a0e43cb Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator 
[HTML5] -Allow HTML5 Moderator
 2017-10-11 09:04:54 -03:00
Oleksandr Zhurbenko
bbe1f99527 Improvements 2017-10-10 16:20:52 -07:00
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03:00
Oleksandr Zhurbenko
8b5a53a59a Moved pencil_chunk_size to the config 
... And adjusted the way we fetch annotation statuses from the config
 2017-10-10 14:50:11 -07:00
Oswaldo Acauan
3e5dacdaf1 Change meetingQueue delete 2017-10-10 15:30:45 -03:00
gcampes
02cdcb2562 changes to styles and texts in audio flow 2017-10-10 15:03:29 -03:00
prlanzarin
67da01e81c Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare 2017-10-10 17:10:03 +00:00
Anton Georgiev
66f8be63d2 Merge pull request #4475 from oswaldoacauan/fix-token-security 
[HTML5] Add a check for the passed credentials agains the token in Acl
 2017-10-10 12:48:41 -04:00
KDSBrowne
d9ae121130 remove wrapping body in an object 2017-10-10 08:05:16 -07:00
Anton Georgiev
f50fb6aea8 modify format of TURN server config for webrtc 2017-10-10 11:12:35 -03:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
Oleksandr Zhurbenko
1ab85be722 Permissions 2017-10-09 18:55:53 -07:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -07:00
gcampes
317c3e5ee9 changes to bridge and audio components. WIP 2017-10-09 17:48:10 -03:00
Oswaldo Acauan
96ea918919 Fix file permissions 2017-10-09 17:20:27 -03:00
Oswaldo Acauan
73d4607288 Skip checkToken in client calls 2017-10-09 15:53:45 -03:00
Oswaldo Acauan
7d664c8be7 Add a check for the passed credentials agains the token in Acl 2017-10-09 09:49:07 -03:00
KDSBrowne
584f7e4bc8 add checks to handler 2017-10-06 11:12:33 -07:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
KDSBrowne
9da39339cd remove unused checks 2017-10-06 10:56:56 -07:00
KDSBrowne
d70bfdb337 remove code duplication 2017-10-06 10:52:14 -07:00
KDSBrowne
36ebec64c5 change modifier name 2017-10-06 09:16:55 -07:00
KDSBrowne
fc4b0dbcb1 add changeRole handler call to changeRole modifier 2017-10-06 09:10:23 -07:00
KDSBrowne
5c1ff8efbc fix promoted users not being able to execute moderator actions 2017-10-06 08:18:27 -07:00
KDSBrowne
b20ab84abd make changeRole.js return publishUserMessage 2017-10-06 06:31:56 -07:00
gcampes
40795950c2 updates to the audio manager 2017-10-04 17:49:11 -03:00
Anton Georgiev
6b1a29eab4 Merge pull request #4426 from OZhurbenko/presenter-functionality-2x 
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
 2017-10-04 14:05:03 -04:00
Anton Georgiev
0bc3490ecc Merge pull request #4419 from KDSBrowne/xx-03-kick-user-bug 
[HTML5] - Handle UserEjectedFromMeetingEvtMsg
 2017-10-04 11:47:07 -04:00
KDSBrowne
f635dbf2ae remove import and function call 2017-10-04 08:45:05 -07:00
KDSBrowne
d347864b19 update removeUser modifier props 2017-10-04 08:22:56 -07:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
KDSBrowne
e241d6bf68 remove unused voice-user method 2017-10-04 07:39:13 -07:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
gcampes
81a430039d add echo test component. WIP 2017-10-03 17:42:10 -03:00
KDSBrowne
83d4474b51 remove if statment and unused imports 2017-10-03 13:03:18 -07:00
KDSBrowne
078e8b579a remove Logger messages and switch allowHTML5Moderator to false 2017-10-03 12:38:59 -07:00
KDSBrowne
af4676ea38 pass userId to publishUserMessage 2017-10-03 12:20:03 -07:00
KDSBrowne
2d62b79165 switch to correct event name 2017-10-03 12:12:19 -07:00
Oleksandr Zhurbenko
76bcdd55d6 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-10-03 10:34:10 -07:00
KDSBrowne
3eed1ec1c0 remove voice user check in userEjected.js 2017-10-03 08:45:36 -07:00
KDSBrowne
9bad8d8d5d add kickVoiceUser and fix presenter assign bug 2017-10-03 08:25:56 -07:00
Oswaldo Acauan
230a2d5263 Fix silent changes caused by the old pr revert 2017-10-02 11:12:58 -03:00
gcampes
37456c9db4 updates do sip bridge 2017-09-29 17:42:34 -03:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
KDSBrowne
3b6aed34ae check for voice user and remove if exists 2017-09-29 11:58:24 -07:00
Anton Georgiev
7c5683c866 Merge pull request #4291 from Klauswk/html5-refactor-userlist 
[HTML5 2.0] Refactor UserList Components
 2017-09-29 14:08:12 -04:00
Oswaldo Acauan
c186840c3c Fix current presentation being unset 2017-09-29 11:13:54 -03:00
Oswaldo Acauan
0e10fa2aa6 Fix typo 2017-09-29 11:10:35 -03:00
gcampes
82e62ee2a6 fix to sip bridge 2017-09-29 10:59:30 -03:00
gcampes
a26f622ba9 gets audio to work 2017-09-29 10:58:13 -03:00
gcampes
6d0d6f6651 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-29 10:52:12 -03:00
Oswaldo Acauan
19e3075dec Add missing body check 2017-09-29 10:50:46 -03:00
Oswaldo Acauan
a5135f28e6 Renamte presentationChange handler 2017-09-29 10:50:05 -03:00
Oswaldo Acauan
c8042ce65b Rename handlers from change to set to match akka 2017-09-29 10:42:17 -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
Oswaldo Acauan
54efe44345 Rename share method to set to match akka 2017-09-29 10:29:55 -03:00
Oswaldo Acauan
2a7fd5ba4d Rename share method to set to match akka 2017-09-29 10:01:01 -03:00
Oswaldo Acauan
7f5d5b8064 Change defaultFileName check to match config 2017-09-29 09:44:36 -03:00
Oswaldo Acauan
bc6283e722 Remove constraint for not deleting the current presentation 2017-09-29 09:41:45 -03:00
Oswaldo Acauan
27b89361c0 Add missing check 2017-09-29 09:40:40 -03:00
KDSBrowne
a60b7e26a6 add kickUser method 2017-09-28 10:41:02 -07:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
Oleksandr Zhurbenko
b3723c34d4 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-26 14:08:41 -07:00
Oleksandr Zhurbenko
b02cbb3208 Removed redundand brackets 2017-09-26 13:36:47 -07:00
Oswaldo Acauan
a3f74842b4 Bug fixes 2017-09-26 16:45:33 -03:00
gcampes
152527d1ab Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-26 14:25:11 -03:00
Oleksandr Zhurbenko
76808b3e7d Fixed a bug with the current slide being unset 2017-09-25 17:00:08 -07:00
Oleksandr Zhurbenko
ce04cfb83b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-25 16:48:03 -07:00
Anton Georgiev
91f912ce4b Merge pull request #4416 from OZhurbenko/mongo-indexing 
Added indexes for the html5 Mongo collections
 2017-09-25 15:57:07 -04:00
KDSBrowne
cad085a495 add kicked prop 2017-09-25 11:38:36 -07:00
KDSBrowne
9a145c64a8 fix set properties and client kicked condition 2017-09-25 11:32:09 -07:00
KDSBrowne
31223e86ec remove nested user and voiceUser keys 2017-09-25 08:57:39 -07:00
Oswaldo Acauan
dd83d213fa Fix missing conversion handlers 2017-09-22 17:43:07 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
d19814dc55 Prevented html5 from throwing exceptions if the slide file doesn't exist 2017-09-21 14:02:50 -07:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
KDSBrowne
b35b16f642 rename functions to past tense 2017-09-21 10:55:07 -07:00
KDSBrowne
30da581d6d rename user prop to match 2.x 2017-09-21 10:50:06 -07:00
KDSBrowne
b988dadf89 switch relative with absolute import path 2017-09-21 10:40:19 -07:00
KDSBrowne
93d7c9f4ce change variable declaration 2017-09-21 10:21:25 -07:00
KDSBrowne
8418317e03 handle UserEjectedFromMeetingEvtMsg 2017-09-21 09:21:42 -07:00
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -07:00
Anton Georgiev
90db7326b8 Merge pull request #4415 from KDSBrowne/x2.0.9-clear-chat-bug 
[HTML5] - Fix clear chat feature
 2017-09-20 14:13:05 -04:00
Anton Georgiev
e22da926bb Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete 
[HTML5] - Remove requestStunTurn
 2017-09-19 15:53:08 -04:00
gcampes
ea637a1e49 first changes to audio components and services. WIP 2017-09-19 16:31:04 -03:00
KDSBrowne
2e1fb712a1 use userId instead of username 2017-09-19 12:01:02 -07:00
KDSBrowne
bd8c57eb45 remove log messages 2017-09-19 11:57:08 -07:00
KDSBrowne
6b6d431a5b switch variable positions in object 2017-09-19 11:55:32 -07:00
KDSBrowne
9b3bb04a90 fix clear chat feature 2017-09-19 10:39:13 -07:00
KDSBrowne
4388fc4b0f remove requestStunTurn 2017-09-19 08:42:10 -07:00
Augusto Bennemann
2067c50c55 HTML5 video for bbb2.0 2017-09-19 10:53:27 -03:00
Oleksandr Zhurbenko
838382b6f9 Moved presentation overlays' rendering to a separate function 2017-09-18 16:54:52 -07:00
Oleksandr Zhurbenko
ff4e7bffd0 Fixed a bug with the helper's import 2017-09-18 16:52:20 -07:00
Oleksandr Zhurbenko
537175dad2 Moved part of the presentation display calculations to the server side 2017-09-18 15:20:44 -07:00
Oleksandr Zhurbenko
d57f60fe09 Adjusted publish calls to #4385 2017-09-18 12:18:37 -07:00
Oleksandr Zhurbenko
c9552247b2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-18 12:08:14 -07:00
Oleksandr Zhurbenko
9e1c8a4fb7 Permissions fix 
Can't afford WebStorm :-(
 2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8 Improvements based on the PR review 2017-09-17 18:58:37 -07:00
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
KDSBrowne
4b7d790a57 change variable name 2017-09-12 11:13:27 -07:00