BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,725 Commits 13 Branches 260 Tags 1.1 GiB
385bdf1568
Commit Graph

784 Commits

Author SHA1 Message Date
Vitor Mateus De Almeida
69eb26f281 Merge remote-tracking branch 'upstream/develop' into debug-window 2020-09-22 09:37:42 -03:00
Anton Georgiev
124b2d9b51
Merge branch 'develop' into move-guest-wait 2020-09-21 16:28:59 -04:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Anton Georgiev
3b2446989e recalculate locales on new request if there was issue on start 2020-09-10 14:32:42 +00:00
Joao Siebel
ac0a014571 WIP onClose 2020-09-10 08:49:22 -03:00
Anton Georgiev
fd0e69c280 Added fallback support for Armenian, Georgian, Occitan 2020-09-10 03:21:41 +00:00
Anton Georgiev
707f80a785 Only calculate locales list once, on process start 2020-09-10 01:27:03 +00:00
Anton Georgiev
e3d1fa2c17 return all locales, not just an empty [] 2020-09-10 00:37:43 +00:00
Anton Georgiev
f1e92341a5 Merge branch 'issue-10291' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:30:52 +00:00
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
Joao Siebel
6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager 2020-09-08 16:36:01 -03:00
Tainan Felipe
8651a02676 Add override default locale to user settings 2020-09-08 15:54:08 -03:00
Vitor Mateus De Almeida
849bb9a469 Add debug window 2020-09-03 20:35:57 -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
Tainan Felipe
9230dfcc62 Fix wrong default setting 2020-08-25 09:29:23 -03:00
Tainan Felipe
4a81457b10 Fix comparison 2020-08-25 08:47:38 -03:00
Tainan Felipe
5956531941 Add init state for locale comparison 2020-08-25 08:36:06 -03:00
Anton Georgiev
b6d71fd66d
Merge branch 'develop' into issue-9219 2020-08-19 16:02:43 -04:00
Anton Georgiev
4fd2a815f4
Merge pull request #10220 from Tainan404/unsafe-intl-components 
Remove unsafe lifecycle from intl component
 2020-08-19 15:16:21 -04:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -03:00
Tainan Felipe
47b2d6b945 fix language doesn't updating 2020-08-19 10:48:57 -03:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Tainan Felipe
dda7182757 Merge remote-tracking branch 'upstream/develop' into skip-audio-check 2020-08-19 10:24:17 -03:00
Tainan Felipe
c9d75a15f8
Update bigbluebutton-html5/imports/startup/server/index.js 
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
 2020-08-12 17:15:16 -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
Tainan Felipe
35cfd510c3 Remove unsafe lifecycle from intl component 2020-08-07 17:46:04 -03:00
Joao Siebel
32b25ce70e simplify code 2020-08-05 14:16:41 -03:00
Joao Siebel
6987ab988c Restore activity check modal. 
If activity check was enabled in server, the activity check modal wasn't showed
to users and after a given time the user was disconnect, also fix the meeting-end
and error-screen messages, informing the user the reason why he was kicked.
 2020-08-03 09:44:21 -03:00
Anton Georgiev
45c2368a3c Pulled HTML5 locales on July 29, 2020 2020-07-29 11:54:21 -04:00
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2 
Add Layout Context and Layout Manager
 2020-07-29 10:00:59 -04:00
Anton Georgiev
c6669d1d7a
Merge branch 'develop' into move-guest-wait 2020-07-28 13:50:04 -04:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Anton Georgiev
55d8d4b199
Merge pull request #9529 from Tainan404/issue-9128 
Rework locales list generation
 2020-07-28 11:10:38 -04:00
Vitor Mateus De Almeida
fa9e5ca819 Fix error when join a new meeting 2020-07-23 18:14:31 -03:00
Vitor Mateus De Almeida
ae29ba58c1 Fixes 2020-07-20 16:17:40 -03:00
Vitor Mateus
e2db60e662 WIP Resizable works fine 2020-07-20 16:11:09 -03:00
Vitor Mateus
297154f78a The presentation gets the size from the layout manager 2020-07-20 16:02:53 -03:00
Vitor Mateus
7f095c1cad Create layout context and add a layout manager 2020-07-20 15:48:54 -03:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
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
e48306431a
Merge pull request #9498 from Tainan404/issue-8744 
Replace unsafe react lifecycle methods
 2020-07-14 10:30:37 -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
Tainan Felipe
30528fb014 Remove comment 2020-07-02 17:45:06 -03:00
Tainan Felipe
1c8677d7d8 Move guest wait from bbb-client to bbb-html 2020-07-02 17:14:49 -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
Anton Georgiev
0a399af81f add clientURL to logs from client 2020-06-30 15:18:01 -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
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
29afdafd3e
Merge pull request #9658 from konkret-devils/v2.2.x-release 
Add bbb_show_public_chat_on_login as a join (co-) parameter
 2020-05-29 12:42:59 -04:00
Anton Georgiev
1a7c07e380
Merge pull request #9113 from sualko/feat/html5/settings 
add env to specify settings location
 2020-05-28 16:21:25 -04: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
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Tainan Felipe
5e5f4cc93b Move locales fallback to a json file 2020-05-26 11:15:17 -03:00
Martin Beckmann
c3f0447105 Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 2020-05-26 15:07:37 +02:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
9f60e925b5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 19:55:36 +00:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
4a38524778 Logging with JSON stringify was leading to crashes. Reverting, need to investigate further 2020-05-24 08:22:10 -04: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
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Tainan Felipe
6a340e9401 Rework locales list generation 2020-05-13 14:05:59 -03:00
Joao Siebel
73d0de34dd Move Intl component outside of Base component 2020-05-12 10:31:00 -03:00
yogiks
360fce9781 Included Kannada 2020-05-11 15:40:00 -04:00
Tainan Felipe
851189f3c1 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-11 11:42:03 -03:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Anton Georgiev
63f7da5241 include Meteor connection ID in logs 2020-04-30 16:40:45 -04:00
Anton Georgiev
89fb118d00 Pulled HTML5 locales April 23, 2020; Added Norwegian 2020-04-23 10:17:43 -04:00
Vitor Mateus
00259ab371 WIP Resizable works fine 2020-04-23 11:07:44 -03:00
Anton Georgiev
b1cfef4c1b Pulled HTML5 locales April 17, 2020 2020-04-17 08:02:41 -04:00
sualko
6a5b9a98e2 add env to specify settings location 
this would allow package maintaner to move config to /etc

see #9085
 2020-04-16 17:06:52 +02:00
Tainan Felipe
425097d6ab Replace legacy react lifecycle in the intl file 2020-04-15 11:20:07 -03:00
Anton Georgiev
3a1a23f91e Georgian (ka.json) causes loops and other issues. Use ka_GE.json 
By keeping ka.json uncommittable I can refrain from adding edge case handlers
 2020-03-27 18:06:00 -04:00
Anton Georgiev
0efc79f0aa Pulled HTML5 locales on March 27, 2020 
Had to jump through hoops to add Georgian because Langmap does not have entry for 'ka' just for 'ka_GE'
 2020-03-27 17:59:23 -04:00
KDSBrowne
e15e45b149 fix render loop after changing locale when override setting is set 2020-03-26 13:32:15 +00:00
Anton Georgiev
2e73d844fd Pulled HTML5 locales, March 24, 2020 2020-03-25 16:18:19 -04:00
Anton Georgiev
606ca5887a Revert "Merge pull request #8755 from KDSBrowne/fix-override-locale-loop" 
This reverts commit 004d872584, reversing
changes made to ebdcf621b7.
 2020-03-25 16:12:15 -04: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
KDSBrowne
af14345185 fix render loop after changing locale when override setting is set 2020-03-11 13:55:41 +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
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Anton Georgiev
4b5c6c65e9
Merge pull request #8613 from antobinary/userId-stuff 
Utilize Meteor session id instead of trusting client side meetingI…
 2020-02-18 11:56:21 -05: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
4e26af523f
Merge pull request #8639 from antobinary/locales-feb-14-2020 
Pulled HTML5 locales Feb 14, 2020; Added Thai
 2020-02-14 15:48:32 -05:00
Anton Georgiev
9c2797ecd6 Pulled HTML5 locales Feb 14, 2020; Added Thai 2020-02-14 15:46:33 -05:00
Anton Georgiev
1fa426058f corrected issues related to publishing and methods 2020-02-13 14:19:29 -05:00
KDSBrowne
f262d5b21c fix panel resize when first leading in RTL 2020-02-11 16:59:04 +00:00
Anton Georgiev
e420dc2546 add bbb_show_participants_on_login as a join parameter 2020-01-30 15:43:54 -05:00
Anton Georgiev
de50a4d199 pulled html5 client locales on 2.2 Jan 17, 2020 2020-01-17 20:26:18 +00: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
Anton Georgiev
689427b092 commented out memwatch usage - not supported on node12 2019-12-03 20:26:45 +00:00
Anton Georgiev
b2ac52036a
Merge pull request #8333 from antobinary/locales-- 
Pulled HTML5 locales Nov 15
 2019-11-15 18:03:42 -05:00
Anton Georgiev
5558399247 Pulled HTML5 locales Nov 15 2019-11-15 17:13:43 -05:00
Anton Georgiev
d0e20d5b96 moved logTag setting into clientLog object for consistency 2019-11-15 16:46:42 -05:00
Anton Georgiev
171d073a45 allow for logTag parameter in settings.yml 2019-11-14 18:09:15 -05:00
Anton Georgiev
a221f72702
Merge pull request #8318 from capilkey/cue-on-joins 
Add audio cue and toast on user join settings
 2019-11-14 12:57:33 -05: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
Anton Georgiev
ecb89b0d92 Pulled html5 locales Nov 5, added Romanian 2019-11-05 13:05:41 -05:00
Richard Alam
62e5e599d3 - add timestamp field to messages sent from html5 server 2019-10-18 09:50:38 -07:00
Chad Pilkey
42bad2142e fix check for heapdump enabled 2019-10-08 10:40:53 -07:00
Chad Pilkey
660d5ff290
Merge pull request #8150 from jfsiebel/add-heapdump-dependency 
Add heapdump dependency
 2019-09-30 16:15:10 -04:00
Joao Siebel
678e81e8f2 Add configuration to enable the heap dump file 
and create a rule to only generate a new heap dump
if the current memory usage is bigger than the given threshold
 2019-09-24 18:50:37 -03:00
Joao Siebel
35061811b7 Add heapdump dependecy 2019-09-24 17:09:56 -03:00
Chad Pilkey
0a9854aa59 fix issues related to breakouts start/stop and page reload 2019-09-18 13:11:25 -07:00
Anton Georgiev
8172da84af
Bumped up loglevel of memwatch to 'info' 
in settings.yml we have set to not log < info so these would not be logged if 'debug'
 2019-09-09 15:21:27 -04:00
Anton Georgiev
f0a35a7381 add monitor for memory usage in nodejs html5 2019-09-09 14:45:54 -04:00
Anton Georgiev
cdb03042ee
Merge pull request #7952 from KDSBrowne/issue-7148 
Reduce chance of text Area displaying invisible border
 2019-08-28 15:13:00 -04:00
Anton Georgiev
6e09b836b8
Merge pull request #7767 from diegobenetti/issue7751-feedback-errors 
Fixes exception in meteor log when the meeting is ended
 2019-08-28 15:11:10 -04:00
Tainan Felipe
dc7bb6d2a7 Change observe in the base component 2019-08-21 16:27:15 -03:00
KDSBrowne
74ac34c407 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7148 2019-08-19 13:44:36 +00:00
Anton Georgiev
9957fd0d37
Revert "Implement HOC to handle errors" 2019-08-16 17:38:17 -04:00
Tainan Felipe
6473e6fa3c Rename context functions and restruct the join load component 2019-08-16 16:35:08 -03:00
Tainan Felipe
4bfbb15637 Merge remote-tracking branch 'upstream/master' into join-HOC 2019-08-15 14:50:25 -03:00
Chad Pilkey
4e70185011 fix html5 server logger initialization 2019-08-02 10:20:06 -07:00
Anton Georgiev
fd894a4d2c
Merge pull request #7753 from Tainan404/Add-pong-time-to-settings 
Add pong and clear users intervals times to settings
 2019-07-30 13:18:26 -04: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
Diego Benetti
990f7b5209 Changes the message and log level for user not found on feedback 2019-07-22 16:32:14 -03:00
Tainan Felipe
acf2a75f86 Implement HOC to handle errors 2019-07-22 13:44:26 -03:00
Diego Benetti
2d66704bcf Fixes exception in meteor log when the meeting is ended 2019-07-11 17:51:09 -03:00
KDSBrowne
4a9a833755 add browser locale detection override prop to settings.yml 2019-07-10 13:19:00 +00:00
Tainan Felipe
8ffa84e39b Add pong and clear users intervals times to settings 2019-07-08 16:49:09 -03:00
Chad Pilkey
cb58037ea1 fix crash from invalid online users 2019-07-08 19:04:12 +00:00
Chad Pilkey
e720bcf60c fix html5 server exceptions 2019-07-06 22:48:33 +00:00
Anton Georgiev
1622b4ad53
Merge pull request #7583 from jfsiebel/reconnection-improvement 
Improve client reconnection
 2019-07-04 14:53:35 -04:00
Anton Georgiev
c14e6074d9
Merge pull request #7708 from Tainan404/fix-user-leaving 
Add ping-pong message to html5 client
 2019-07-04 14:41:59 -04:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Tainan Felipe
1819911054 Merge branch 'fix-user-leaving' of https://github.com/Tainan404/bigbluebutton into fix-user-leaving 2019-07-02 14:34:18 -03:00
Tainan Felipe
a6cc0286d0 Fix comparasion code 2019-07-02 14:32:16 -03:00
Anton Georgiev
fb1c294312 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logging-structure 2019-07-02 15:41:57 +00:00