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

396 Commits

Author SHA1 Message Date
Anton Georgiev
194140c056
Merge pull request #6123 from zhu/patch-1 
Fix compatibility in some old browser
 2018-10-25 14:52:52 -04:00
Anton Georgiev
35d92c3e6d improve on callbacks when joining client 2018-10-25 15:51:53 +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
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +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
gustavotrott
4f607d304a Move duplicated parameters to a constant in the beginning 2018-10-11 10:24:12 -03:00
prlanzarin
5dd8a3d3c4 Added onunmute listener to MediaStreamTrack to detect late start tracks 2018-10-09 18:03:40 +00:00
gustavotrott
265275018e Added compatibility with Electron Chromium 2018-10-09 10:43:22 -03:00
Anton Georgiev
497db01167 added meteor/session; userList without router 2018-10-05 19:23:16 +00:00
prlanzarin
2741022cb2 Updated kurento-utils WebRTC calls, added permission request on listen only for safari 
Also fixed a resource leak on listen only fallback and transitioned the SFU listen only from a tag-based approach to MediaStream
 2018-10-03 18:39:55 +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
zhu
39adce2321
Fix compatibility in some old browser 
Trailing comma in function arguments does not allowed until ECMAScript 2017
 2018-09-28 18:30:50 +08:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
prlanzarin
e327625b64 Avoid calling screenshare viewer exit twice and handle any possible exception 2018-09-11 19:40:13 +00: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
Anton Georgiev
49c0e7b9b1
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2 
Better handling of screensharing ice connection state errors.
 2018-09-04 13:14:08 -04:00
Maxim Khlobystov
5825b635ba Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-30 16:07:52 -04:00
prlanzarin
dc767d9bdb Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown 2018-08-30 02:41:02 +00:00
prlanzarin
be6313106b Add retry limiter to playVideo in kurento-utils 2018-08-29 19:39:15 +00:00
prlanzarin
a7bfb985d3 Improvements to Safari/Chrome autoplay policies with placeholder buffer on audiocontext and bogus audio + upstarting audio tag as muted 2018-08-29 19:12:34 +00:00
Tainan Felipe
75967a0aac Add minus icon 2018-08-28 14:14:01 -03:00
Maxim Khlobystov
82a69fb902 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2 2018-08-28 12:49:06 -04:00
Maxim Khlobystov
285d57a766 Listening to the closed ICE connection state for viewer. 2018-08-28 12:40:51 -04:00
Maxim Khlobystov
6f7fdc41a1 Listening for closed state. 2018-08-28 11:40:26 -04:00
prlanzarin
4f99173d38 Using default input stream for SFU listne only 2018-08-28 15:24:06 +00:00
Maxim Khlobystov
fc3e46493e Linting. 2018-08-23 11:49:16 -04:00
Maxim Khlobystov
242200ac91 Replaced Ice with ICE in strings. 2018-08-22 14:51:25 -04:00
Maxim Khlobystov
d67aba6c8a Listening to ice connection failures when screensharing. 2018-08-22 14:10:08 -04:00
Anton Georgiev
c95beba0e2
Merge pull request #5988 from Tainan404/add-minus-icon 
Add minus icon
 2018-08-17 10:15:52 -04:00
Tainan Felipe
b36abace9a Add minus icon 2018-08-17 11:07:22 -03:00
KDSBrowne
155b36f929 add desktop unshare icon 2018-08-07 23:02:11 +00:00
Tainan Felipe
ece61e9918
Merge branch 'master' into compability-to-npm 2018-08-02 17:27:23 -03:00
Tainan Felipe
05d04b63cb remove jquery-json.js 2018-07-31 09:00:27 -03:00
Tainan Felipe
80eeea2ac6 remove bbblogger 2018-07-30 13:57:06 -03:00
Anton Georgiev
53e5a64885
Merge pull request #5928 from lfzawacki/the-new-adventures-of-logger-and-loggy 
Additions to video, listen-only and screenshare logging
 2018-07-30 11:53:33 -04:00
Tainan Felipe
0c2866ccfb move ReconnectingWebSocket to npm packages 2018-07-27 17:42:45 -03:00
prlanzarin
4393d19877 Modified SIP.js to only resolve local description on ICE completion 2018-07-26 18:52:49 +00:00
Lucas Fialho Zawacki
e36c494252 Use newer logging calls for video,audio,screenshare 2018-07-26 15:26:56 -03:00
Lucas Fialho Zawacki
df22f43b11 Add window.Logger to kurento-extension 2018-07-25 19:08:35 -03:00
Lucas Fialho Zawacki
2fc85f75e1 New Logging format for listenonly audio and screenshare 2018-07-25 19:08:24 -03:00
Lucas Fialho Zawacki
b667c53590 Get more detailed logs from the video component 2018-07-25 18:53:12 -03:00
Anton Georgiev
e4edb9f196
Merge pull request #5894 from prlanzarin/sfu-error-handling-3 
SFU error handling part 3
 2018-07-24 13:45:08 -04:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Anton Georgiev
466bcf054a
Merge pull request #5854 from prlanzarin/video-attach-response-fixes 
Trying to fix WebRTC video tag attachment
 2018-07-11 13:41:09 -04:00
prlanzarin
5bf5a126b5 Cleaning ping/pong interval on SFU listen only exit 2018-07-11 16:32:52 +00:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn 
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
 2018-07-10 11:24:37 -04:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Anton Georgiev
bc410c290c
Revert "Prevent screen from moving while drawing" 2018-07-05 16:05:02 -04:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
Oswaldo Acauan
3e2008be3e Prevent screen from moving while drawing. Closes #5672 2018-07-04 17:11:04 -03:00
Anton Georgiev
cd6417aa33
Merge pull request #5779 from oswaldoacauan/whiteboard-fixes 
Whiteboard fixes and improvements
 2018-07-03 11:33:35 -04:00
prlanzarin
d4858b6e70 Fixed userId/userName sending to SFU audio component 
Also did some refactoring to kurento-extension parameters
 2018-06-28 18:50:56 +00:00
Oswaldo Acauan
3b29f50765 Change viewport to prevent zooming. Related #5672 2018-06-28 11:28:28 -03:00
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Tainan Felipe
aaebcd8f10 add filled star in feedback rating 2018-06-12 16:53:17 -03:00
Anton Georgiev
21dcb0eaeb html5 client title - same format as Flash client 2018-06-07 15:18:11 +00:00
Anton Georgiev
1b755bfb24 make window title configurable 2018-06-01 18:31:41 +00:00
Augusto Bennemann
77a25940e0
Comment out screenshare code for Safari 2018-05-23 13:04:03 -03:00
Augusto Bennemann
68c18ff70f Display a toast for screensharing not supported by Safari 2018-05-22 14:17:35 -03:00
Anton Georgiev
b6b93d8903
Merge pull request #5497 from musickiper/absPathToRelPath 
Change abs paths to use baseName config
 2018-05-16 08:51:05 -04:00
James Jung
5fe5d2ee3f Change fonts' abs paths to use baseName config(3) 2018-05-11 13:58:48 -04:00
prlanzarin
060e8abf32 Fixed screenshare resolution limit 2018-05-09 23:38:20 +00:00
James Jung
e66fd17fd7 Change fonts' abs paths to use baseName config(2) 2018-05-09 17:01:21 -04:00
James Jung
e192ea1e42 Change fonts' abs paths to use baseName config 2018-05-09 16:59:17 -04:00
prlanzarin
9d26a83514 Removed application support for chrome screensharing 
Also reverted the track resolution to the screen res. The WebRTC getSettings is buggy for chrome <= 65
 2018-05-09 16:39:59 +00:00
prlanzarin
1a16e5a0b1 Fixed screenshare resolutions to preserve aspect ratio 2018-05-09 14:21:03 +00:00
James Jung
26271b0f0e Delete styles.scss file which stored images' links for the whiteboard cursor and put the links for the whiteboard cursor inside components 2018-05-08 18:06:31 -04:00
James Jung
583725053c Change some files permission from 755 to 644 2018-05-08 16:05:04 -04:00
James Jung
ae9d92ea16 Update absolute paths to use baseName config 2018-05-07 19:15:50 -04:00
prlanzarin
5375eb2836 Removed uneeded dispose func and updated flash kurento-extension with listen only hooks 2018-05-07 17:44:18 +00:00
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
Anton Georgiev
7d982caf99 Merge pull request #3490 from oswaldoacauan/fix-hidden-styles 
[HTML5] Fix style for hidden/aria-hidden attributes
 2016-12-06 14:06:56 -05:00
Oswaldo Acauan
4e4023373a Add missing aliases to some emoji icons 2016-12-06 14:39:16 -02:00
Oswaldo Acauan
00125b7b6a Add important to the hidden rule 2016-12-06 00:28:29 -02:00
Oswaldo Acauan
875e96a232 Update BBB icon font to the release v7 2016-12-05 18:27:54 -02:00
Oswaldo Acauan
eb44442808 Add missing end parentesis 2016-12-05 16:12:38 -02:00
gcampes
d9f8cf3cf4 Fix style for hidden/aria-hidden attributes 2016-12-05 16:03:19 -02:00
perroned
0a12d2f6ce Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/startup/server/EventQueue.js
 2016-12-01 19:19:58 +00:00
Gabriel Carvalho de Campes
a262430871 Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
Anton Georgiev
3ca807150f Merge pull request #3409 from KDSBrowne/Localization-update 
fixed console log error
 2016-10-13 17:10:47 -04:00
KDSBrowne
b217a87e9d fixed console log error 2016-10-13 11:19:53 -07:00
Anton Georgiev
11f0c2da03 Merge pull request #3401 from KDSBrowne/Localization-update 
Localization update #1
 2016-10-13 10:44:13 -04:00
KDSBrowne
6a580e9e0c Replaced Ajax with fetch() 2016-10-12 18:16:34 -07:00
KDSBrowne
993dc70525 Cleaned up code 2016-10-12 10:03:10 -07:00
KDSBrowne
7e718d0a75 changed functions to start with lowercase 2016-10-07 10:12:18 -07:00
KDSBrowne
720c16f3ac Moved over the previous solution to the server side and cleaned up the code 2016-10-07 09:36:27 -07:00
Lajellu
63c9f94b54 HTML5 - changes status names, and user list sorting logic to match flash client 2016-10-06 13:42:37 -07:00
KDSBrowne
b811f01ad1 Fixed lint issues 2016-10-03 08:10:20 -07:00
KDSBrowne
d2cc6e1b18 Localization update 2016-10-02 08:46:15 -07:00
perroned
7ca23e44cc Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-html5/imports/startup/server/EventQueue.js
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
 2016-09-14 19:30:07 +00:00
perroned
820ee786f0 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-22 09:21:54 -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
perroned
63953b1384 Hooking up viewing from html5 2016-08-19 14:07:47 +00:00