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

290 Commits

Author SHA1 Message Date
Anton Georgiev
7d75843140
Fix a forgotten line left while resolving conflict 2020-07-14 11:19:11 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Anton Georgiev
c763041285 Adjust check for User.loggedOut to prevent errors 2020-07-10 13:45:37 -04:00
Anton Georgiev
9f5158a525 Merge branch 'custom-parameters-breakout-rooms' of github.com:jfsiebel/bigbluebutton into locales-2020-07-10 2020-07-10 11:21:53 -04:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03: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
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Vitor Mateus De Almeida
3b3a6a32f5 Fixes 2020-06-09 00:09:46 -03:00
Joao Siebel
faa0b35032 Show correct screen when user leave meeting. close #9710 2020-06-02 16:47:26 -03:00
Joao Siebel
74c34d0c4a Use main room custom parameters in breakouts room. close #9612 2020-06-01 09:13:03 -03:00
Anton Georgiev
1c6841dd1f
Merge pull request #9691 from jfsiebel/fix-breakout-room-logout 
Close tab when user logout from a breakout room
 2020-05-26 15:12:21 -04:00
Joao Siebel
1f8cae08d6 Close tab when user logout from a breakout room 2020-05-26 13:41:22 -03:00
Martin Beckmann
c3f0447105 Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 2020-05-26 15:07:37 +02:00
Martin Beckmann
ea3926e8ef attempt to introduce an additional UserSettings parameter 'bbb_show_public_chat_on_login' as a co-parameter of 'bbb_show_participants_on_login' (the former intended to only have an effect if the latter is 'true') 2020-05-23 22:28:56 +02:00
Martin Beckmann
d6956a5516 test... 2020-05-23 21:43:26 +02:00
Martin Beckmann
f9c7c20d5a test... 2020-05-23 21:40:39 +02:00
Martin Beckmann
51d3b3a94d test... 2020-05-23 20:44:11 +02:00
Joao Siebel
73d0de34dd Move Intl component outside of Base component 2020-05-12 10:31:00 -03:00
Vitor Mateus
00259ab371 WIP Resizable works fine 2020-04-23 11:07:44 -03:00
Vitor Mateus
5b9aafd0d3 The presentation gets the size from the layout manager 2020-03-25 09:52:23 -03:00
KDSBrowne
c86988f92c fix userlist / chat being opened after saving app settings 2020-03-24 15:06:02 +00:00
Chad Pilkey
cc07bfff20 fixed inconsitencies and usage of the idChatOpen Session variable 2020-03-05 15:14:22 -08:00
Anton Georgiev
d36c545706 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:41:18 +00:00
Vitor Mateus
ae560ca3eb Create layout context and add a layout manager 2020-03-04 15:34:10 -03:00
Tainan Felipe
8f1000437a Clean up the code 2020-03-03 10:59:01 -03:00
Tainan Felipe
c451666d52 WIP Implements skip to audio check in breakout rooms 2020-03-02 17:49:15 -03:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Anton Georgiev
e420dc2546 add bbb_show_participants_on_login as a join parameter 2020-01-30 15:43:54 -05:00
Vitor Mateus
1ae6324392 Detect aspect ratio to autochange webcams placement #8504 2020-01-17 10:20:03 -03:00
Chad Pilkey
162dc4dbe4 the client will end the call when kicked 2020-01-09 15:50:10 -08:00
Chad Pilkey
7fc1e61c48 user join cue improvements 2019-11-13 14:36:23 -08:00
Chad Pilkey
d81fe936d4 add toast on user join option 2019-11-12 10:00:48 -08:00
Chad Pilkey
549804c281 add audio cue on user join setting 2019-11-11 09:53:58 -08:00
Chad Pilkey
0a9854aa59 fix issues related to breakouts start/stop and page reload 2019-09-18 13:11:25 -07:00
Tainan Felipe
dc7bb6d2a7 Change observe in the base component 2019-08-21 16:27:15 -03:00
Anton Georgiev
47282beb0a rename user selector in base.jsx 2019-07-24 19:08:27 +00:00
Anton Georgiev
c8e84e4348 rename user selector in base.jsx 2019-07-24 18:57:39 +00:00
Anton Georgiev
2bf8fb5cca minor optimization using Fields in miniMongo 2019-07-24 17:59:04 +00:00
Anton Georgiev
1622b4ad53
Merge pull request #7583 from jfsiebel/reconnection-improvement 
Improve client reconnection
 2019-07-04 14:53:35 -04:00
Tainan Felipe
88cfb70255 Add ping-pong message to html5 client 2019-07-01 16:00:27 -03:00
Joao Siebel
8f0783d34f update variable name 2019-06-26 13:29:34 -03:00
Joao Siebel
c6c8ca400b Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-06-12 15:56:14 -03:00
Joao Siebel
7f7845c47b disable some UI actions when meteor is down 2019-06-12 15:40:58 -03:00
Anton Georgiev
17d21b3cd9
Merge pull request #7523 from Tainan404/fix-server-exception 
Fix server exceptions when get a invalid session token.
 2019-06-11 14:20:40 -04:00
Joao Siebel
36b6b5c902 change recording messages 2019-06-10 11:36:33 -03:00
Joao Siebel
e924ea08cc Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-06-05 17:22:30 -03:00
Maxim Khlobystov
ac844031bf Fix prop-types warning in Base 2019-06-04 15:23:44 -04:00
Joao Siebel
6c9e0def4b exit from audio when not connected and disable button 2019-06-03 11:28:05 -03:00
Tainan Felipe
327e4f6255 Fix server exceptions skipping subscriptions when has an error 2019-05-28 14:32:59 -03:00
Chad Pilkey
9e6e15b8b0 change logout error code to unused value 2019-05-24 15:56:17 -07:00
Tainan Felipe
2f63c174a3 Fix youtube keeps playing audio when user left the meeting 2019-05-17 16:39:05 -03:00
Tainan Felipe
ef0ba0afcf Remove the leftovers that show the error screen at the end of the meeting 2019-05-09 15:27:27 -03:00
Diego Benetti
dfdc98543e Merge remote-tracking branch upstream/master into base-rerender-tests 2019-04-30 17:01:01 -03:00
Anton Georgiev
e22b153e76 add missing meetingIsBrealout() 2019-04-26 20:45:08 +00:00
Anton Georgiev
5681d44ca4 add error code missing titles 2019-04-26 17:52:18 +00:00
Anton Georgiev
a0c9a1d3b7 Revert "Fix error sreen being shown when meeting is ended" 
This reverts commit 285d27b16f.
 2019-04-26 16:05:23 +00:00
Anton Georgiev
850add36af Revert "Remove server exception when user with expired session tries to join" 
This reverts commit 8cffe046ef.
 2019-04-26 16:01:58 +00:00
Diego Benetti
0ae817a951 Merge remote-tracking branch 'upstream/master' into base-rerender-tests 2019-04-25 14:57:59 -03:00
Diego Benetti
2e71ed3c40 Base subscriptions moved to new component 2019-04-24 17:48:16 -03:00
Tainan Felipe
ae73142d93 Add breakout ended 2019-04-24 14:41:35 -03:00
Tainan Felipe
285d27b16f Fix error sreen being shown when meeting is ended 2019-04-24 09:20:38 -03:00
Tainan Felipe
8cffe046ef Remove server exception when user with expired session tries to join 2019-04-23 11:22:11 -03:00
Anton Georgiev
093a8a1ecc
Merge pull request #7244 from KDSBrowne/2.2-fix-animations-iOS-12.3 
Update animations to also work with iOS 12.3 beta
 2019-04-16 11:12:20 -04:00
Anton Georgiev
2299f570c4 Update bigbluebutton-html5/imports/startup/client/base.jsx 
Co-Authored-By: MaximKhlobystov <MaximKhlobystov@users.noreply.github.com>
 2019-04-12 11:17:09 -04:00
KDSBrowne
1e76a117cf add missing prop from merge 2019-04-11 21:12:54 +00:00
KDSBrowne
a28acaee4a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-fix-animations-iOS-12.3 2019-04-11 16:13:41 +00:00
KDSBrowne
83127bcdae fix animations not working on iOS 12.3 beta 2019-04-11 15:04:10 +00:00
Maxim Khlobystov
7d7ef07382 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup 2019-04-10 18:21:38 -04:00
Maxim Khlobystov
de3c2c12ca Code improvements 2019-04-10 15:40:40 -04:00
Vitor Mateus
cacb4a3f16 Code improvements 2019-04-10 15:20:31 -03:00
Vitor Mateus
0ae555949d Fix client stuck on loading after ending the meeting and reload 2019-04-09 16:37:06 -03: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
49942f003c Merge remote-tracking branch 'upstream/master' into issue-7021 2019-04-05 15:44:39 -03: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
Anton Georgiev
d927cde23a
Fix copy-paste error on handlers for base.jsx 2019-04-05 13:03:24 -04:00
Vitor Mateus
21f0493b7a Merge remote-tracking branch 'upstream/master' into issue-7021 2019-03-29 09:26:29 -03:00
Diego Benetti
9ef248e7a2 Fix text tool losing focus 2019-03-28 18:12:49 -03:00
Vitor Mateus
7d5e47666c Fix End Meeting errors #7021 2019-03-19 17:06:13 -03:00
Vitor Mateus
d5a70fd684 Fix end meeting console error 2019-03-15 15:58:54 -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
Joao Siebel
ca4a6ca512 add aditional verification and stop audio 2019-03-14 15:02:04 -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
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
Vitor Mateus
e5afdacb50 Merge remote-tracking branch 'upstream/master' into issue-6944 2019-03-12 14:05:32 -03:00
Vitor Mateus
2391b3c94f Fix #6841 and toolbar with 2019-03-12 10:56:05 -03:00
Vitor Mateus
7c76ec4e3a Fix tooltips and fullscreen 2019-03-11 13:21:12 -03:00
Tainan Felipe
e7d9e9e12b Fix 'subscriptions are ready' being shown everytime 2019-03-11 09:56:41 -03:00
Tainan Felipe
32f5168090 Fix viewer can view all breakout Rooms 2019-03-07 13:33:34 -03:00
Tainan Felipe
3648afcf3f Add pending/guest users waiting to approval panel 2019-02-26 14:08:15 -03:00
Joao Siebel
ccb21a4192 prevent annotation publish every 10 seconds when recording. close #6723 and close #6796 2019-02-19 16:58:06 -03: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
Tainan Felipe
189d788744 Add verification for moderator and comments explaning pipe 2019-02-07 17:40:27 -02:00
Vitor Mateus
7e4eccf5a0 Past Meteor.status to container 2019-02-07 13:34:21 -02:00
Vitor Mateus
f3440561c2 Code improvement 2019-02-07 09:19:35 -02:00
Vitor Mateus
5679c31193 Fix log error when meteor restart. #6726 2019-02-07 08:56:29 -02:00
Anton Georgiev
42ce30416b
Merge pull request #6634 from vitormateusalmeida/issue-5846 
Implement enable/disable Animations
 2019-02-05 09:49:36 -05:00
Anton Georgiev
cd531f91ff
Merge pull request #6702 from MaximKhlobystov/html5-logs 
Improve logging
 2019-02-01 16:03:23 -05:00
Maxim Khlobystov
b86a990612 Add logCode and build number to log messages 2019-02-01 14:12:06 -05:00
Vitor Mateus
17a299688e Merge remote-tracking branch 'upstream/master' into issue-5846 2019-02-01 10:59:52 -02:00
Vitor Mateus
0b2aa0b5a1 Fix not necessary code 2019-01-31 16:47:01 -02:00
Vitor Mateus
77b59662e5 Fix error on invalid sessionToken 2019-01-30 09:52:24 -02:00
Vitor Mateus
b6d5b15e3e Implement enable/disable Animations issue-5846 2019-01-24 14:16:23 -02:00
Vitor Mateus
d9fb42b023 Avoid stay loading when meeting end intentionally 2019-01-21 17:28:37 -02:00
Vitor Mateus
37468e5d1c Add verification of meeting exist comparing props, and sets if the meeting is ended 2019-01-17 16:31:04 -02:00
Vitor Mateus
199dcc04d9 Add a loading as user response 2019-01-17 15:02:28 -02:00
Vitor Mateus
ccfb5b5b79 Check if the meeting exists #6401 2019-01-17 14:43:44 -02:00
Tainan Felipe
e66309dde1 Fix user rejoining to meeting when is ejected 2019-01-02 15:31:57 -02:00
Tainan Felipe
66bf810002 Fix countdown doesn't appearing in breakout room 2018-12-18 09:04:23 -02:00
Anton Georgiev
d80d78589f
Merge pull request #6346 from KDSBrowne/html5-packages-upgrade 
HTML5 packages upgrade
 2018-12-13 14:43:47 -05:00
Anton Georgiev
fbb12b055e
Merge pull request #6276 from Tainan404/issue-6262 
Add drag & drop grid for breakout rooms
 2018-12-13 11:35:24 -05:00
KDSBrowne
8b30fe00b3 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-10 02:12:42 +00:00
Maxim Khlobystov
f548b46672 Improve the client logs appearing on user join/subscription 2018-12-06 12:26:08 -05:00
Tainan Felipe
de66a7bd12 Add button for set free join status on create breakout room modal 2018-11-21 14:46:29 -02:00
Anton Georgiev
717a1e2db2 recovered logout functionality including feedback 2018-10-12 21:14:28 +00:00
Anton Georgiev
27a41753f9 hooked on error pages via Session 2018-10-12 17:05:30 +00:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
Anton Georgiev
308beb874c Auth logged in 2018-10-02 19:53:13 +00:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03: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
ff3b19a3bf add log on successful and unsuccessful login 2018-08-10 17:51:12 +00:00
Anton Georgiev
4ee01b5caa add log when client loads fully 2018-08-08 21:20:55 +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
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support 2018-08-01 14:24:00 -04:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods 
Presentation pods support
 2018-08-01 13:49:32 -04: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
Joao Siebel
d8391f450b use group chat messages in html5 client 2018-07-26 11:56:26 -03:00
Oswaldo Acauan
b7823c406c Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods 2018-07-24 17:20:37 -03:00
Maxim Khlobystov
89725fa461
Merge pull request #5905 from Tainan404/v2-fix-intl 
Fix intl id being showing.
 2018-07-24 14:03:13 -04:00
Tainan Felipe
1c04aacb24 fix intl showing intl ids 2018-07-23 13:46:53 -03:00
Anton Georgiev
8b0ec94405 remove duplicate import causing app to crash 2018-07-23 15:06:25 +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
005310d22a Allow guest user join via html5 client 2018-07-19 09:46:44 -03:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Oswaldo Acauan
1ca504ff2c Remove console.log 2018-06-29 15:11:11 -03:00
Oswaldo Acauan
1d823fdf83 Remove console.log 2018-06-29 15:10:56 -03:00
Oswaldo Acauan
a8ec87c5a3 Fix not cleaning local collection on reconnect. Close #5671 2018-06-29 14:34:39 -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
Oleksandr Zhurbenko
7c61e4c4b9 Corrected a publisher for presentation-pods 2018-04-09 20:57:24 -07:00
Oswaldo Acauan
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03:00
Joao Siebel
18019776cb Exit from audio when in meeting ended to prevent echo test, fix #4999 2018-01-25 09:07:32 -02: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
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08: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
Tainan Felipe
c582f5bf08 add meetingEnded in Base component aand add intl translation 2017-12-14 17:03:34 -02:00
Oswaldo Acauan
d19c127b1f Add redirect to /logout if not loggedin or on subscription errors 2017-12-13 16:20:56 -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