Commit Graph

74 Commits

Author SHA1 Message Date
Anton Georgiev
e9093a6c19 Merge branch 'v2.0.x-release' into fix-audio-locale-change 2018-01-09 14:52:49 -05: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
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
prlanzarin
67da01e81c Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare 2017-10-10 17:10:03 +00: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
Oswaldo Acauan
d04c392064 Fix body background color 2017-07-18 08:51:29 -03:00
perroned
66061fa33d Handle lib update/fix errors 2017-05-03 14:13:53 +00:00
KDSBrowne
2d876550db merge with master 2017-03-23 07:16:47 -07:00
KDSBrowne
b5b0383e0b change outer most div role 2017-03-15 07:28:19 -07:00
Oswaldo Acauan
090890aacd Move critical css to inline instead o external file 2017-03-13 14:38:32 +00:00
Oswaldo Acauan
5f495f35a0 Change how we load shared files from flash 2017-03-08 13:49:44 +00:00
Oleksandr Zhurbenko
8c37e10ee0 Set a viewport 2016-07-11 12:10:30 -07:00
Oswaldo Acauan
7d31eb43f9 Switch from ion-router to react-router 2016-04-28 15:57:14 -04:00
Oleksandr Zhurbenko
8a97afb89e Removed code and files which are not used anymore 2016-04-22 15:09:46 -07:00
Oleksandr Zhurbenko
92d262a104 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
Conflicts:
	bigbluebutton-html5/.meteor/packages
	bigbluebutton-html5/app/.meteor/versions
	bigbluebutton-html5/app/client/main.js
	bigbluebutton-html5/app/client/main.jsx
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/main.jsx
	bigbluebutton-html5/client/views/chat/chat_bar.html
	bigbluebutton-html5/client/views/chat/chat_bar.js
	bigbluebutton-html5/client/views/whiteboard/slide.js
	bigbluebutton-html5/client/views/whiteboard/whiteboard.js
	bigbluebutton-html5/server/collection_methods/shapes.js
	bigbluebutton-html5/server/redispubsub.js
	bigbluebutton-html5/server/server.js
2016-04-20 16:09:47 -07:00
Maxim Khlobystov
1c311fb9cf Combined two npm configuration files together and put it into the root directory of HTML5 client (required by Meteor to recognize the location of packages installed). 2016-04-06 10:05:52 -03:00