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

366 Commits

Author SHA1 Message Date
Anton Georgiev
1622425cbc Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop 2021-10-22 19:12:58 +00:00
Lucas Zawacki
e5ac30fd46 feature(layout): userdata flag for hiding actions bar 2021-10-19 19:20:31 +00:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Tainan Felipe
1de8e0779d Add server side reactivity to publications 2021-10-13 15:00:52 -03:00
Ramón Souza
74bf1a558f push layout UI tweaks 2021-09-30 17:21:03 +00:00
Ramon Souza
2b2792102b fix hidePresentation parameter 2021-09-27 17:13:41 -03:00
Anton Georgiev
ab845b3078 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-rc-1-into-dev 2021-09-22 15:28:13 +00:00
Ramon Souza
14d9304746 fix restoreOnUpdate feature 2021-09-22 08:48:25 -03:00
Ramon Souza
9300b9b382 Merge remote-tracking branch 'upstream/develop' into use-context-selector 2021-09-13 15:41:52 -03:00
Ramon Souza
098826c70a rename layout functions 2021-09-10 17:48:52 -03:00
Ramon Souza
981e707612 add selector to containers, remove old layoutContext + convert base component into function 2021-09-10 14:21:04 -03:00
Gustavo Trott
2a348e5f71 Makes Akka stop ScreenShare when External Video is started 2021-09-09 15:27:29 -03:00
Ramon Souza
2e8ac9af27 fix swap layout camera dock size 2021-09-02 15:29:35 -03:00
Ramon Souza
230cce6f3a restore captions feature in new layouts 2021-08-16 10:38:39 -03:00
Anton Georgiev
5cfb723e07 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into aug6-merge 2021-08-06 15:23:36 +00:00
Vitor Mateus De Almeida
1b18977eac rename all NewLayout.. to Layout.. 2021-08-05 08:03:24 -03:00
Vitor Mateus De Almeida
09082734c9 remove old media, webcam draggable and panel components 2021-08-05 04:26:03 -03:00
Vitor Mateus De Almeida
abf089ae73 remove layout manager legacy 2021-08-05 01:22:07 -03:00
Jibon Costa
4ec70505f0 added option to allow to use customStyleUrl from config 2021-08-05 02:36:30 +00:00
Ramon Souza
0efe6da994 prevents screenshare + external video 2021-07-21 10:19:47 -03:00
Anton Georgiev
b9cc633286 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop 2021-07-06 19:36:19 +00:00
Ramon Souza
36c9176b3d always get token info from current connectionId 2021-07-02 10:33:17 -03:00
Ramon Souza
094ecfbbfd fix reconnection crash 2021-06-30 14:50:15 -03:00
Vitor Mateus De Almeida
7bd2f7ab3c Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-06-25 16:59:04 -03:00
Ramon Souza
d39c77fa4a keep changed layout after refresh - new lm 2021-06-24 08:44:05 -03:00
Vitor Mateus De Almeida
3a281adab5 Remove background and commented code 
Revert linting
 2021-06-22 14:04:56 -03:00
Ramon Souza
ae49d7a9c6 remove layoutManager from meeting collection 2021-06-22 09:48:48 -03:00
Ramon Souza
1ac5350fd4 change layout ui 2021-06-22 09:17:11 -03:00
Vitor Mateus De Almeida
d8cffebc36 Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-06-21 17:18:46 -03:00
Vitor Mateus De Almeida
6469b68d45 Add webcams component on new Layout Manager 2021-06-21 17:16:59 -03:00
Anton Georgiev
0c0eb8a4d5
Merge pull request #12548 from ramonlsouza/layout-meeting-collection 
feat: layout manager in meeting collection
 2021-06-18 18:03:19 -04:00
Ramon Souza
ace6561eff Merge remote-tracking branch 'upstream/develop' into new-lm-external-video 2021-06-16 17:41:33 -03:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
Ramon Souza
d4ff739c0a add external video component 2021-06-16 09:53:27 -03:00
Ramon Souza
fb09336fb8 screenshare component in new layout manager 2021-06-14 17:25:05 -03:00
Pedro Beschorner Marin
068b82b1fa refactor(connection status): remove legacy monitor 
Remove parts of a previous connection monitor.

To add some context (as far as my memory goes) to the multiple connection
monitor features the product has, `stats` (currently named `connection status`)
was introduced at the Flash client back in ~2016. @fcecagno and I did it
as a BigBlueButton's Summit activity. Our work was squashed into a single
commit in 92554f8b3e :).

I'm not sure about the whole story behind `network information` (the late
connection monitor added to the HTML5 client) but I assume it should work
as a collector for a bunch of different connectivity monitors. I remember
when it was introduced but I don't know why it wasn't adopted. My best guess
would be because of some performance issues the `user list` had back then.

To follow on why `connection status` replaced `network information` at the
HTML5 client, when I did the `multiple webcams` feature I had to refactor
a big chunk of the `video provider` (#8374). Something that wasn't really
helping there was the adaptation of `stats` that was made to show local
feedback for each webcam connection. Although this feature wasn't being
used anymore, `network information` did rely on that to build up data. With
this monitor gone I assumed it was my responsibility to provide an alternative
so I promoted Mconf's port of the Flash `stats` monitor to BigBlueButton's
HTML5 client (#8579).

Well, that's my perspective on how things went for those features. If
anyone would like to correct me on something or add something else on
that history I would appreciate to know.
 2021-06-13 14:02:46 -03:00
Ramon Souza
da924234d3 store layout manager in meeting collection 2021-06-09 15:30:08 -03:00
Ramon Souza
4c44a90704 Merge remote-tracking branch 'upstream/develop' into layout-meeting-collection 2021-06-09 14:13:26 -03:00
Ramon Souza
1ac3767ed4 store layout type in meeting collection 2021-06-09 14:08:11 -03:00
Ramon Souza
3ba15a83dd different navbar height for large fonts 2021-06-04 10:44:50 -03:00
Ramon Souza
3030fbc206 Merge remote-tracking branch 'upstream/develop' into chat-alerts-refactor 2021-06-04 08:28:47 -03:00
Anton Georgiev
fd9b68b526
Revert "fix: different navbar size for locales with large fonts" 2021-06-03 10:42:02 -04:00
Ramon Souza
f4f01818f8 add localeChanged event to resize presentation area 2021-06-02 09:41:15 -03:00
Ramon Souza
f526ab88fb actions bar in new layout manager 2021-05-31 17:28:57 -03:00
Ramon Souza
94436d2630 chat alerts refactor 2021-05-27 14:46:27 -03:00
Vitor Mateus De Almeida
88a1edcc06 Fix userlist item button, Fix polling close button 2021-05-19 11:51:31 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03:00
Ramon Souza
d5d1c86c70 remove unused imports 2021-04-20 09:12:22 -03:00
hiroshisuga
4db28a2824
Fancy random viewer selection (#11297) 
* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Add files via upload"

This reverts commit 391434445a.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Delete tmp.woff"

This reverts commit 5141e65359.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit c415ff02d1.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Create tmp.woff""

This reverts commit 267dc412d5.

* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit 64a48f2bd6.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit 9d1b4a068a.

* Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""

This reverts commit b60491d933.

* Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""

This reverts commit 16e357091d.

* Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""""

This reverts commit e0b70f2055.

* Revert "Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""""

This reverts commit 7b1bde97ed.

* Update UsersMgs.scala

* Update selectRandomViewer.js

* Update clearRandomlySelectedUser.js

* Update addMeeting.js

* Update updateRandomViewer.js

* Update component.jsx

* Update container.jsx

* Update component.jsx

* Update container.jsx

* Update styles.scss

* Update en.json

* Update SelectRandomViewerReqMsgHdlr.scala

* code simplification

* in case only one person to be selected

* Update en.json

* Create en.json

* Update en.json

* Update component.jsx

* Update styles.scss

* Update en.json

* Update updateRandomViewer.js

Fix a typo

* Update component.jsx

When the presenter is moved to a viewer, in the modal of ex-presenter "somebody is selected" should be displayed. Before this modification, "somebody is the only viewer" was displayed.

* add a comment

explaining why a condition is needed.

* Update en.json

* Update en.json

* revert (due to the rename UserMgs -> UserMsgs)

* Update UsersMsgs.scala
 2021-04-15 11:12:10 -04:00
Ramon Souza
9218262e0a all device info moved to helper 2021-03-31 14:13:36 -03:00
Mario Jr
6508674d38 Prevent ejecting user from them main room when leaving breakout room 
When user observing changes, we must guarantee these changes are from main room, and not from breakout one.
Fixes #11029
 2021-02-21 01:07:25 -03:00
KDSBrowne
2f46c1fd28 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select 2020-11-02 16:16:29 +00:00
Joao Siebel
be8421db3c Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-21 13:57:17 -03:00
Joao Siebel
14388ec922 Improve logs for a better debug/understanding of problems related to authentication and log in process 2020-10-07 16:50:17 -03:00
Joao Siebel
087939855e fix some problems with using same user in multiple tabs 2020-09-16 09:52:44 -03:00
KDSBrowne
e9d4f8e42c adds a select random user feature for presenter 2020-08-28 17:23:27 +00:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00
Anton Georgiev
7ec10d779a adjust flipped check for Moderator, isGuest, etc 2019-08-30 16:13:40 -04:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00
Chad Pilkey
e69931a0af Merge remote-tracking branch 'upstream/master' into fix-pan-lag 2019-07-25 16:29:52 -07:00
Anton Georgiev
2bf8fb5cca minor optimization using Fields in miniMongo 2019-07-24 17:59:04 +00:00
Diego Benetti
f13239674b Changes other parameters to the new pattern 2019-07-24 14:04:46 -03:00
Diego Benetti
4a764f8f6c Implements new name for parameters and the support to the old names 2019-07-22 11:28:13 -03:00
KDSBrowne
2fa59190fb fix panel resizing for RTL locales 2019-07-15 19:15:58 +00:00
KDSBrowne
c12122fe6f move functions instantiated outside class 2019-06-13 15:02:02 +00:00
KDSBrowne
ffecbfa6ac Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into _summit-adjust-screen-reader-trap 2019-06-12 14:40:23 +00:00
KDSBrowne
47468ef5d7 use mapUser in app container 2019-05-31 18:36:52 +00:00
KDSBrowne
bac5d0f529 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 0A-access-39 2019-05-30 15:02:51 +00:00
KDSBrowne
65012daa7a add toasts for meeting mute / unmute and emoji changes 2019-05-30 14:42:38 +00:00
KDSBrowne
7f7970dfb6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into _summit-adjust-screen-reader-trap 2019-05-29 16:10:28 +00:00
Anton Georgiev
ac36732849
Merge branch 'master' into closed-captions-prototype 2019-05-29 11:51:45 -04:00
Pedro Beschorner Marin
a37ae9cb70 Better management of captions activation 2019-05-22 18:33:20 -03:00
Pedro Beschorner Marin
34b39a2b0a Closed captions prototype in a big commit 2019-05-22 18:33:20 -03:00
KDSBrowne
558e25ec9b fix published poll toast notifications for old polls 2019-05-22 14:44:17 +00:00
KDSBrowne
475e945abc improve screen reader panel check 2019-05-15 21:13:05 +00:00
KDSBrowne
ccd70e86fa enable screen reader trap for layered views 2019-05-08 17:52:12 +00:00
KDSBrowne
e7bc6a85d6 add ios version check / toast message to cam btn 2019-04-18 17:14:34 +00:00
KDSBrowne
1827463928 add toast warning for partially supported ios version 2019-04-13 06:06:50 +00:00
Anton Georgiev
5ff92e62cb address linting for DataLookup 2019-04-11 17:33:53 -04:00
Maxim Khlobystov
ad994439b1 Bring back missing code and fix some linter errors 2019-04-11 16:23:18 -04: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
32067f2f7a Fixes and improvements 2019-04-05 15:10:05 -03:00
Vitor Mateus
7d5e47666c Fix End Meeting errors #7021 2019-03-19 17:06:13 -03:00
Tainan Felipe
7da092f3bd Remove clear credentials that cause new client subscriptions 2019-03-19 15:48:54 -03:00
Joao Siebel
0cc53db366 show audio modal when microphone is locked, and fix a problem with listenOnly connection. close #6574 2019-01-23 14:06:14 -02:00
KDSBrowne
775176d9cf Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-12-12 17:35:22 +00:00
Anton Georgiev
20386334f6
Merge pull request #6295 from BobakOftadeh/micsLocked-check-fix 
Fixed micsLocked check
 2018-12-07 11:36:31 -05:00
Maxim Khlobystov
f548b46672 Improve the client logs appearing on user join/subscription 2018-12-06 12:26:08 -05:00
Bobak Oftadeh
ad5cf5bd62 Fixed micsLocked check 2018-11-23 17:48:23 +00:00
KDSBrowne
e6398ea56f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-11-22 14:46:24 +00:00
Bobak Oftadeh
ce2eb21b57 changed micLocked check 2018-11-21 12:59:30 +00:00
KDSBrowne
86af1e0e9d fix key warning for non resizable panels 2018-11-20 19:18:30 +00:00
KDSBrowne
149b4f091a move render functions from app to panel-manager 2018-11-20 15:28:00 +00:00
KDSBrowne
99e15b20ba add panel manager component 2018-11-19 23:29:48 +00:00
Bobak Oftadeh
51ff9230fa changed meeting query 2018-11-19 20:55:09 +00:00
Bobak Oftadeh
34d525e4c6 Moved api functions to the lock-viewers container 2018-11-16 12:04:21 -08:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
KDSBrowne
38ae789b4a fix userlist poll heading remaining after presenter toggle 2018-10-31 17:28:35 +00:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
Anton Georgiev
a5c2ddc602 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-25 17:58:00 +00:00
KDSBrowne
3f521a6f6a Merge branch 'html5-theming' into test-merge-anton 2018-10-25 16:33:56 +00:00
KDSBrowne
47218ea351 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton 2018-10-25 16:18:31 +00:00
Anton Georgiev
ff837fdd09 drop unnecessary Boolean() wrapper 2018-10-25 15:20:37 +00:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning 
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
 2018-10-23 14:21:58 -02:00
KDSBrowne
c8b993a3a9 remove use of router in polling 2018-10-18 14:31:17 +00:00
Anton Georgiev
0d1b085d54 improved on logic for open private chat 2018-10-15 20:03:17 +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
497db01167 added meteor/session; userList without router 2018-10-05 19:23:16 +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
823629cb30 add log when user fully joined and subscribed to collections 2018-08-14 17:29:03 +00:00
Tainan Felipe
193edcb8fd remove comment 2018-07-19 15:12:04 -03:00
Tainan Felipe
005310d22a Allow guest user join via html5 client 2018-07-19 09:46:44 -03:00
Anton Georgiev
4dbe681a46 disable HTML5 waiting screen for guest approve 2018-07-11 12:46:44 +00:00
Anton Georgiev
827eb7425e Meeting expiration was picked before breakout exp 
resulting in keeping of the client tab open at end-of-meeting page
 2018-06-11 16:05:53 +00:00
KDSBrowne
af6692bc8f add userlistIsOpen / chatIsOpen props to hide sections from SR 2018-04-23 18:53:27 -07:00
Oswaldo Acauan
61c84837a0 Fix user connectionId observer 2018-02-20 14:41:02 -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
bb72cb7b65 Adjusted the pull request to the recent changes 2018-01-15 12:59:09 -08:00
Oleksandr Zhurbenko
f6ed7c3575 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897 2018-01-15 12:33:29 -08: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
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
Oleksandr Zhurbenko
d8533a86b3 Changed the message displayed to the kicked user 
Fixes #4863
 2018-01-03 12:25:13 -08:00
Tainan Felipe
c582f5bf08 add meetingEnded in Base component aand add intl translation 2017-12-14 17:03:34 -02:00
Tainan Felipe
004290183d add screen to when the meeting is closed 2017-12-12 11:08:43 -02:00
Gabriel Carvalho de Campes
144705ce9b change func call to a variable 2017-10-27 11:44:42 -02:00
Gabriel Carvalho de Campes
9bb0248957 fix logout issue on meeting end 2017-10-26 16:45:03 -02:00
Anton Georgiev
f1de51595d Merge pull request #4515 from OZhurbenko/fix-warnings-assign-presenter 
[HTML5] - Fix for the React console warnings
 2017-10-13 14:06:31 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
21dcafb047 Fixed some of the console warning happenning when user is a moderator and he opens user-list/chat 2017-10-11 12:11:04 -07:00
gcampes
189760d393 fix breakout not closing on end 2017-10-06 11:58:21 -03:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
KDSBrowne
cad085a495 add kicked prop 2017-09-25 11:38:36 -07:00
KDSBrowne
9a145c64a8 fix set properties and client kicked condition 2017-09-25 11:32:09 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
2343ef3f1f Add missing merge file 2017-07-17 13:38:18 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -03:00
Oswaldo Acauan
5353a3a80d Add guest policy to html5 2017-07-14 11:18:07 -03:00
JaeeunCho
28b81b32eb changed function to pass two parameters 2017-07-07 08:18:19 -07:00
JaeeunCho
440c675e23 made function for duplicated code 2017-07-05 15:56:13 -07:00
JaeeunCho
1a1fb6dc57 HTML5 - fixed errors when the meeting is ended by apimate 2017-07-05 07:59:18 -07:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -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
JaeeunCho
5ee206e73e HTML5 - fixed order and slide control position 2017-05-17 13:06:07 -07:00
JaeeunCho
4695395508 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-17 13:04:09 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
Matthew Marangoni
99788090ee fixed audio and settings modal reopening when changing locale in settings 2017-05-03 14:39:07 -07:00
Oswaldo Acauan
d434ba6893 Fix the audio-modal 2017-05-01 16:52:57 -03:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Klaus Klein
d4917e975c Review change 2017-04-26 17:07:22 -03:00
Klaus Klein
d32dbb12f5 Fix wrong import 2017-04-25 14:26:14 -03:00
Klauswk
73fb753edb Merge branch 'master' into FixAuthentication 2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6 Fix auth and user kick, HTML5 closes #3844 #3828 2017-04-25 14:04:17 -03:00
Anton Georgiev
9152bfbaf9 move deskshare verto outside of audio/ 2017-04-19 10:59:57 -04:00
Oswaldo Acauan
334026833b Refactor Modal related components 2017-04-18 19:38:26 +00:00
Anton Georgiev
450d2f3435 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-17 11:37:49 -04:00
gcampes
1a15f83690 adds settings service 2017-03-28 15:41:48 -03:00
Anton Georgiev
7a45a8467b add Audio container and use for modal 2017-03-27 16:40:44 -04:00
Anton Georgiev
8bb1386699 moved audio-modal and audio-settings under audio/ 2017-03-24 12:01:35 -04:00
Oleksandr Zhurbenko
0120e3cfe2 Added a missing import 2017-03-23 09:19:02 -07: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
Oswaldo Acauan
22bb1adab2 Refactor of the chat notification for unread messages 2017-03-16 19:57:45 +00:00
Oswaldo Acauan
8d21c435b5 Refactor of the App component 2017-03-16 16:52:43 +00:00
Oswaldo Acauan
528be3979e Fix merge conflicts 2017-03-13 17:19:43 +00:00
Oswaldo Acauan
be7f36e00c Refactor the i18n server code 2017-03-09 19:50:21 +00:00
gcampes
417b2e4500 Fix issues based on PR comments 2017-03-09 11:34:33 -03:00
gcampes
420918abe8 merge conflicts 2017-02-24 17:28:42 -03:00
gcampes
3c02848478 hide moderator settings, implement default settings 2017-02-24 17:19:53 -03:00
JaeeunCho
1ae6738cf0 HTML5 - moved the openChats() to outside of container 2017-01-20 09:50:03 -08:00
JaeeunCho
8312cee1a0 HTML5 - added openChat() in createContainer() 2017-01-17 14:09:32 -08:00
JaeeunCho
5cb5b98562 HTML5 - did lint code 2017-01-16 13:24:21 -08:00
JaeeunCho
5e2fa0fc09 HTML5 - changed componentDidUpdate() and added params 2017-01-16 10:03:02 -08:00
JaeeunCho
81a033c2fd HTML5 - added checking prevProps is undefined 2017-01-16 07:56:21 -08:00
JaeeunCho
cdea93ad80 HTML5 - added playing sound automatically when the user gets new messages 2017-01-13 15:57:29 -08:00
JaeeunCho
8ef2959ee6 HTML5 - changed file because of conflict 2017-01-13 15:04:22 -08:00
Oleksandr Zhurbenko
bb1a8b09b8 Display closed-captions box based on the value from the Session storage 2016-12-22 16:44:31 -08:00
JaeeunCho
e92e75564a HTML5 Client - changed sound for unreadMessages function from nav-bar to app 2016-12-22 15:34:20 -08:00
Gabriel Carvalho de Campes
a262430871 Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
Oswaldo Acauan
942e16951d Remove unused constructor 2016-09-06 19:29:04 +00:00
Oswaldo Acauan
249dd85f92 Move old settings modal to the new component 2016-09-01 13:56:41 +00:00
Matthew Marangoni
43f7369806 Merge remote-tracking branch 'upstream/master' into settings-accessibility 2016-08-25 11:12:40 -07:00
Matthew Marangoni
526923c59e renamed all settings modal files to match conventions 2016-08-24 16:00:38 -07:00
Jaeeun Cho
8eddccc66c HTML5 dropdown for settings menu 2016-08-24 07:17:30 -07:00
Jaeeun Cho
0eca848647 Dropdown with dropdown_v3 branch 2016-08-23 12:18:49 -07:00
Oleksandr Zhurbenko
d9ddbfbda6 Cleanup, linting, fixed css modules' imports 2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
f64ed1fd4a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning 2016-08-20 16:37:11 -07:00
Jaeeun Cho
2b4076493c Merge remote-tracking branch 'upstream/master' into dropdown for settings 2016-08-05 17:29:51 -04:00
Jaeeun Cho
a097afe8a0 add dropdown menu for settings 2016-08-05 17:05:15 -04:00