BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,646 Commits 13 Branches 260 Tags 1.1 GiB
4b5ec534a0
Commit Graph

481 Commits

Author SHA1 Message Date
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
Anton Georgiev
d1403281ef pulled html5 locales Apr 3, 2019; added Arabic 2019-04-03 15:50:01 +00: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
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
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
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
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
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
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
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
Tainan Felipe
5a3649791b Transform joinRouterHandler and aunthenticatedRouteHandler in components 2018-11-14 15:11:10 -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
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
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
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
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
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
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
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
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
Oswaldo Acauan
ec07b4434d Change cursor and annotation to user streams and add optimistic updates 
WIP | Use streams to cursor and optimistic updates

WIP | Use streamss to whiteboard and optimistic updates

WIP | Remove fake delay

Add two way batching (server/client client/server)

Fix null userId exception and remove logs

wip

Add two way batching (server/client client/server) for cursor

Remove message frequency from draw-listeners component since we handle on message publication

Handle clear and undo messages
 2018-05-28 14:46:14 -03:00
Anton Georgiev
e4a6f31abc revert special api changes made for html5 client 2018-05-24 18:42:59 +00: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
c4c0930317 remove log 2018-05-09 15:12:51 -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
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
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
Anton Georgiev
21b6dab852
Merge pull request #5267 from Tainan404/issue-5237 
Add custom logo area
 2018-04-05 15:08:05 -04:00
Tainan Felipe Pauli de Almeida
505a00daba add custom logo area 2018-03-21 15:19:09 -03:00
Oswaldo Acauan
0e5fc698b0 Fix reconnecting users being redirected to /logout 2018-03-16 16:22:27 -03: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
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
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
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
Tainan Felipe
bbbb64b4fd fix error in logoutURL 2017-12-13 16:59:24 -02:00
Oswaldo Acauan
d19c127b1f Add redirect to /logout if not loggedin or on subscription errors 2017-12-13 16:20:56 -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
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
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
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03: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
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer 
HTML5 ScreenShare Viewer
 2017-09-11 13:40:56 -03:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -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
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
Klauswk
38087a1669 Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:38:54 -03:00
Klaus
963248163d Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:14:02 -03:00
Klaus
55a9c0673e Handling chat messages 2017-07-11 13:57:54 -03:00
Klaus
90ca216507 Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-07 08:19:39 -03:00
Klaus
4c1c7ad65a Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages 2017-07-06 17:36:56 -03:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Klaus
9b63e0c215 Add caption messages 2017-06-29 17:22:09 -03:00
Klaus
93927a3b53 Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages 2017-06-29 09:22:34 -03:00
Klaus
2098c2dff7 Handle polls messages 2017-06-28 17:37:45 -03:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Klaus
c491d28b78 Handle most of the breakout messages 2017-06-26 15:00:28 -03:00
Klaus
a209f620e0 Add cursor support 2017-06-22 10:22:34 -03:00
Klaus
0c596c304d Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis 2017-06-20 14:16:16 -03:00
Anton Georgiev
367b905ec5 use enter api to get meetingId, authToken, etc 2017-06-19 14:03:12 -04:00
Anton Georgiev
8e16114c3f html5client login now redirect=true to url+sessionToken 2017-06-19 14:01:24 -04:00
Klaus Klein
68f52aa107 Remove error from http response 2017-06-08 14:29:35 -03:00
Klaus Klein
e7e1243fef Add const to defaultLang 2017-06-06 09:43:57 -03:00
Klaus Klein
0d9525164f Add support to default system/browser language 2017-06-06 09:33:53 -03:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
159a47694e add suggested changes 2017-05-18 16:16:17 -07:00
KDSBrowne
d1543584ba change file permission to 644 2017-05-17 09:07:41 -07:00
KDSBrowne
f4d6f173ea fix new lint issues 2017-05-17 09:02:13 -07:00
KDSBrowne
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -07:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
Klaus Klein
2b53dd19e5 Code refactored 2017-05-15 16:45:00 -03:00
Klaus Klein
95b47fd54a Fix lang fallback error 2017-05-15 13:32:41 -03:00
Anton Georgiev
e8fb481722 add logic to trigger logout if user timed out on auth step 2017-05-09 16:04:30 -04:00
Anton Georgiev
038405f907 some changes to logClient api 2017-05-03 13:19:21 -04:00
Klaus Klein
5a4f05a41a Fix requests on PR #3865 2017-04-28 14:12:08 -03:00
Klaus Klein
1c8e78d1c1 Merge with master 2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3 Add client log, HTML5 2017-04-28 10:47:07 -03:00
Klaus Klein
3aacb71705 Remove unnecessary console.log 2017-04-27 10:43:21 -03:00
Klaus Klein
b99b73f334 Fix the double auth problem 2017-04-26 16:56:29 -03:00
Anton Georgiev
79fc24e817 Merge pull request #3823 from Gcampes/unauthorized-page-fix 
[HTML5] Fix unauthorized for slow connections
 2017-04-19 17:24:06 -04:00
gcampes
0fd59394e7 remove unwanted debug, adds back log for error 2017-04-17 14:20:09 -03:00
gcampes
832d916fd8 Fix unauthorized on slow connection 2017-04-17 14:14:31 -03:00
gcampes
ded1de0b40 Adds localization dropdown 2017-04-06 09:36:59 -03:00
Oswaldo Acauan
72dc94ab31 Remove old Kicked screen in favor of the new error screen 2017-03-17 14:38:18 +00:00
Oswaldo Acauan
2090883b03 Refactor Auth logout and credentials getter 2017-03-17 14:23:00 +00:00