Anton Georgiev
e2e0b78d40
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6
2021-02-08 23:39:42 +00:00
Anton Georgiev
8c0f0fdd52
Split Meteor roles backend-frontend revisit
2021-02-05 17:47:46 +00:00
Pedro Beschorner Marin
0bbef12ac7
Authenticated guests feature controlled at bbb-web properties
2021-01-23 21:48:02 -03:00
Anton Georgiev
45c1ff6e40
Merge pull request #11175 from MaximKhlobystov/select-random-user
...
Presenter selecting a random viewer
2021-01-22 15:31:00 -05:00
Maxim Khlobystov
5238dac647
Remove callbacks from update and clear Mongo operations for randomly selecting a user
2021-01-19 01:53:13 +00:00
Anton Georgiev
c1ffced27d
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into develop
2020-12-17 21:14:29 +00:00
Joao Siebel
c5b8f30f5d
Add option to generate heapdump file and improve metrics
2020-12-15 13:10:39 -03:00
Anton Georgiev
0be8773e4c
Loadbalance bbb-html5 in bbb-web based on CPU
2020-12-11 21:36:06 +00:00
Anton Georgiev
244a239810
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge
2020-12-01 20:02:50 +00:00
Joao Siebel
77d493792f
Prevent a case where voiceUser collection was being clean for entire server
2020-11-30 17:01:41 -03:00
Joao Siebel
ccda3b3a34
WIP remove callback from update methods
2020-11-26 13:23:57 -03:00
Joao Siebel
11f1a1ac47
Merge remote-tracking branch 'upstream/v2.2.x-release' into remove-callbacks
2020-11-25 10:54:18 -03:00
Joao Siebel
a244fc1acf
WIP remove callback from remove operations
2020-11-24 17:44:13 -03:00
Anton Georgiev
3faabd1821
Merge 2.2.29 and 2.2.30 into 2.3.x
2020-11-24 15:13:09 +00:00
Anton Georgiev
21644a1a43
Remove string interpolation for server debug and verbose logs
2020-11-23 14:35:59 -05:00
Joao Siebel
bcc1d6c880
WIP remove callback from mongo operations
2020-11-23 10:13:46 -03:00
KDSBrowne
2f46c1fd28
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select
2020-11-02 16:16:29 +00:00
Joao Siebel
be8421db3c
Merge remote-tracking branch 'upstream/develop' into connection-manager
2020-10-21 13:57:17 -03:00
Anton Georgiev
0c7ead1916
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge
2020-10-21 14:48:02 +00:00
KDSBrowne
d74b5af2a9
clear selected user when moderator closes modal | clean up
2020-10-19 14:46:41 +00:00
Anton Georgiev
b1e57e3d2f
Bump up log level of forced meeting end
2020-10-14 09:44:17 -04:00
KDSBrowne
3e8eebdd1b
move random viewer selection to akka-apps
2020-09-25 19:41:30 +00:00
Joao Siebel
b2adffa4c2
Merge remote-tracking branch 'upstream/develop' into connection-manager
2020-09-18 16:30:20 -03:00
Anton Georgiev
377dc27a8d
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge
2020-09-17 14:37:28 +00:00
Joao Siebel
6e4e0a510a
Merge branch 'remove-user-on-exit' into connection-manager
2020-09-08 16:36:01 -03:00
Joao Siebel
96bd372f15
Fix banned users log
2020-09-08 13:56:17 -03:00
Joao Siebel
4be9bc4c94
Adjust publishers to use auth-token-validation collection
2020-09-01 13:31:11 -03:00
Joao Siebel
2873eb2c1b
Merge remote-tracking branch 'upstream/develop' into connection-manager
2020-09-01 09:08:33 -03:00
Joao Siebel
b8f42ac712
Create ClientConnections structure and auth-token-validation collection
2020-09-01 09:07:56 -03:00
Anton Georgiev
14f464087f
Merge pull request #8417 from pedrobmarin/backend-cleanup
...
Backend cleanup
2020-08-28 15:37:00 -04:00
KDSBrowne
e9d4f8e42c
adds a select random user feature for presenter
2020-08-28 17:23:27 +00:00
root
851c2645ea
Committer: Antonio Guirado <amguirado73@gmail.com>
...
Changes to be committed:
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
new file: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
modified: akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
new file: bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
new file: bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js
modified: bigbluebutton-html5/imports/api/external-videos/server/index.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
modified: bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
new file: bigbluebutton-html5/imports/api/external-videos/server/streamer.js
modified: bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
modified: bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
modified: bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
modified: bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
modified: bigbluebutton-html5/imports/startup/server/index.js
modified: bigbluebutton-html5/imports/startup/server/redis.js
modified: bigbluebutton-html5/imports/ui/components/external-video-player/service.js
modified: bigbluebutton-html5/private/config/settings.yml
2020-08-28 12:58:55 +02:00
Joao Siebel
f33bd10640
Remove user from collection when leaves
2020-08-19 13:22:43 -03:00
Anton Georgiev
5be5aed1d9
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12
2020-08-12 17:12:58 +00:00
Anton Georgiev
9aefa76ded
allow more tags in welcome message/ mod only message
2020-08-10 16:59:09 -04:00
Anton Georgiev
0d6faa0b57
only allow for https uri in welcome and modOnly messages
2020-07-29 16:08:47 -04:00
Anton Georgiev
2c32608cd5
allow for img tag in welcome and modOnly messages
2020-07-29 15:09:15 -04:00
Anton Georgiev
1ea72ccb95
sanitize modOnlyMessage in html5 client
2020-07-29 11:31:00 -04:00
Anton Georgiev
4456a4db1f
move sanitazing of welcome message to backend
2020-07-27 16:33:10 -04:00
Pedro Beschorner Marin
526f79e8f2
Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop
2020-06-30 18:15:18 -03:00
Anton Georgiev
0cb7759cb2
Merge pull request #9824 from jfsiebel/fix-banned-users-join-try
...
Prevent banned user from trying to validateAuthToken multiple times
2020-06-17 17:09:40 -04:00
Anton Georgiev
778695b4d9
Merge pull request #9758 from jfsiebel/clear-video-streams
...
Clear video streams collection
2020-06-16 16:20:56 -04:00
Joao Siebel
3e95ed0e4b
Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2
2020-06-16 16:40:56 -03:00
Joao Siebel
45f99fed8b
Prevent banned user from trying to validate auth token multiple times. close #9798
2020-06-12 13:24:11 -03:00
Joao Siebel
6c6825d101
Subscribe to collections when user role change. close #9733
2020-06-05 10:32:05 -03:00
Joao Siebel
e3692e5321
Clear video streams collection on meeting end. close #9154
2020-06-03 13:29:44 -03:00
Anton Georgiev
ac6fd2824c
Merge branch 'develop' into 2.3-audio-stats
2020-05-26 12:36:15 -04:00
Anton Georgiev
aeeac803c7
Merge pull request #9620 from antobinary/simplify-publish
...
Simplify the code used for promote-demote subscriptions
2020-05-21 17:14:16 -04:00
Anton Georgiev
5238d81193
Simplify the code used for promote-demote subscriptions
2020-05-20 17:07:36 -04:00
Anton Georgiev
201fa2902e
Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it
2020-05-20 15:56:44 -04:00
Pedro Beschorner Marin
22c8eee0c7
Connection status first commit
2020-05-14 10:32:55 -03:00
Chad Pilkey
6456ad0010
add meetingId to some server-side collection selectors
2020-03-04 07:54:32 -08:00
Chad Pilkey
6a4ba7a300
watch for voice call state updates instead of DTMFs in the client
2020-02-18 14:03:06 -08:00
Anton Georgiev
11edb3cae9
clear externalvideo stream properly on meeting removed
2020-02-13 16:01:36 -05:00
Anton Georgiev
a8f4827af8
utilize Meteor connection id instead of trusting client side meetingId, userId
2020-02-06 15:48:16 -05:00
Pedro Beschorner Marin
b11113c165
Remove meeting inactivity monitor
2019-12-11 17:11:57 -03:00
Joao Siebel
9ed813ea3a
Remove streamers on meeting end
2019-11-13 13:53:45 -03:00
Joao Siebel
72cc05abee
Merge with cursor streamer stuff
2019-10-31 19:20:46 -03:00
Joao Siebel
d5865d49db
Update cursor streams logic
2019-10-24 17:49:21 -03:00
Joao Siebel
bbbd97929d
Merge remote-tracking branch 'upstream/master' into update-annotations-streamer
2019-10-24 10:41:20 -03:00
Lucas Zawacki
47661f2b08
Don't initialize streamer more than once, delete streamer object when meeting ends
2019-10-23 16:21:10 -03:00
Joao Siebel
d0f0d91c01
Update annotations streams logic
2019-10-22 22:26:25 -03:00
Chad Pilkey
9a0c97e50c
Merge pull request #8077 from jfsiebel/lock-modal-update
...
Update lock viewers modal
2019-10-03 13:27:28 -04:00
Tainan Felipe
80a8d29113
Fix typo
2019-09-09 11:48:50 -03:00
Tainan Felipe
d3b9db47e8
Move remaining time from meeting collection to meetingRecordingTime collection
2019-09-09 11:29:59 -03:00
Joao Siebel
4f00c6b994
Update lock viewers modal
...
With this changes you need to click apply button
in order to lock have effect, also update the lock text.
close #7766
2019-09-09 11:21:54 -03:00
Anton Georgiev
7ec10d779a
adjust flipped check for Moderator, isGuest, etc
2019-08-30 16:13:40 -04:00
Anton Georgiev
892336632f
added "fields:{...}", removed most mapUser
2019-08-28 16:32:55 -04:00
Tainan Felipe
2ee12df878
Clear record props when the meeting ends
2019-08-27 09:53:53 -03:00
Tainan Felipe
a7f19778ff
Remove leftovers
2019-08-21 15:57:34 -03:00
Tainan Felipe
932c5bf58c
Fix nav bar performance issue and move recordProp to own collection
2019-08-21 14:42:37 -03:00
Chad Pilkey
027c28c320
add lock setting option to hide viewers from each other
2019-08-09 16:45:26 -07:00
Joao Siebel
d556661873
save settings in a collection. close #7774
2019-07-29 11:17:38 -03:00
KDSBrowne
1bccb5b660
fix webcams of other viewers lock toggle
2019-07-18 15:48:18 +00:00
Chad Pilkey
87381b240e
change unsafe Users upserts to updates
2019-07-06 23:47:33 +00:00
Anton Georgiev
86d33bbc1c
Merge pull request #7712 from MaximKhlobystov/user-ejection-permission-error
...
Prevent user from being ejected when confirming start/stop recording or end meeting after losing moderator role
2019-07-04 15:29:02 -04:00
Maxim Khlobystov
5f6a1c3a08
Add additional checks to verify that the user exists + Small cleanup
2019-07-04 15:25:25 -04:00
Maxim Khlobystov
e7d7094d4c
Move the moderator checks for toggleRecording and endMeeting from client side to server side
2019-07-03 14:10:28 -04:00
Chad Pilkey
f0930e2d23
refactor user role management to follow proper format
2019-06-28 21:02:12 +00:00
Tainan Felipe
d948a6a008
Add toast for webcam lock suggestion
2019-06-12 15:03:23 -03:00
Anton Georgiev
ac36732849
Merge branch 'master' into closed-captions-prototype
2019-05-29 11:51:45 -04:00
Anton Georgiev
91e3298c84
Merge pull request #7488 from KDSBrowne/02-poll-published-toast
...
Stop obsolete toasts for published polls
2019-05-29 08:54:57 -04:00
Joao Siebel
a2d2dc332f
fix a problem with local stream and update the code
2019-05-23 15:25:31 -03:00
KDSBrowne
0f3120e969
remove unused imports
2019-05-23 14:16:52 +00:00
Pedro Beschorner Marin
34b39a2b0a
Closed captions prototype in a big commit
2019-05-22 18:33:20 -03:00
KDSBrowne
558e25ec9b
fix published poll toast notifications for old polls
2019-05-22 14:44:17 +00:00
Anton Georgiev
1285a49ed2
Merge pull request #7389 from diegobenetti/issue7314-improve-disconnection-detection
...
Fixes the duplicated messages when meeting is ended
2019-05-09 15:01:15 -04:00
Pedro Beschorner Marin
c27f409def
Locking shared notes from akka-apps up to the Flash client
2019-05-08 20:36:36 +00:00
Pedro Beschorner Marin
9867aa6b78
Shared notes lock settings first commit
2019-05-08 20:36:36 +00:00
Diego Benetti
4d7292f6c5
Added parameter to differ meeting from breakout error logs
2019-05-08 16:15:17 -03:00
Diego Benetti
77bc6aa9dc
Fixes the duplicated messages when meeting is ended
2019-05-08 14:15:25 -03:00
Pedro Beschorner Marin
a0590c12ea
Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create
2019-05-02 11:05:34 -03:00
Richard Alam
47ea1bed67
Merge pull request #7270 from pedrobmarin/unmute-users
...
Unmute users
2019-05-01 10:52:12 -04:00
Anton Georgiev
f11576dbea
increase delay before dropping Meetings to 10s
2019-04-29 14:22:33 +00:00
Anton Georgiev
70f41c9cca
patch: clear collections within Fiber
2019-04-26 17:13:45 +00:00
Pedro Beschorner Marin
324681d5b2
Renamed unmuteUsers to allowModsToUnmuteUsers
2019-04-23 12:30:55 -03:00
Pedro Beschorner Marin
50afb24653
Changed from unmute only viewers to unmute anyone
2019-04-17 10:55:01 -03:00
Pedro Beschorner Marin
87435c515c
Merge remote-tracking branch 'master' into set-lock-settings-on-meeting-create
2019-04-12 13:58:58 -03:00
Maxim Khlobystov
7d7ef07382
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup
2019-04-10 18:21:38 -04:00
Pedro Beschorner Marin
5f011f2e2e
Included unmuteViewers param on create
2019-04-10 17:55:24 -03:00
Pedro Beschorner Marin
141170e695
Refactoring lockSettingsProps
2019-04-10 10:44:34 -03:00
Pedro Beschorner Marin
3f2cb781d7
Adjusted lockSettingsProps for the HTML5 client
2019-04-10 13:04:27 +00:00
Vitor Mateus
5cc41dd728
Fix console warning
2019-04-09 14:55:10 -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
Vitor Mateus
1d41ce65c3
code cleanups
2019-04-05 15:33:09 -03:00
Vitor Mateus
32067f2f7a
Fixes and improvements
2019-04-05 15:10:05 -03:00
Vitor Mateus
7d5e47666c
Fix End Meeting errors #7021
2019-03-19 17:06:13 -03: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
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
Tainan Felipe
32f5168090
Fix viewer can view all breakout Rooms
2019-03-07 13:33:34 -03:00
Tainan Felipe
479839b0b6
Add publisher changes
2019-03-06 17:38:07 -03:00
Tainan Felipe
3d8501042a
Fix main meeting by viewing all server breakout rooms
2019-03-06 17:01:39 -03:00
bobakoftadeh
a9119a239e
Improve how target is added
2019-02-25 17:01:28 +00:00
bobakoftadeh
2c0d201345
Add target attribute
2019-02-22 22:08:44 +00:00
bobakoftadeh
4a66dab29f
Fix links in welcome message
2019-02-19 22:29:23 +00:00
Anton Georgiev
d0f2e8806e
Merge branch 'master' into sync-lock-settings-status
2019-02-08 13:13:58 -05:00
Tainan Felipe
742040c57b
Merge remote-tracking branch 'upstream/master' into issue-6450
2019-02-05 13:01:20 -02:00
Joao Siebel
555ee1232a
sync meeting lock settings status and handle GetLockSettingsRespMsg message. close #6669
2019-02-04 14:07:20 -02:00
Fred Dixon
566b245e3c
Merge pull request #6385 from pedrobmarin/keep-meeting-events
...
Created property keepEvents at bbb-web to make redis record the event…
2019-01-24 21:47:50 -05:00
Tainan Felipe
cfee36f8d7
Add time remaining notification bar status
2019-01-23 14:13:03 -02:00
Bobak Oftadeh
dd89bed5e8
Added checks to meetingId
2019-01-08 14:21:47 -08:00
Bobak Oftadeh
b41761350d
Improved checks for record time
2019-01-04 21:32:59 +00:00
Bobak Oftadeh
eb5c061e8f
Implemented recording timer
2019-01-03 18:43:17 +00:00
Pedro Beschorner Marin
ebffcb0848
Created property keepEvents at bbb-web to make redis record the events for all meetings
2018-12-11 18:37:31 -02:00
Bobak Oftadeh
8f0142aac1
Improved check on lockSettingsProp
2018-11-21 16:39:34 +00:00
Bobak Oftadeh
ce2eb21b57
changed micLocked check
2018-11-21 12:59:30 +00:00
Bobak Oftadeh
caabc100ac
fixed spacing in lock-modal styles
2018-11-19 20:07:39 +00:00
bobakoftadeh
c33723ac14
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
2018-11-12 09:15:55 -08:00
bobakoftadeh
87f63baa5a
Improved interface for lock settings modal
2018-11-09 16:25:15 -08:00
bobakoftadeh
020ac800af
Implemented functionality of lock settings
2018-11-08 10:55:12 -08:00
João Francisco Siebel
016efcc0eb
Remove ACL from client side. close #6138
2018-11-05 17:30:37 -02: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
Tainan Felipe
bd01d7e4aa
to squash
2018-10-16 14:55:20 -03:00
João Francisco Siebel
74dfa52071
handle system messages on main public chat
2018-10-08 11:22:45 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings
...
Custom user settings
2018-09-25 08:29:48 -04:00
Oswaldo Acauan
1c12b380a2
Fix not clearing pods and token when removing a meeting
2018-09-19 14:48:15 -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
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
João Francisco Siebel
5a76eec168
remove chat collection and fix group chat messages subscription
2018-08-06 09:05:07 -03:00
Joao Siebel
32516bfbbf
implement welcome message and clear message in group chat messages
2018-08-03 11:03:16 -03:00
Oswaldo Acauan
ec07b4434d
Change cursor and annotation to user streams and add optimistic updates
...
WIP | Use streams to cursor and optimistic updates
WIP | Use streamss to whiteboard and optimistic updates
WIP | Remove fake delay
Add two way batching (server/client client/server)
Fix null userId exception and remove logs
wip
Add two way batching (server/client client/server) for cursor
Remove message frequency from draw-listeners component since we handle on message publication
Handle clear and undo messages
2018-05-28 14:46:14 -03:00
Anton Georgiev
f501565e41
adjust meeting props to add freeJoin br room
2018-05-08 17:47:55 +00: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
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
Oleksandr Zhurbenko
dddc388a10
Fixed an exception thrown on meeting destruction
2018-02-07 14:57:34 -08:00
Tainan Felipe Pauli de Almeida
bc2da51bfb
Comply lock setting 'Hide other viewer's webcams'
2018-02-06 09:43:14 -02:00
Oleksandr Zhurbenko
4af6d30f6a
Switched from the broken 4commerce:env-settings package to native Meteor.settings
2018-01-07 16:24:05 -08:00
Anton Georgiev
c9379eaa0f
add muteOnStart param in Meeting structure
2017-12-22 15:22:24 -05:00
Oswaldo Acauan
a26e20d76b
Fix wrong prop name record => recording
2017-10-20 17:00:34 -02:00
Oswaldo Acauan
cbc3ea9e36
Add handlers for recording messages
2017-10-19 08:44:41 -02:00
Oleksandr Zhurbenko
430ddc0d3b
Removing unnecessary 2x from the collections, publishers, subscriptions and logs
2017-10-12 12:07:02 -07: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
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
Oswaldo Acauan
99cfdb2062
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:44 +00:00
Oswaldo Acauan
fbe34b2ed3
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:08 +00:00
Oswaldo Acauan
edae8ea1be
Fix clear captions calls
2017-02-10 12:25:31 +00:00
Oswaldo Acauan
b4679bc601
Refactor Captions API
2017-01-18 12:53:33 +00:00
Anton Georgiev
f517939809
fix handling of recording message
2017-01-09 18:58:33 +00:00
gcampes
903ba22713
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master:
Removed carriage returns from bigbluebutton.properties
make function export default
fix Meteor.Error
removed duplication
fixed lint issue
added suggestions
removed console logs
fixed lint issues
added moderator condition
Shows main setting options based on role
2016-11-29 08:25:59 -02:00
Anton Georgiev
7f9228ac02
fix Meteor.Error
2016-11-28 19:36:06 +00:00
gcampes
655f8dd6d6
Fix merge conflicts
2016-11-23 13:33:51 -02:00
gcampes
0aa6022c89
Changes breakout code to handle the new message format
2016-11-23 13:32:04 -02:00
gcampes
bdb6780f7a
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master:
removed unecessary import statements
adjusted to meet component/container structure conventions and simplify code
Remove wrong commited files
Refactor API Cursor's
Fix bug related to presentation handlers
linting fixes & updated based on feedback
HTML5-clent messages on chat - changed icon for logged out users
fixed an error with exit audio
Added mute/unmute/join listen only/leave audio features to join audio modal
HTML5-client messages for logged out user on chat
HTML5-clent messages on chat
2016-11-21 10:53:55 -02:00
Oswaldo Acauan
b0e784ec60
Merge remote-tracking branch 'upstream/master' into refactor-api-shapes
...
* upstream/master:
Remove wrong commited files
Refactor API Cursor's
2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72
Refactor Shapes API
2016-11-18 17:35:28 +00:00
Oswaldo Acauan
b4f9d88fac
Refactor API Cursor's
2016-11-18 12:26:14 +00:00
Gabriel Carvalho de Campes
7cdf04dd66
update clear for meetings, adds breakouts
2016-11-17 13:20:40 -02:00
Anton Georgiev
8a377e0a18
adjust name of resource + function
2016-11-14 21:40:50 +00:00
Anton Georgiev
74cf17e812
Merge branch 'refactor-poll-api' of github.com:Gcampes/bigbluebutton into merge-osw-pr-1
2016-11-14 21:31:21 +00:00
Gabriel Carvalho de Campes
214357adc6
Fix conflicts
2016-11-14 14:54:04 -02:00
Oswaldo Acauan
1df46bb201
Refactor of Presentations API
2016-11-11 19:02:46 +00:00
Oswaldo Acauan
41f06644c2
Fix import in stunturn reply handler
2016-11-03 17:23:00 +00:00
Oswaldo Acauan
6a8f997b00
Fix handleStunTurnReply function name
2016-11-03 13:35:05 +00: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
0d2225b79c
Clean up before PR
2016-10-24 11:20:30 +00:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Anton Georgiev
349b216928
omit hiredis package; cleanup
2016-08-29 21:34:03 +00:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Lajellu
19ff007adb
Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup
2016-08-19 14:08:46 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Anton Georgiev
6a984c2b68
adding captions support in html5 (part1)
2016-07-14 12:03:30 -07: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
Anton Georgiev
7fb2184c02
fix querry for existing meetings
2016-06-13 21:39:31 +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
a637c29710
Fixes some paths
2016-05-19 15:19:42 +00:00