BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,175 Commits 13 Branches 260 Tags 1.1 GiB
3fa8c1c7b6
Commit Graph

218 Commits

Author SHA1 Message Date
prlanzarin
37564a0c6f Fixed userName/userId usage in kurento-extension 2018-05-07 17:17:48 +00:00
Anton Georgiev
f973fedf4d commenting out code that breaks client loading 2018-05-03 15:21:46 +00:00
prlanzarin
01f87d2718 Added websocket ping pong to SFU clients 
Also updated SFUs package-lock
 2018-05-03 13:57:03 +00:00
prlanzarin
47120111dd Fixed adapter calls in SFU and added bridge hooks for kurento listen only 2018-04-27 21:37:41 +00:00
prlanzarin
9fe4fecf2c Improved chrome screensharing constraints and fixed SFU exception 2018-04-27 14:37:18 +00:00
prlanzarin
5059ccdce6 Merge remote-tracking branch 'upstream/v2.0.x-release' into screenshare-opt2 2018-04-25 16:57:02 +00:00
prlanzarin
4cb7dcab7c Refactored WebRTC screenshare flow and fixed mcs-core event emission 2018-04-25 16:56:16 +00:00
Tainan Felipe
2e76439395 Change hand to pointer icon 2018-04-18 16:32:13 -03:00
prlanzarin
1f057bb267 Improved Chrome WebRTC screenshare constraints 2018-04-17 15:23:25 +00:00
Oswaldo Acauan
9c2e8472cc Merge branch 'presentation-styles' into webcams-styling 2018-04-13 10:06:11 -03:00
prlanzarin
0429c2032f Removed uneeded audio negotiation from screenshare viewers 2018-04-12 18:25:51 +00:00
Oswaldo Acauan
5918fc4483 Impl new webcam design 2018-04-09 11:39:27 -03:00
Lucas Fialho Zawacki
65a2fb592f Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor 2018-03-20 17:22:11 +00:00
Anton Georgiev
c52ce83ab4 set max height and width for screenshare to 1080 x 1920 2018-03-09 13:35:37 -05:00
Anton Georgiev
8e0f57c941 linting of kurento-extension.js 2018-03-07 16:23:40 -05:00
Anton Georgiev
dad12699a4 handle Chrome extension "stop sharing" event 2018-03-07 16:23:40 -05:00
prlanzarin
ba5f295624 Limited Firefox WebRTC screenshare options to screen only 2018-02-26 18:42:53 +00:00
Lucas Fialho Zawacki
1b3633c8bd More components for video-dock 2018-02-16 19:24:35 +00:00
Anton Georgiev
a8189b3a36
Merge pull request #5141 from oswaldoacauan/videodock-new 
Improvements for PR#5117
 2018-02-13 15:02:04 -05:00
prlanzarin
81afe84079 Limiting screensharing FPS to 5-10 and resolution to screen size 
Also fixes the extension prompt for chrome users in the HTML5 client
 2018-02-08 22:53:18 +00:00
Augusto Bennemann
95c172a8f0 Videodock adjusts for screenshare 2018-02-08 16:32:12 +00:00
Augusto Bennemann
d5cda55220 Improve video adjusting code 2018-02-08 12:52:29 -02:00
Augusto Bennemann
323cdd3232 Fix camera button style and improve videodock code 2018-02-07 17:20:10 -02:00
Augusto Bennemann
541b06393c Video positioning. Code still bad. 2018-02-07 13:11:52 -02:00
Lucas Fialho Zawacki
3af600d015 User video tags with new design [part 1] 2018-02-07 12:56:07 -02:00
Oleksandr Zhurbenko
4eb5d278c3 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4900 2018-01-15 12:22:56 -08:00
Oleksandr Zhurbenko
cf74ca961c Making sure we load all the external libraries before starting the client 
Fixes #4900
 2018-01-15 12:15:58 -08:00
Anton Georgiev
e9093a6c19 Merge branch 'v2.0.x-release' into fix-audio-locale-change 2018-01-09 14:52:49 -05:00
Oleksandr Zhurbenko
b3ceb4d5f6 Updated the html5 client's font to use the latest icons 
Fixes #4715
 2018-01-03 12:35:01 -08:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Anton Georgiev
4765ff80ef Move <audio> to main.html 
Currently it is deep within Base component. So when Base is re-rendered with the updated locale, we lose <audio>. Placing it in main.html, outside Base resolved the problem
 2017-12-13 11:32:36 -05:00
prlanzarin
b7c4115ba3 Moved kurento browser scripts to /client/lib and removed bower packaging from the HTML5 client 2017-11-27 16:22:48 +00: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
prlanzarin
050d4c29bf Moved HTML5 video adjustment to a separate script 2017-11-06 15:42:00 +00:00
Oleksandr Zhurbenko
132953dbc9 Fixed vertical scrolling in Safari and Chrome on mobile devices 
css vh units in mobile Safari & Chrome work as if the URL bar is hidden, even though it's not
 2017-11-04 00:49:52 -07:00
Oswaldo Acauan
e76459be65 Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:11:18 -02:00
Oswaldo Acauan
fda223e81d Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3 2017-10-24 11:01:58 -02:00
Oswaldo Acauan
3bd0d349f8 Add handler to log all uncaught client exceptions 2017-10-24 10:59:23 -02:00
Oswaldo Acauan
1dcfb9e3fa Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications 2017-10-23 13:31:33 -02:00
Augusto Bennemann
ec941bacab Improve video reconnection 2017-10-13 13:50:48 +00:00
Augusto Bennemann
a5e6c63f74 Add support to Safari 11 on Kurento utils; WS message queue; Remove bower components 2017-10-12 20:00:08 +00:00
Oswaldo Acauan
b8261123d0 Add toast notifications 2017-10-12 15:53:33 -03:00
Tainan Felipe
a667e3d05b Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-11 11:46:16 -03:00
Anton Georgiev
6c1526fec2 Merge pull request #4462 from KDSBrowne/xx-06-toggle-element-color-change 
[HTML5] - Change toggle-switch  on/off state colors
 2017-10-11 08:58:57 -03:00
prlanzarin
67da01e81c Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare 2017-10-10 17:10:03 +00:00
Tainan Felipe
5393051d9d fix errors linter 2017-10-10 10:06:34 -03:00
Oswaldo Acauan
29117285ef Merge remote-tracking branch 'upstream/v2.0.x-release' into qa-design 2017-10-06 11:59:07 -03:00
Oswaldo Acauan
37569a5158 Update more icon and rotate it 90deg 2017-10-05 17:21:33 -03:00
KDSBrowne
4ac9f0de9a change toggle-switch colors 2017-10-05 12:21:11 -07:00
Oswaldo Acauan
230a2d5263 Fix silent changes caused by the old pr revert 2017-10-02 11:12:58 -03:00
Anton Georgiev
7372d708ad include bowser.js in html5 client for browser detection in webrtc 2017-09-20 09:59:11 -04:00
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer 
HTML5 ScreenShare Viewer
 2017-09-11 13:40:56 -03:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03: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
Oswaldo Acauan
14f586faad Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:23:12 -03:00
Oleksandr Zhurbenko
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07:00
Oswaldo Acauan
df35a22676 Merge branch 'bbb-2x-mconf' into userlist-2x-design 2017-08-01 14:29:12 -03:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager 
[HTML5] Implemented AudioManager
 2017-07-31 14:29:42 -04:00
JaeeunCho
7fc1fa376f changed 'romm' to 'room' 2017-07-26 11:04:55 -07:00
Matthew Marangoni
4e66ecf0e2 moved BBB import to startup 2017-07-20 08:57:12 -07:00
Matthew Marangoni
01f98fb4be renamed htmlBBB to simply BBB 2017-07-20 07:57:15 -07:00
JaeeunCho
4e382a819e changed @font-face and class 2017-07-19 14:16:35 -07:00
Matthew Marangoni
f521ef0402 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-19 11:55:45 -07:00
JaeeunCho
9a3ba4b34f HTML5 - added new icons 2017-07-19 08:01:58 -07:00
Oswaldo Acauan
d04c392064 Fix body background color 2017-07-18 08:51:29 -03:00
Oleksandr Zhurbenko
23263c997b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-17 16:01:05 -07:00
KDSBrowne
7b25b7470d make shadow color more visible on toggle switch 2017-07-07 09:17:45 -07:00
KDSBrowne
44afafc448 fix color contrast issues 2017-07-07 09:11:22 -07:00
Oleksandr Zhurbenko
017ff470c3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 13:29:35 -07:00
Matthew Marangoni
325f94679c connected getMyUserInfo to BBB api 2017-05-19 13:35:10 -07:00
perroned
66061fa33d Handle lib update/fix errors 2017-05-03 14:13:53 +00:00
Anton Georgiev
492c9f77a0 remove unnecessarily added svgs 2017-04-12 12:49:56 -04:00
Anton Georgiev
573db8dcc3 updated icons to v11, adjusted few icons 2017-04-12 12:12:47 -04:00
Oleksandr Zhurbenko
70f0832829 Corrected the 'rectangle_tool' icons code 2017-04-10 12:53:14 -07:00
Anton Georgiev
54e34e8d5c Merge pull request #3755 from KDSBrowne/accessibility-update-01 
[HTML5] - Accessibility update 01
 2017-04-04 14:39:44 -04:00
Ubuntu
5e0a5f019c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-24 19:14:21 +00:00
KDSBrowne
2d876550db merge with master 2017-03-23 07:16:47 -07:00
Ubuntu
4da7d6d03f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-17 15:55:23 +00:00
KDSBrowne
b5b0383e0b change outer most div role 2017-03-15 07:28:19 -07:00
Oswaldo Acauan
528be3979e Fix merge conflicts 2017-03-13 17:19:43 +00:00
Oswaldo Acauan
090890aacd Move critical css to inline instead o external file 2017-03-13 14:38:32 +00:00
Oswaldo Acauan
2129979112 Fix error screen 2017-03-10 20:47:23 +00:00
Oswaldo Acauan
be7f36e00c Refactor the i18n server code 2017-03-09 19:50:21 +00:00
gcampes
b422ab10e9 Merge conflicts 2017-03-09 11:42:31 -03:00
gcampes
417b2e4500 Fix issues based on PR comments 2017-03-09 11:34:33 -03:00
Oswaldo Acauan
5f495f35a0 Change how we load shared files from flash 2017-03-08 13:49:44 +00:00
Oleksandr Zhurbenko
80666bd688 Updated icons in the html5 client 2017-03-01 17:03:02 -08:00
gcampes
a6947bdd17 removes debug code 2017-03-01 09:32:23 -03:00
perroned
59435c6020 Cleaning 2017-02-27 19:59:54 +00:00
gcampes
420918abe8 merge conflicts 2017-02-24 17:28:42 -03:00
gcampes
3243ff32cf Changes to settings modal 2017-02-15 16:49:40 -02:00
perroned
1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
 2017-02-02 15:27:08 +00:00
gcampes
ce703d3b20 First changes to settings 2017-01-27 13:41:11 -02:00
Anton Georgiev
e7926f5be4 add German to html5 client (from Transifex) 2017-01-23 16:19:53 -05:00
KDSBrowne
08e6a32e2b Show audio modal on client load 2017-01-10 15:14:23 -08:00
Lajellu
b99d0a2407 HTML5 - Emoji - fix merge conflicts 2016-12-21 09:14:46 -08:00
Lajellu
98db4c8eec HTML5 - fixes merge conflicts bw master and this branch 2016-12-20 09:18:24 -08:00
KDSBrowne
73db970152 add suggestions and store settings until logout 2016-12-19 13:45:09 -08:00
KDSBrowne
38b9227f04 improved application settings - incomplete 2016-12-13 19:40:32 -08:00
Oswaldo Acauan
b3c292894f Fix [aria-hidden] elements being hidden 2016-12-07 09:49:15 -02:00