Joao Siebel
dcbce93e7c
add webcams data collector
2019-04-12 11:11:36 -03:00
Maxim Khlobystov
d7d69d1c98
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup
2019-04-05 18:46:47 -04:00
Maxim Khlobystov
3fa22c6908
User information lookup feature in HTML5 client.
2019-04-05 18:32:21 -04:00
Joao Siebel
701911734b
Merge remote-tracking branch 'upstream/master' into network-indicator
2019-03-25 09:52:33 -03:00
Anton Georgiev
3623b85258
Merge pull request #7015 from jfsiebel/user-inactivity-update
...
Update inactivity modal
2019-03-14 14:02:56 -04:00
Anton Georgiev
5fe8d6a2c0
Merge pull request #6930 from Tainan404/issue-6919
...
Fix few breakout room bugs.
2019-03-14 13:05:54 -04:00
Tainan Felipe
eafd7f6673
Add user verification in 2 spots and Fiz join breakout opening into breakout
2019-03-14 13:45:20 -03:00
Joao Siebel
3cfc64ac89
Merge remote-tracking branch 'upstream/master' into user-inactivity-update
2019-03-14 09:29:52 -03:00
Joao Siebel
cb3763ca31
Adjust messages when removed or by inactivity. close #6911 close #6928
2019-03-12 15:02:52 -03:00
gustavotrott
e5c26c60ef
Implement slow connection indicator
2019-03-11 21:34:34 -03:00
Chad Pilkey
9940846ff9
clean up issues introduced in #6869
2019-03-08 18:02:46 -08:00
Anton Georgiev
e174a2a197
Merge pull request #6869 from Tainan404/issue-6717
...
Add pending/guest users waiting to approval panel
2019-03-08 17:12:28 -05:00
Anton Georgiev
31acde212f
reduce log noise for common benign events
2019-03-08 16:00:16 +00:00
Tainan Felipe
160c0669f8
Fix publishers access for moderators
2019-03-07 17:23:42 -03:00
Joao Siebel
b5929dc4b5
Add activity check modal
2019-02-26 14:40:01 -03:00
Tainan Felipe
3648afcf3f
Add pending/guest users waiting to approval panel
2019-02-26 14:08:15 -03:00
Joao Siebel
681df8a546
handle user inactivity inspect on server
2019-02-21 18:09:44 -03:00
Anton Georgiev
827be6e9cd
Merge pull request #6806 from jfsiebel/stop-sync-video
...
Stop external video sharing when current presenter leaves
2019-02-20 13:24:18 -05:00
Anton Georgiev
40caed3924
Merge pull request #6734 from Tainan404/issue-6666
...
Allow re-invite user that didn't joined in meeting
2019-02-19 13:39:22 -05:00
Joao Siebel
4a7a7fd661
stop sharing video if presenter leaves. close #6596
2019-02-19 09:14:29 -03:00
Anton Georgiev
4b18d50b42
update npm packages versions
2019-02-13 19:44:21 +00:00
Anton Georgiev
a61e3e17d3
Revert "Fix error when user is not moderator"
2019-02-11 17:14:35 -05:00
Tainan Felipe
189d788744
Add verification for moderator and comments explaning pipe
2019-02-07 17:40:27 -02:00
Tainan Felipe
e4488b9769
Add breakoutProps to users collection
2019-02-07 15:56:33 -02:00
Tainan Felipe
a566fafcaa
Allow re-invite user that didn't joined in meeting
2019-02-07 14:42:47 -02:00
Vitor Mateus
879c99be90
Fix error when user is not moderator
2019-02-07 12:01:03 -02:00
Joao Siebel
ba198e82c6
add unlock/lock individual attendee when the meeting is locked. close #6661
2019-01-29 13:17:09 -02:00
Vitor Mateus
a9989e1107
Fix chat alert (push and audio) #6430
2019-01-14 11:23:35 -02:00
Anton Georgiev
afa1a64e79
improve format of callbacks on collection document removal
2018-12-14 20:19:10 +00: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
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
ec91afdd58
simplify assignPresenter flow
2018-11-30 17:34:00 -02: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
João Francisco Siebel
016efcc0eb
Remove ACL from client side. close #6138
2018-11-05 17:30:37 -02: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
Chad Pilkey
81983ae1e1
Stop HTML5 ejecting from voice on reconnect and fix voice user creation
2018-10-24 11:40:38 -07:00
João Francisco Siebel
74dfa52071
handle system messages on main public chat
2018-10-08 11:22:45 -03:00
Anton Georgiev
faac6a0d5d
maintain array of user roles so they are unique
2018-09-25 19:24:43 +00: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
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
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
prlanzarin
71307e7b26
Added support for ALWAYS_ACCEPT guest policy in the HTML5 client
2018-08-10 19:30:17 +00:00
João Francisco Siebel
5a76eec168
remove chat collection and fix group chat messages subscription
2018-08-06 09:05:07 -03:00
Anton Georgiev
e64dbda4ce
add check for logClient to handle media calls
2018-08-01 16:06:49 +00:00
Ghazi Triki
66a050b00b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
# bigbluebutton-config/bigbluebutton-release
# bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
2018-07-16 16:08:38 +01:00
Anton Georgiev
4dbe681a46
disable HTML5 waiting screen for guest approve
2018-07-11 12:46:44 +00:00
Anton Georgiev
eca2e50e1a
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current
2018-07-03 20:17:42 +00:00
Anton Georgiev
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message
...
Moderator only message support.
2018-07-03 11:48:08 -04:00
Maxim Khlobystov
4a7a3cfcf9
Clearing user system messages when adding a user.
2018-07-03 11:45:44 -04:00
Maxim Khlobystov
d7b99f5ed4
Cleanup.
2018-07-03 11:37:06 -04:00
Maxim Khlobystov
593a2ab744
Typo.
2018-07-03 11:31:00 -04:00
Maxim Khlobystov
efbc24db6f
Add support for moderator only message.
2018-07-03 11:13:38 -04:00
Anton Georgiev
e2b86eb37c
adjust guest status body params
2018-06-29 22:29:55 +00:00
Richard Alam
d891a4e85f
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch
2018-06-28 08:30:17 -07:00
Anton Georgiev
1e1e605d7a
Merge pull request #5722 from antobinary/breakouts-improvements-3
...
Improvements to Breakouts on HTML5
2018-06-27 12:35:16 -04:00
Anton Georgiev
79329d036a
set dial-in clientType in html5 client
2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df
plug clientType in UserJoin* messages, not separate ones
2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d
add clientType in User and show it in api getMeeting*
2018-06-22 19:19:46 +00: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
Richard Alam
14327a1edf
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch
2018-06-19 12:58:51 -07:00
Anton Georgiev
634b7b34c7
avoid referencing null on user leave
2018-06-19 15:38:53 +00:00
Anton Georgiev
ad483dd0e5
Merge pull request #5702 from Tainan404/issue-5692
...
Skip userLeaving when meeting is gone.
2018-06-15 16:26:04 -04:00
Tainan Felipe
d5482651d9
rename variable
2018-06-15 17:24:03 -03:00
Tainan Felipe
f86d80c53d
Remove skip userLeaving and change throw to log
2018-06-15 16:28:19 -03:00
Tainan Felipe
3884d45e5d
skip userLeaving when meeting is ended
2018-06-15 15:16:05 -03:00
Anton Georgiev
7338086572
Do not auth validate Flash users ( #5695 )
...
by @oswaldoacauan
2018-06-14 17:24:55 -03:00
Richard Alam
a2eaa9babd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
...
- some conflicts have been fixed.
The following needs working on:
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Bobak Oftadeh
136fa72a7e
User list UI changes implemented
2018-05-29 12:23:13 -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
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
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
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
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
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
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
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
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
Oleksandr Zhurbenko
7871681448
Changed all the references of kick to remove, to be consistent
2018-01-09 14:28:48 -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
Oswaldo Acauan
eb4c89aefc
Fix bug when users re-validate after refresh
2017-12-19 10:19:47 -02:00
Oswaldo Acauan
62454b826b
Remove duplicated log
2017-12-13 16:20:29 -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
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
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
Oleksandr Zhurbenko
6049223e3a
Fixed a typo
2017-10-23 16:16:54 -07:00
Tainan Felipe
5ac96e6979
solve merge issues
2017-10-23 13:47:14 -02: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
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
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
337f53e72b
Moved files up to api/
2017-10-11 18:09:35 -07:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
Anton Georgiev
250c6cdb8b
Merge pull request #3948 from KDSBrowne/x0-lint-Client
...
[HTML5] - Fix client lint issues
2017-05-25 13:57:04 -04:00
KDSBrowne
ff1a152f0b
remove new lines being rendered in log/development.log
2017-05-19 09:05:09 -07:00
Anton Georgiev
409a471ab5
bring catch clause on the same line as closing curly brace
2017-05-18 10:52:59 -04:00
Anton Georgiev
71d4e8b0e0
catch Meteor error on userLeaving
2017-05-17 15:17:27 -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
b9f75f88ae
Merge pull request #3928 from JaeeunCho/locked_status
...
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
b5601ecabc
fix issue with userLeave on breakout end
2017-05-12 09:14:26 -04:00
JaeeunCho
ca808195f2
HTML5 - added locked status for users
2017-05-10 14:02:50 -07:00
JaeeunCho
bd923e0f39
HTML5 - added locked status for users
2017-05-10 14:00:03 -07:00
Anton Georgiev
3904771fc3
if microphone lock is enforced, pick listenOnly join over using mic
2017-05-03 16:12:47 -04: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
Anton Georgiev
ef0d2f5729
Merge pull request #3861 from antobinary/disallow-moderator-2
...
HTML5: demote html5 moderator user to viewer based on flag
2017-04-27 16:17:49 -04:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
Klaus Klein
d4917e975c
Review change
2017-04-26 17:07:22 -03:00
Klauswk
73fb753edb
Merge branch 'master' into FixAuthentication
2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6
Fix auth and user kick, HTML5 closes #3844 #3828
2017-04-25 14:04:17 -03:00
Anton Georgiev
5b0454a11c
Merge pull request #3836 from Klauswk/FixAvatarIssue
...
Fix avatar issue in chat, HTML5 #3830
2017-04-19 17:25:58 -04:00
Klaus Klein
23d472bcde
Fix avatar issue in chat, HTML5 #3830
2017-04-19 14:11:13 -03:00
gcampes
0fd59394e7
remove unwanted debug, adds back log for error
2017-04-17 14:20:09 -03:00
gcampes
16c8497e36
Merge remote-tracking branch 'upstream/master' into unauthorized-page-fix
...
* upstream/master: (26 commits)
Fix lint issues
Fix lint issues
Fix a few lint problems
fix missing import causing breakouts to not work
Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
Fix poll options remain visible on html5, closes #3806 HTML5
- user internal userId instead of external userId in register user message
remove unnecessarily added svgs
updated icons to v11, adjusted few icons
Fix merge algoritm problem
set chat input color to gray (text-color)
Fixed user leave problem on private chat, close #3799 HTML5
align emojis horizontally
Check userId when validating token
Cleanup - remove extra > on meeting name on getRecording API response
Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
improved logic for updating message-list
Change to fetch from chat system id, issue #3792 HTML5
Fix multiple welcome messages, issue #3792 HTML5
...
2017-04-17 14:15:40 -03:00
gcampes
832d916fd8
Fix unauthorized on slow connection
2017-04-17 14:14:31 -03:00
Klaus Klein
3ad7f9b5a0
Fix a few lint problems
2017-04-12 17:19:39 -03:00
Klauswk
9649f7523d
Merge branch 'master' into FixPrivateOfflineChatProblem
2017-04-12 08:33:07 -03:00
Anton Georgiev
a192eb5740
Merge pull request #3796 from Klauswk/FixWelcomeMessage
...
Fix multiple welcome messages, issue #3792 HTML5
2017-04-11 15:59:48 -04:00
Klaus Klein
419902cc8b
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-11 16:46:51 -03:00
Anton Georgiev
11871d7d0b
fix event name causing issues with listenOnly status
2017-04-10 16:18:05 -04:00
Klaus Klein
b432ffd68b
Change to fetch from chat system id, issue #3792 HTML5
2017-04-10 11:04:27 -03:00
Klaus Klein
6727f14ab7
Fix multiple welcome messages, issue #3792 HTML5
2017-04-10 09:55:22 -03:00
Gabriel Carvalho de Campes
82a3018171
[HTML5] - Fix user not being removed on tab close
2017-04-06 14:06:03 -03:00
Oswaldo Acauan
f020964c50
Fix merge conflicts
2017-03-16 20:25:14 +00:00
Oleksandr Zhurbenko
d8542490c7
Corrected the fix
2017-03-13 15:33:06 -07:00
Oleksandr Zhurbenko
d7b5ae3c36
Fixed permissions and some exceptions
2017-03-13 12:15:58 -07:00
Oswaldo Acauan
9c84105319
Add missing packages
2017-03-10 19:18:23 +00:00
Oswaldo Acauan
d6780c3013
Refactor Authentication flow
2017-03-10 18:33:46 +00:00
Oswaldo Acauan
dc2cc13c70
Fix wrong error message
2017-03-07 17:37:25 +00:00
Oswaldo Acauan
3f946fb6a6
Fix wrong collection imports
2017-03-07 17:32:24 +00:00
Oswaldo Acauan
3c6ccf6cec
Skip updating user validated flag if its already valid
2017-03-07 17:18:02 +00:00
Oswaldo Acauan
5ef65300b6
Fix user not being able to revalidate
2017-03-02 16:23:53 +00:00
Oswaldo Acauan
5b407d40f4
Remove debug line
2017-03-02 16:08:49 +00:00
Oswaldo Acauan
715b11fe46
Fix emojiStatus undefined logger variable
2017-03-02 16:07:45 +00:00
Oswaldo Acauan
f3f4f8ddfe
Fix bugs on the voiceUpdate handlers
2017-02-23 20:35:36 +00:00
Oswaldo Acauan
5e9a7d8e39
Fix bug when removing users
2017-02-23 20:26:34 +00:00
Oswaldo Acauan
b6e80815bd
Fix a bunch of bugs introduced after the refactor
2017-02-23 20:16:10 +00:00
Oswaldo Acauan
d07bca00c9
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:50 +00:00
Oswaldo Acauan
99cfdb2062
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:44 +00:00
Oswaldo Acauan
24aa98b623
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:13 +00:00
Oswaldo Acauan
fbe34b2ed3
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:08 +00:00
Oswaldo Acauan
0f0ebdcf4a
Refactor user_joined handler
2017-02-23 18:05:18 +00:00
Oswaldo Acauan
74f123cdc9
Refactor of get_users_reply handler
2017-02-23 17:59:56 +00:00
Oswaldo Acauan
6b020d7e3a
WIP. Refactor of get_users_reply handler
2017-02-23 17:46:03 +00:00
Oswaldo Acauan
a609c1feab
WIP. Refactor of get
2017-02-23 17:45:51 +00:00
Oswaldo Acauan
5cfb18ea32
Refactor handler for emojiStatus
2017-02-22 20:22:12 +00:00
Oswaldo Acauan
8abdd10393
Refactor handler for emojiStatus
2017-02-22 18:59:47 +00:00
Oswaldo Acauan
b6bb8cc08d
Refactor user api handlers
2017-02-22 17:55:39 +00:00
Oswaldo Acauan
37538b2817
Refactor user api handlers
2017-02-22 17:49:44 +00:00
Oswaldo Acauan
1f9f47ce16
Fix assignPresenter method
2017-02-22 13:42:42 +00:00
Oswaldo Acauan
f16926c94d
Refactor emojiStatus method
2017-02-22 13:11:47 +00:00
Oswaldo Acauan
09481987ce
Refactor assignPresenter method
2017-02-22 12:56:32 +00:00
Oswaldo Acauan
c8038b2068
Merge mute/unmute methods to a single toggle method
2017-02-22 12:20:30 +00:00
Oswaldo Acauan
8511e72f06
Refactor muteUser method
2017-02-22 12:10:27 +00:00
Oswaldo Acauan
30d67897ef
WIP - Refactor users api
2017-02-10 12:24:14 +00:00
Oswaldo Acauan
c1d0797d92
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Added ExitApplicationEvent.as
HTML 5 - changed css for divider
No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action.
Link "enableEmojiStatus" enabled/disabled to the emoji button.
initialize html5StunTurn properly - complication from PR 3628
fix bug preventing stun/turn call
fix lint issues
rework userPermissions to allow mixture of role/status based actions
Handle exception when sending message to client
HTML5 - changed divider of record button
Change the emoji menu icon to the happy face.
don't show promote option for presenter user'
remove glow prop and use className to change style
reorganize user actions
clean up
improve userPermissions by rearranging logic
allow for mute/unmute by moderator
rename css class
Display breakout rooms user names in row tooltip.
fix setPresenter and kick user
...
2017-02-07 15:29:42 +00:00
Oswaldo Acauan
28ba2fb4b0
WIP - Refactor users api
2017-02-07 15:29:27 +00:00
Oswaldo Acauan
fda22b0653
Refactor methods/events for user leaving iteractions
2017-02-07 13:08:06 +00:00
Oswaldo Acauan
32ba6ad724
Refactor method listenOnlyRequestToggle
2017-02-06 16:27:09 +00:00
Oswaldo Acauan
9c2b42e99a
Refactor publishers and method kickUser to the new pattern
2017-02-06 15:56:09 +00:00
Anton Georgiev
43922300e8
fix setPresenter and kick user
2017-02-01 11:47:39 -05:00
Lajellu
b3f1d9f804
HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues
2016-12-20 10:06:01 -08:00
Anton Georgiev
e1f63c0aec
make function export default
2016-11-28 19:36:58 +00:00
Anton Georgiev
5635f94789
refactor updateVoiceUser.js
2016-11-22 16:15:42 +00:00
Anton Georgiev
462d72afa0
handle talking event in html5
2016-11-22 15:06:54 +00:00
Anton Georgiev
c98813e7b3
Merge pull request #3460 from mmarangoni/html5-stun-audio
...
Mute, Unmute, Leave Audio
2016-11-18 17:03:13 -05:00
Matthew Marangoni
0abcc06bfc
linting fixes & updated based on feedback
2016-11-15 13:00:28 -08:00
Matthew Marangoni
482fc97388
Added mute/unmute/join listen only/leave audio features to join audio modal
2016-11-11 13:09:34 -08:00
Oswaldo Acauan
71fb7abd70
Refactor stuns/turns handler
2016-11-03 13:33:14 +00:00
Matthew Marangoni
d21545c847
added html5 stun request and reply
2016-10-25 07:59:14 -07:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Oleksandr Zhurbenko
f64ed1fd4a
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning
2016-08-20 16:37:11 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Oswaldo Acauan
afe1a66e02
Fix conflicts and merge master
2016-07-28 19:50:44 +00:00
Oswaldo Acauan
b8e4a2692c
Add handlers for kick
2016-07-28 19:48:26 +00:00
Oswaldo Acauan
2c93c41fc5
Update handler payload check
2016-07-26 18:50:18 +00:00
Anton Georgiev
3e070872cf
fix issue with slide calc under https
2016-07-26 17:33:35 +00:00
Anton Georgiev
6a984c2b68
adding captions support in html5 (part1)
2016-07-14 12:03:30 -07:00
Oswaldo Acauan
d1f2614d00
Fix merge conflicts
2016-07-05 16:50:14 +00:00
Oswaldo Acauan
55538202d6
Change chat message timestamp from string to int
2016-07-04 18:34:36 +00:00
Jaeeun Cho
9eacf32497
fixes html5 clinet logout and nav-bar
2016-06-28 15:30:43 -04:00
Oleksandr Zhurbenko
390935e304
Changed 'let' to 'const' where it was possible and adjusted imports
2016-06-27 14:48:46 -07:00
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Jaeeun Cho
3325ac4974
fixes html5 clinet logout and nav-bar
2016-06-24 10:48:09 -04:00
Jaeeun Cho
73c9898698
fixes html5 clinet logout and nav-bar
2016-06-17 18:15:11 -04:00
Richard Alam
424de0f2f9
Merge pull request #3161 from antobinary/captions
...
recover caption funct; prepare akka-apps for captions on bbb-html5
2016-06-02 17:02:03 -04:00
Oswaldo Acauan
b77b8ce971
Fix Welcome message not being parsed
2016-06-02 16:34:17 -03:00
Anton Georgiev
9cf03a8ce8
move helpers; extract nodejsApp
2016-06-01 17:18:13 +00:00
perroned
8117f91ec9
Fixes some imports
2016-05-19 16:14:12 +00:00
perroned
97c94ecace
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
bigbluebutton-html5/imports/api/phone/index.js
bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
2016-05-19 15:47:47 +00:00
perroned
d83c96bf5d
Changes Meteor.config to an export
2016-05-18 20:19:50 +00:00
perroned
66a391c191
Updates server function to use new argument
2016-05-18 19:31:20 +00:00
Anton Georgiev
eea6bc0829
adjust path of collections
2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
...
Conflicts:
bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd
split emitter.on; move to api
2016-05-16 19:12:49 +00:00
perroned
4adad8bb32
Changes credential passing to 1 object
2016-05-16 13:12:27 -05:00
perroned
98aae7aade
Changes collection imports
2016-05-16 13:05:44 -05:00
Anton Georgiev
a263c1388b
lint mostly
2016-05-16 14:35:59 +00:00
perroned
d9dbb51023
Moves to api/collection/index
2016-05-16 09:14:02 -05:00
Anton Georgiev
57352f193c
rework users publish
2016-05-13 16:11:44 +00:00
Anton Georgiev
ecd3b3de17
log in user properly
2016-05-12 19:22:51 +00:00
Anton Georgiev
6a92c9400b
restructure modifiers and methods
2016-05-12 17:43:59 +00:00
Anton Georgiev
45342b8a04
restructure; subscribe for remaining collections
2016-05-10 18:53:05 +00:00
Anton Georgiev
bfd4afd07d
Users collection now available on client side
2016-05-09 21:19:45 +00:00