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

369 Commits

Author SHA1 Message Date
Joao Siebel
1c47023e8a Add original function link for reference 2020-11-16 10:46:18 -03:00
Joao Siebel
3a2d06fd88 Tweak sockjs timeout value 2020-11-13 18:41:56 -03:00
Anton Georgiev
a8dc7a0bff Simplified redis debug and placed behind check 2020-11-12 21:03:57 -05:00
Anton Georgiev
5ba12846d5
Update index.js 2020-10-28 15:17:17 -04:00
Joao Siebel
e50c348874 WIP improve log 2020-10-21 14:27:40 -03:00
Joao Siebel
dadca62741 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-13 10:49:12 -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
Joao Siebel
6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager 2020-09-08 16:36:01 -03:00
Joao Siebel
b8f42ac712 Create ClientConnections structure and auth-token-validation collection 2020-09-01 09:07:56 -03:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -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
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
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
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
Tainan Felipe
5e5f4cc93b Move locales fallback to a json file 2020-05-26 11:15:17 -03: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
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
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00: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
KDSBrowne
e15e45b149 fix render loop after changing locale when override setting is set 2020-03-26 13:32:15 +00: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
KDSBrowne
af14345185 fix render loop after changing locale when override setting is set 2020-03-11 13:55:41 +00: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
1fa426058f corrected issues related to publishing and methods 2020-02-13 14:19:29 -05:00
Anton Georgiev
689427b092 commented out memwatch usage - not supported on node12 2019-12-03 20:26:45 +00: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
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
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
KDSBrowne
74ac34c407 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7148 2019-08-19 13:44:36 +00: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
Diego Benetti
990f7b5209 Changes the message and log level for user not found on feedback 2019-07-22 16:32:14 -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
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
Tainan Felipe
9df7ba1a1a
Merge branch 'master' into fix-user-leaving 2019-07-01 17:24:09 -03:00
Tainan Felipe
88cfb70255 Add ping-pong message to html5 client 2019-07-01 16:00:27 -03:00
Chad Pilkey
cef913294f stop silencing message exceptions in html5 server 2019-06-28 18:51:26 +00:00
Anton Georgiev
aba6f72202
Handle both null and undefined password 2019-05-15 14:50:28 -04:00
Anton Georgiev
7937a779a6
Merge pull request #7231 from BobakOftadeh/redis-password 
Add password field for redis settings
 2019-05-15 14:49:20 -04:00
Chad Pilkey
47c8ff32a2 reuse userAgent constant 2019-05-02 09:47:40 -07:00
Chad Pilkey
0cd79b7c05 move legacy browser versions into settings.yml 2019-05-01 17:33:03 -07:00
bobakoftadeh
b3cac0e855 improve password option for redis 2019-04-12 19:55:25 +00:00
bobakoftadeh
6871b5d35c Add password field for redis settings 2019-04-10 21:20:36 +00: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
Ghazi Triki
b1e6cff44e Improve CDN CORS rules. 2019-03-29 18:33:23 +01:00
Ghazi Triki
5b87524520 Use the embedded meteor CDN feature. 2019-03-29 16:47:07 +01:00
Ghazi Triki
5a06f36009 Removed all content from external origin as the html5client is the consumer not the provider. 2019-03-18 14:12:55 +01:00
Ghazi Triki
106058e1dd Support loading the HTML5 main JS file and its assets from a CDN. 2019-03-18 09:57:43 +01:00
Anton Georgiev
0340d1c2be not having the exact locale match is not an error 2019-03-08 16:57:40 +00:00
Anton Georgiev
d2397cba3e handle change of downloadable pres status 2019-02-15 19:45:42 +00:00
Anton Georgiev
7e7617f89e Log errors with locale processing 2019-01-23 21:56:38 +00:00
Anton Georgiev
51f7645607 remove REDIS pubsub html5 logs; turned off debug 2019-01-21 17:00:24 +00:00
KDSBrowne
5adac9c88b adjust packages / fix bug 2018-12-10 01:08:16 +00:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
Bobak Oftadeh
caabc100ac fixed spacing in lock-modal styles 2018-11-19 20:07:39 +00:00
Oswaldo Acauan
a8c1df7f22 Upgrade all npm and meteor packages and fix compatibility issues introduced 2018-11-06 12:59:53 -02:00
Anton Georgiev
30c43795af work on chat alert 2018-10-16 17:48:27 +00:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -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
Felipe Cecagno
62311387b8 more changes to configure redis using environment variables 2018-08-24 17:15:47 -03:00
Diego Sampaio
6fbb577a9f Fix redis connection using private settings 2018-08-24 17:15:47 -03:00
Bobak Oftadeh
78bcec7553 Implemented adjustments to logClient 2018-07-31 15:28:03 -07: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
8aed93c315 improve error logs 2018-06-14 19:01:49 +00:00
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07: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
KDSBrowne
f57d5f265a change condition check in if statment 2018-05-30 06:09:33 -07:00
KDSBrowne
ef9c479523 remove usless map() 2018-05-30 06:07:25 -07:00
KDSBrowne
b3a6de7dda make reducer not act as a loop 2018-05-30 05:39:02 -07:00
KDSBrowne
4ed7b4cb46 put path to available locales in a const 2018-05-30 05:23:05 -07:00
KDSBrowne
aa5deedbc9 replace structural loop with reduce 2018-05-28 07:24:03 -07:00
KDSBrowne
d0660e6699 improve locale fallback selection 2018-05-28 04:35:24 -07:00
KDSBrowne
a750e2b2a0 edit config prop / startup-server-index variable names 2018-05-22 12:57:43 -07:00
Tainan Felipe
5659ba10e7 use authtoken and connection status to verify feedback 2018-05-10 17:23:17 -03:00
Tainan Felipe
0707924a47 pass rating to meeting-ended and create feedback endpoint 2018-05-09 15:07:40 -03:00
Anton Georgiev
bbab765f82 print length of queue of redis messages to be processed 2018-04-02 20:16:46 +00:00
Anton Georgiev
c698ad5add log the nodejs version in use 2018-03-21 19:16:07 +00:00
Anton Georgiev
337bcd616c add logs to debug user join handler 2018-03-16 18:57:27 +00:00
Maxim Khlobystov
d578a40721 Keeping the console logs in development. 2018-02-22 13:45:29 -05:00
Maxim Khlobystov
59746e6b3f Started logging to console in production + removed daily rotation logs. 2018-02-22 11:48:49 -05:00
Oleksandr Zhurbenko
e1568baa24 Fixed the logging of the Meteor serser-side methods 2018-02-05 12:34:03 -08:00
Richard Alam
06faa8a448 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-31 14:38:43 -08:00
Anton Georgiev
ab39163070 put month before day in log rotation name 2018-01-30 10:37:00 -05:00
Anton Georgiev
9e05f346c7 added daily log rotation in production env 2018-01-29 16:50:32 -05: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
Tainan Felipe
2725b80ac4 revert env 2018-01-11 10:48:24 -02:00
Tainan Felipe
18011fe3da Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-language-selector 2018-01-11 10:35:31 -02:00
Tainan Felipe
2f00d0b612 add directory via absoluteFilePathh 2018-01-10 15:03:06 -02:00
Tainan Felipe
b9d7a5ba38 changes to import form 2018-01-10 10:43:45 -02: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
Tainan Felipe
5c5125c7d2 fix issue #4847 2017-12-20 14:56:56 -02:00
Gabriel Carvalho de Campes
5237f200b5
removes console.log 2017-10-31 15:29:44 -02:00
Gabriel Carvalho de Campes
2e982114b5 Fix locale fetching issues 2017-10-31 15:13:44 -02:00
Gabriel Carvalho de Campes
5a9a5fd1b0 code cleanup 2017-10-27 10:02:19 -02:00
Gabriel Carvalho de Campes
00bf09c4f9 Fix issue with locales 2017-10-27 09:36:27 -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
Oswaldo Acauan
7935cbff01 Fix file permissions 2017-10-11 12:35:43 -03:00
Oswaldo Acauan
10fff502f7 Add comment about redis.js 2017-10-11 12:34:56 -03:00
Oswaldo Acauan
c08f6a9c4f Fix file permissions 2017-10-11 12:22:08 -03:00
Oswaldo Acauan
3e5dacdaf1 Change meetingQueue delete 2017-10-10 15:30:45 -03:00
Oswaldo Acauan
d8ed7e23ee Remove debug message 2017-10-10 14:50:06 -03:00
Oswaldo Acauan
80a318309c Implement multi queues and async messages on Redis class 2017-10-10 14:43:42 -03:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
Maxim Khlobystov
5f79db2554 Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal. 2017-10-06 16:29:52 +00: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
KDSBrowne
cd5da84984 make handlePublishError static 2017-09-13 15:57:52 -07:00
KDSBrowne
c7328a5bb7 fix: Expected 'this' to be used by class method 'handlerPublishError' 2017-09-13 13:50:04 -07:00
KDSBrowne
e3ed9aa84d remove need for wrapper function 2017-09-13 12:47:52 -07:00
KDSBrowne
27dbe42189 pass this.pub as a parameter to _publish 2017-09-13 10:01:47 -07:00
KDSBrowne
91718abfba add underscore to indicate private function 2017-09-13 09:10:28 -07:00
KDSBrowne
41b629b232 make publish function private to RedisPubSub2x class 2017-09-13 08:29:23 -07:00
KDSBrowne
571c3763dd add publishVoiceMessage 2017-09-12 10:58:06 -07:00
KDSBrowne
090b3e91c2 add comment to publish 2017-09-12 10:25:41 -07:00
KDSBrowne
c987ef6635 add publishSystemMessage 2017-09-12 09:11:08 -07:00
KDSBrowne
39bd590329 rework header creation 2017-09-12 08:52:02 -07:00
Oleksandr Zhurbenko
43b3b89c6a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-11 12:11:03 -07:00
KDSBrowne
89de2f771b change parameter name to header 2017-09-11 10:19:06 -07:00
KDSBrowne
bc8718e263 fix line endidngs 2017-09-07 09:47:20 -07:00