BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,558 Commits 13 Branches 260 Tags 1.1 GiB
23c0dc56c4
Commit Graph

254 Commits

Author SHA1 Message Date
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
Oswaldo Acauan
6f9c4219ad Fix typo 2016-07-28 19:57:42 +00:00
Oswaldo Acauan
afe1a66e02 Fix conflicts and merge master 2016-07-28 19:50:44 +00:00
Oswaldo Acauan
b8e4a2692c Add handlers for kick 2016-07-28 19:48:26 +00:00
Oleksandr Zhurbenko
fd0247d719 Injected initial component for the closed-captions 2016-07-22 17:12:31 -07:00
Oleksandr Zhurbenko
a3fa660bc5 Removed unused code 2016-07-22 11:47:54 -07:00
Oswaldo Acauan
34fedc8e46 Fix user-list toggle 2016-07-21 14:24:50 +00:00
Oleksandr Zhurbenko
bcfa3d41ec Linting 2016-07-08 16:13:26 -07:00
Gabriel Carvalho de Campes
537d8753fe Merge remote-tracking branch 'origin/master' into router-changes 
* origin/master:
  upgrade sip.js to 0.7.5
  Moved polling files back to components folder
  Fixed a small issue with reduce() in the poll annotation
  Made polling buttons accessible
  Updated packages and fixed some of the warnings introduced by React 15.2.0
  Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
  Centering polling buttons
  Title and calculated styling for the polling UI
  Mark open chat as active
  Remove some old code
  Changes the way user actions are rendered
  Replaced polling under the whiteboard
  Solve issues from github comments
  Remove color-generator because it is not being used
  polish code
  Updates the userlist

Conflicts:
	bigbluebutton-html5/imports/ui/components/app/container.jsx
 2016-07-08 11:59:05 +00:00
Gabriel Carvalho de Campes
e8f1a877c4 Remove logs, and add some removed code back 2016-07-07 14:46:18 +00:00
Gabriel Carvalho de Campes
ac3353d855 Changes Router in order for the livereloading to work again 2016-07-07 14:01:40 +00:00
Oleksandr Zhurbenko
f26ab0ac52 Title and calculated styling for the polling UI 2016-06-30 15:21:46 -07:00
Oleksandr Zhurbenko
83fff53269 Replaced polling under the whiteboard 2016-06-29 15:00:06 -07:00
Oswaldo Acauan
d3d997d211 Rename navbar, media, whiteboard and videodock to the new structure 2016-05-20 10:44:27 -03:00
Oswaldo Acauan
d81cb28f35 Add new component button and some basic styles 2016-05-20 10:37:19 -03:00
perroned
544220f7c0 Updating import paths for new structure 2016-05-13 09:47:24 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00