BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,170 Commits 13 Branches 260 Tags 1.1 GiB
98a62c0fab
Commit Graph

922 Commits

Author SHA1 Message Date
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
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
Anton Georgiev
74fed3a3c9 restructure logs so extra params are inside extraInfo {} 2019-06-28 21:40:06 +00:00
Chad Pilkey
cef913294f stop silencing message exceptions in html5 server 2019-06-28 18:51:26 +00:00
Anton Georgiev
00a74a494f Pulled HTML5 locales June 26, 2019; Added Finnish 2019-06-26 18:16:46 +00: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
Anton Georgiev
e0cd95b2aa Pulled html5 locales June 3, 2019; added Hungarian 2019-06-03 19:44:03 +00: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
Anton Georgiev
32bf1271d1 pulled html5 locales May 23, 2019; added Vietnamese 2019-05-23 20:53:44 +00:00
Anton Georgiev
643c4197f1
Merge pull request #7462 from Tainan404/youtube-playing-audio 
Log out user prior to Feedback (end all media streams)
 2019-05-22 12:44:21 -04:00
Tainan Felipe
2f63c174a3 Fix youtube keeps playing audio when user left the meeting 2019-05-17 16:39:05 -03:00
Ghazi Triki
76371b9b6e Merge remote-tracking branch 'bigbluebutton/master' into html5-rtl 2019-05-16 17:32:58 +01: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
Ghazi Triki
9a15e6277c Better RTL language detection. 2019-05-14 16:00:14 +01:00
Ghazi Triki
1f6326f7fd Change layout direction for RTL languages. 
Update styles for RTL layout.
 2019-05-14 14:17:19 +01:00
Anton Georgiev
f244bc0e7e
Merge pull request #7403 from Tainan404/issue-7324 
Fix error screen at meeting ends
 2019-05-09 15:41:25 -04: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
Anton Georgiev
63ac70b798 add sv locale 2019-05-09 14:47:47 +00:00
Anton Georgiev
299a071349
Merge pull request #7306 from diegobenetti/base-rerender-tests 
All subscriptions moved from Base to new component
 2019-05-03 15:55: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
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
Anton Georgiev
2292e71f9c
Merge pull request #7285 from Tainan404/issue-7136 
Remove server exception when user with expired session tries to join
 2019-04-24 14:16:13 -04:00
Tainan Felipe
ae73142d93 Add breakout ended 2019-04-24 14:41:35 -03:00
Anton Georgiev
291cb1ec36 html5 locales Apr 24, 2019 2019-04-24 13:08:11 +00: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
bobakoftadeh
b3cac0e855 improve password option for redis 2019-04-12 19:55:25 +00: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
bobakoftadeh
6871b5d35c Add password field for redis settings 2019-04-10 21:20:36 +00: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
Anton Georgiev
d1403281ef pulled html5 locales Apr 3, 2019; added Arabic 2019-04-03 15:50:01 +00:00
Chad Pilkey
b75e579acf
Merge pull request #7062 from riadvice/html5-files-cdn 
Support loading the HTML5 main JS file and its assets from a CDN
 2019-03-29 16:38:01 -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
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
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
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
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
0340d1c2be not having the exact locale match is not an error 2019-03-08 16:57:40 +00:00
Tainan Felipe
32f5168090 Fix viewer can view all breakout Rooms 2019-03-07 13:33:34 -03:00
Anton Georgiev
24e0808ac2 pulled latest html5 locales; added Hebrew 2019-03-05 19:31:28 +00:00
Tainan Felipe
3648afcf3f Add pending/guest users waiting to approval panel 2019-02-26 14:08:15 -03:00
Anton Georgiev
f9f73fa6a8
Merge pull request #6845 from antobinary/locales-1 
Pulled the latest html5 client locales; added cs_CZ
 2019-02-22 10:08:12 -05:00
Anton Georgiev
144747ddc4 pulled latest html5 locales; added cs_CZ 2019-02-22 15:06:19 +00:00
Anton Georgiev
d18923974d
Merge pull request #6822 from antobinary/presentation-download 
Presentation download
 2019-02-22 09:03:44 -05: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
Anton Georgiev
d2397cba3e handle change of downloadable pres status 2019-02-15 19:45:42 +00: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
Anton Georgiev
140a56c9ec
Merge pull request #6581 from vitormateusalmeida/issue-6401 
Check if the meeting exists #6401
 2019-01-31 16:08:03 -05:00
Vitor Mateus
0b2aa0b5a1 Fix not necessary code 2019-01-31 16:47:01 -02:00
Vitor Mateus
e0ddffbf66 Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-30 10:01:29 -02:00
Vitor Mateus
77b59662e5 Fix error on invalid sessionToken 2019-01-30 09:52:24 -02:00
Anton Georgiev
11f5f3dd69 sort language related imports to match order of locales 2019-01-29 21:38:40 +00:00
Anton Georgiev
76bf828a02 pulled latest HTML5 client locales from Transifex 2019-01-29 21:15:10 +00:00
Vitor Mateus
c140acbd6b Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-28 10:14:46 -02:00
Vitor Mateus
b6d5b15e3e Implement enable/disable Animations issue-5846 2019-01-24 14:16:23 -02:00
Anton Georgiev
7e7617f89e Log errors with locale processing 2019-01-23 21:56:38 +00:00
Vitor Mateus
d9fb42b023 Avoid stay loading when meeting end intentionally 2019-01-21 17:28:37 -02:00
Anton Georgiev
51f7645607 remove REDIS pubsub html5 logs; turned off debug 2019-01-21 17:00:24 +00: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
Anton Georgiev
0733048d44
Merge pull request #6464 from KDSBrowne/2.2-fix-broken-locales 
Fix broken locales on load
 2019-01-09 17:16:52 -05:00
KDSBrowne
7e304e0866 add Bulgarian locale to addLocaleData 2019-01-09 21:43:54 +00:00
Tainan Felipe
e66309dde1 Fix user rejoining to meeting when is ejected 2019-01-02 15:31:57 -02:00
KDSBrowne
be60b07284 fix locales not being displayed properly 2018-12-21 16:46:55 +00: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
KDSBrowne
5adac9c88b adjust packages / fix bug 2018-12-10 01:08:16 +00:00
Maxim Khlobystov
f548b46672 Improve the client logs appearing on user join/subscription 2018-12-06 12:26:08 -05:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
KDSBrowne
39c75fd449 fix remaining bugs / console errors 2018-12-05 19:31:33 +00:00
Tainan Felipe
de66a7bd12 Add button for set free join status on create breakout room modal 2018-11-21 14:46:29 -02:00
Bobak Oftadeh
caabc100ac fixed spacing in lock-modal styles 2018-11-19 20:07:39 +00:00
Tainan Felipe
b9cd478533 Merge remote-tracking branch 'upstream/master' into issue-6194 2018-11-19 12:05:17 -02:00
Tainan Felipe
5a3649791b Transform joinRouterHandler and aunthenticatedRouteHandler in components 2018-11-14 15:11:10 -02:00
Oswaldo Acauan
a8c1df7f22 Upgrade all npm and meteor packages and fix compatibility issues introduced 2018-11-06 12:59:53 -02:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
Anton Georgiev
35d92c3e6d improve on callbacks when joining client 2018-10-25 15:51:53 +00:00
Anton Georgiev
ff837fdd09 drop unnecessary Boolean() wrapper 2018-10-25 15:20:37 +00:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +00:00
Anton Georgiev
30c43795af work on chat alert 2018-10-16 17:48:27 +00:00
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +00: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
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +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
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +00:00
João Francisco Siebel
531f739f12 Merge remote-tracking branch 'upstream/master' into ini-configuration-file 2018-09-25 09:42:24 -03: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
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
João Francisco Siebel
bb58a3fde6 let server handle parameters 2018-09-19 17:32:17 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -03:00
João Francisco Siebel
e750ceb0a1 make a single makeCall in auth 2018-09-17 14:05:39 -03:00
João Francisco Siebel
ebe4b83a10 remove unnecessary comments 2018-09-14 15:01:24 -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
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Chad Pilkey
625e351af8 fetch fullInfo from Auth every time instead of caching 2018-09-04 13:28:04 -07: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
Anton Georgiev
6da18cd52d made clientLog structure easier to edit via script 2018-08-22 18:25:43 +00:00
Anton Georgiev
6459b84c83 Pulled HTML5 locales aug 15; Fix for locale switch edge case (#5984) 2018-08-15 13:58:23 -03:00
Bobak Oftadeh
88de0a4bbf Fixed clientInfo JSON parsing error 2018-08-13 19:53:20 +00:00
Anton Georgiev
ed173b813a fix linting 2018-08-13 19:52:44 +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
4daedd4cdc Locale selection without reload on route change. credits: @oswaldoacauan (#5953) 
Resolves #5668 resurfacing
 2018-08-02 16:23:11 -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
Bobak Oftadeh
78bcec7553 Implemented adjustments to logClient 2018-07-31 15:28:03 -07:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00: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
Anton Georgiev
9f87a4f344 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into test-5822 2018-07-24 21:08:28 +00: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
Anton Georgiev
ddbb2a64dc Merge branch 'custom-parameters' of github.com:lfzawacki/bigbluebutton into test-5822 2018-07-23 18:33:32 +00:00
Tainan Felipe
1c04aacb24 fix intl showing intl ids 2018-07-23 13:46:53 -03:00
KDSBrowne
37c9599a70 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 01-bug-fixes 2018-07-23 15:37:28 +00:00
Anton Georgiev
8b0ec94405 remove duplicate import causing app to crash 2018-07-23 15:06:25 +00:00
Anton Georgiev
5dc3fe82c2
Merge branch 'v2.0.x-release' into custom-parameters 2018-07-23 10:29:29 -04:00
KDSBrowne
1f7ff24b63 add return to prevent cam unsharing on first route change 2018-07-22 17:45:33 +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
Lucas Fialho Zawacki
125e90582c Add processing of userdata parameters and correct bug while processing metadata 2018-07-19 17:44:20 -03:00
Bobak Oftadeh
6d2d701127 Altered client logger functions 2018-07-19 09:21:26 -07:00
Tainan Felipe
005310d22a Allow guest user join via html5 client 2018-07-19 09:46:44 -03:00
Bobak Oftadeh
8119e10167 Updated how targets are added to the client logger 2018-07-18 09:04:40 -07:00
Bobak Oftadeh
5a2d2934fa Updated settings for client-logger 2018-07-13 12:44:22 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07: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
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
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
30c67996a8
Merge pull request #5698 from antobinary/meta-params-html5 
HTML5: Process only meta params from the list of the handled ones
 2018-06-18 10:59:58 -04:00
Anton Georgiev
f703304557 only process handled meta params for html5 2018-06-18 14:47:55 +00:00
Anton Georgiev
c8eb8094d3 process only meta params starting with "html5" 2018-06-15 16:02:05 +00: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
Anton Georgiev
81a6b877b9
Merge pull request #5591 from KDSBrowne/edit/config/locale 
Improve html5 locale fallback selection
 2018-06-08 13:51:53 -04: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
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb 
Whiteboard and Cursor performance update
 2018-05-30 11:42:52 -04: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
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
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
Anton Georgiev
e4a6f31abc revert special api changes made for html5 client 2018-05-24 18:42:59 +00:00
KDSBrowne
a750e2b2a0 edit config prop / startup-server-index variable names 2018-05-22 12:57:43 -07:00
Anton Georgiev
ab54e5689b support metadata with improper format 2018-05-16 14:43:25 +00:00
Anton Georgiev
d6f91228d6
Merge pull request #5436 from Tainan404/issue-5419 
Clear session storage to enter
 2018-05-15 07:23:31 -04:00
Tainan Felipe
a4b9bc807e add comment explaining reducer 2018-05-14 16:34:06 -03:00
Tainan Felipe
ba0f5fad5e parse metadata in auth.js 2018-05-14 13:43:00 -03:00
Anton Georgiev
13e6eb1a05
Merge pull request #5404 from Tainan404/implement-feedback-screen 
Implement feedback screen
 2018-05-14 10:19:53 -04:00
Tainan Felipe
eace2e4932 import component 2018-05-14 10:45:43 -03:00
Tainan Felipe
5659ba10e7 use authtoken and connection status to verify feedback 2018-05-10 17:23:17 -03:00
Tainan Felipe
c4c0930317 remove log 2018-05-09 15:12:51 -03:00
Tainan Felipe
0707924a47 pass rating to meeting-ended and create feedback endpoint 2018-05-09 15:07:40 -03:00
Tainan Felipe
c89a1cd7ed generate only one object 2018-05-08 14:15:04 -03:00
Tainan Felipe
10a90b4180 WIP 2018-05-08 13:30:00 -03:00
Tainan Felipe
2f52c9fdc5 remove only metadata 2018-05-08 09:26:04 -03:00
KDSBrowne
57f3f4389c add functions to deviceInfo utility / improve shortcut modal 2018-05-02 11:55:46 -07:00
Tainan Felipe
19c233adc4 Clear session storage to enter 2018-04-30 15:52:47 -03:00
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations" 2018-04-25 20:41:19 -04:00
Anton Georgiev
44fde9a83c
Merge pull request #5400 from MaximKhlobystov/whiteboard-bulk-upsert 
[HTML5 Client] Whiteboard Bulk Operations
 2018-04-25 18:03:52 -04:00
Maxim Khlobystov
8e2cfce7ff Improved the error logging when doing bulkWrite. 2018-04-25 20:14:27 +00:00
Maxim Khlobystov
4db94b4489 Some cleanup and code optimizations. 2018-04-25 15:15:36 +00:00
Maxim Khlobystov
4067f5f808 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert 2018-04-25 14:39:48 +00:00
Maxim Khlobystov
8d1e80fbf0 Put the bulk lifespan value into configs. 2018-04-25 14:27:53 +00:00
Oswaldo Acauan
46559833e2 Add metatag html5autosharewebcam 2018-04-24 12:51:41 -03:00
Oswaldo Acauan
6beada63eb Add metatag html5autoswaplayout 2018-04-24 12:23:54 -03:00
Maxim Khlobystov
f321011a6f Cleaned up some console logs. 2018-04-24 15:10:02 +00:00
Maxim Khlobystov
4ef8f0d0c6 Moved pencil to bulk updates. 2018-04-24 13:59:13 +00:00
KDSBrowne
a4cb68f387 redirect users on meeting join based on device 2018-04-21 13:09:22 -07:00
KDSBrowne
c6bd3fabc8 improve code readability 2018-04-20 09:07:39 -07:00
KDSBrowne
a570eeaf77 use matchMedia() to determin if we open the Userlist on meeting join 2018-04-18 19:37:06 -07:00
KDSBrowne
a86030225a show userlist open by default on meeting join for desktop / tablet 2018-04-17 12:48:43 -07:00
Oleksandr Zhurbenko
7c61e4c4b9 Corrected a publisher for presentation-pods 2018-04-09 20:57:24 -07:00
Maxim Khlobystov
fa58101039 Added time-based grouping for common shapes upserting. 2018-04-05 16:19:41 -04:00
Anton Georgiev
21b6dab852
Merge pull request #5267 from Tainan404/issue-5237 
Add custom logo area
 2018-04-05 15:08:05 -04: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
Tainan Felipe Pauli de Almeida
505a00daba add custom logo area 2018-03-21 15:19:09 -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
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03:00
Anton Georgiev
337bcd616c add logs to debug user join handler 2018-03-16 18:57:27 +00:00
Anton Georgiev
f45eedc62b
Merge pull request #5164 from MaximKhlobystov/production-console-logging 
[HTML5 Client] Production Logging to Console
 2018-02-28 12:33:42 -05: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
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
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
528f94b15a
Merge pull request #5062 from antobinary/html5-daily-log-rotation-2 
Added daily log rotation in production env
 2018-01-31 11:11:58 -05:00
Anton Georgiev
f789842ccb
Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user 
Prevent kicked user's ability to rejoin meeting via back btn
 2018-01-30 15:10:46 -05:00
KDSBrowne
5b93033126 remove window.popstate and add onLeave to meeting-ended route 2018-01-30 08:39: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
KDSBrowne
90bfea5d77 check if user was ejected 2018-01-29 10:17:52 -08:00
KDSBrowne
d0f6e4f3a2 add console logs to determin flow 2018-01-26 14:17:34 -08:00
Richard Alam
b05237b075 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-26 12:51:39 -08: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
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
3366bc32b0
Merge pull request #4851 from Tainan404/fix-language-selector 
Language selector of the application, each option appears in its native language.
 2018-01-16 13:40:03 -02: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
8ae1fd1820 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends 2018-01-11 09:19:56 -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
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -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
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
5c5125c7d2 fix issue #4847 2017-12-20 14:56:56 -02:00
Tainan Felipe
c582f5bf08 add meetingEnded in Base component aand add intl translation 2017-12-14 17:03:34 -02:00
Tainan Felipe
bbbb64b4fd fix error in logoutURL 2017-12-13 16:59:24 -02:00
Oswaldo Acauan
1eacfcb5a1 Fix Meteor.error subscription params 2017-12-13 16:27:53 -02:00
Oswaldo Acauan
d19c127b1f Add redirect to /logout if not loggedin or on subscription errors 2017-12-13 16:20:56 -02:00
Oswaldo Acauan
2faf40e381 Throw meteor error when Acl fails for subscriptions 2017-12-13 16:20:37 -02:00
Tainan Felipe
004290183d add screen to when the meeting is closed 2017-12-12 11:08:43 -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
Maxim Khlobystov
bc1a4c473c
Merge pull request #4581 from Gcampes/locale-browser-default 
Set initial locale to be the browser one
 2017-11-06 11:16:36 -05:00
Anton Georgiev
63eb812f85
Merge pull request #4578 from OZhurbenko/meteor-react-16-update 
React 16 and packages update
 2017-11-02 10:41:45 -02:00
Oleksandr Zhurbenko
6ba09a3184 Fixed a logClient function call 2017-10-31 14:52:18 -07: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
75f82b923d gets default language from config 2017-10-27 11:23:18 -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
gcampes
d32330b208 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-24 11:19:58 -02:00
Oleksandr Zhurbenko
92fcc4bc74 Initial packages update 2017-10-23 17:09:40 -07:00
gcampes
b15322e7f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-18 17:42:49 -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
Tainan Felipe
e74c44dd9d fix errors linter 2017-10-12 14:02:46 -03:00
gcampes
fafbba06cb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-12 13:58:39 -03:00
gcampes
6b44504e5d Adds timeout to transfer, fix css, remove logs 2017-10-12 11:49:50 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Anton Georgiev
a850d1c9c1 Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite 
[HTML5] Redis class refactor
 2017-10-11 17:40:28 -03: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
Oswaldo Acauan
96ea918919 Fix file permissions 2017-10-09 17:20:27 -03:00
Oswaldo Acauan
7d664c8be7 Add a check for the passed credentials agains the token in Acl 2017-10-09 09:49:07 -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
Anton Georgiev
5c071756a0 Merge pull request #4438 from KDSBrowne/xx-04-logoutURL-issue 
[HTML5] - logoutRouteHandler Fix
 2017-10-02 13:33:54 -04:00
KDSBrowne
b2d78b4f8a remove unused callback function 2017-09-29 09:21:04 -07:00
KDSBrowne
3633b460d4 clean up code with suggestion 2017-09-27 08:03:31 -07:00
KDSBrowne
3e7aab2bdd add http:// to logoutURL if its not there 2017-09-27 06:56:40 -07: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
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer 
HTML5 ScreenShare Viewer
 2017-09-11 13:40:56 -03:00
KDSBrowne
bc8718e263 fix line endidngs 2017-09-07 09:47:20 -07:00
KDSBrowne
21c5ffee8f remove need for separate headerBuilder function 2017-09-07 09:37:13 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
KDSBrowne
67ab2d5379 alternate solution test 2017-09-06 07:17:46 -07:00
KDSBrowne
f31a2df133 implement suggested changes 2017-08-30 09:31:08 -07:00
KDSBrowne
14696a3cff fix lint issue 2017-08-30 08:03:19 -07:00
KDSBrowne
a8137c3054 switch to one function to create headers 2017-08-30 07:58:46 -07:00
KDSBrowne
82de509c55 fix typo 2017-08-29 07:00:41 -07:00
KDSBrowne
92c9af6d96 add functions to create headers 2017-08-28 07:29:26 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Klaus
e996bea1e9 Handling separate redis channel 2017-08-14 15:55:17 -03:00
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Klaus
1ff3df770a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user 2017-07-31 17:01:04 -03:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager 
[HTML5] Implemented AudioManager
 2017-07-31 14:29:42 -04:00
Klaus
9bc9116e5c handling a few messages 2017-07-31 08:10:52 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Klaus
9ab4430f68 Fix merge stuff 2017-07-26 11:31:35 -03:00
Anton Georgiev
75c39f9340 Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio 2017-07-24 16:06:52 -04:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Matthew Marangoni
2f48cca53e Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x 2017-07-24 12:14:18 -07:00
Matthew Marangoni
8902742573 wrapped BBB instantiation into init function and added to startup 2017-07-24 11:36:56 -07:00
Klaus
d72df301c6 Move to 2.0 2017-07-24 11:15:46 -03:00
Klaus
5c2369b992 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-24 11:00:30 -03:00
Matthew Marangoni
4e66ecf0e2 moved BBB import to startup 2017-07-20 08:57:12 -07:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03:00
Klauswk
7173c0e20c Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-17 16:54:37 -03:00
Klaus
5767583a86 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages 2017-07-17 15:37:06 -03:00
Klaus
7fb9bae75e Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-14 14:44:00 -03:00
Klaus
baf36d9d5f Fix the html5 2.0 user logout 2017-07-14 13:59:02 -03:00