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
Richard Alam
dcd226dc9f
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2016-08-09 14:26:40 +00:00
Lajellu
219078f49d
adds slide controls and new bbb icons
2016-08-02 15:55:20 -07:00
Oleksandr Zhurbenko
d510907179
Upgraded Meteor to 1.4
2016-07-27 14:50:35 -07:00
Lajellu
bd46e8c2ff
adds new icons
2016-07-26 14:28:58 -07:00
perroned
2a23778ea9
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
2016-07-22 19:20:00 +00:00
Oleksandr Zhurbenko
8c37e10ee0
Set a viewport
2016-07-11 12:10:30 -07:00
perroned
0ab36e8ec3
Cleaning up
2016-06-20 15:59:48 +00:00
perroned
86035fce39
Adds verto manager window functions
2016-06-17 17:47:24 +00:00
perroned
a95ed82293
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
2016-06-15 20:07:42 +00:00
perroned
c2702522ca
Upgrades html5 client for new verto code
2016-06-08 20:09:43 +00:00
Oswaldo Acauan
c7225d9738
Add i18n to chat form
2016-06-02 17:32:42 -03:00
Oswaldo Acauan
378c94ce7b
Resolve merge conflicts
2016-06-01 13:45:01 -03:00
Oswaldo Acauan
1d8a36564d
Add base components and style for Chat
2016-06-01 13:33:19 -03:00
gcampes
ce32ae5b20
Merge branch 'html5-new-userlist' into html-userlist
2016-05-31 08:37:14 -03:00
perroned
c8fdf66099
Lints
2016-05-27 16:34:03 +00:00
perroned
393b49fdbe
Cleans up duplicate code
2016-05-27 16:17:16 +00:00
perroned
8fc4c98090
Fixes race condition while loading verto libs
2016-05-26 20:46:11 +00:00
perroned
53fdb67652
Loads jquery json lib
2016-05-26 19:58:30 +00:00
perroned
c1adc40315
Fix library loading callback
2016-05-26 19:57:44 +00:00
perroned
d57fc2ed44
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
2016-05-24 14:02:25 +00:00
Oswaldo Acauan
a69d7faab9
Add iconRight option to Button component
2016-05-20 11:49:28 -03:00
Oswaldo Acauan
d81cb28f35
Add new component button and some basic styles
2016-05-20 10:37:19 -03:00
perroned
2d0ea2a15d
Load verto libs
2016-05-19 20:18:05 +00:00
gcampes
18e4f98f1d
Adds html5 new userlist, WIP
2016-05-19 15:22:56 -03:00
perroned
dc3dd43f1a
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/polls/polls.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-12 13:58:06 -05:00
Anton Georgiev
783f150442
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging
...
Conflicts:
bigbluebutton-html5/imports/startup/client/routes.js
2016-05-12 18:08:44 +00:00
perroned
3971bdb548
Lints
2016-05-12 11:10:43 -05:00
perroned
38d2bff789
Loads sip li. Adds audio tag
2016-05-11 15:43:07 -05:00
Anton Georgiev
1c50be53a3
fix fonts path
2016-05-11 18:30:24 +00:00
perroned
587627562c
Fixes some api structure
2016-05-10 10:23:22 -05:00
perroned
4a7938e1c0
Adds settings and styling
2016-05-06 12:46:14 -05:00
Maxim Khlobystov
67bb61c975
Code style cleanup.
2016-05-05 18:30:57 -04:00
Oswaldo Acauan
ddd38c57ac
Add i18n, modular layouts and basic styles
2016-05-03 17:40:46 -03:00
Oswaldo Acauan
01860a8804
Add basic styles for new design
2016-05-02 19:42:54 -03:00
Oswaldo Acauan
7d31eb43f9
Switch from ion-router to react-router
2016-04-28 15:57:14 -04:00
Oleksandr Zhurbenko
b52738be8e
Ran linter and autofixed most of the warnings in the new React code
2016-04-22 16:19:17 -07:00
Oleksandr Zhurbenko
8a97afb89e
Removed code and files which are not used anymore
2016-04-22 15:09:46 -07:00
Oleksandr Zhurbenko
046c9d376b
Partially adopted Meteor's recommended file structure
2016-04-22 14:19:20 -07:00
Oleksandr Zhurbenko
5b5f06d714
Upgraded Meteor to 1.3.2.4
2016-04-21 14:30:54 -07:00
Oleksandr Zhurbenko
6cd0de19f9
Added necessary imports and temporary styling to make it all work after the merge
2016-04-21 12:21:01 -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
gcampes
a39a2cfac1
Fix user-list fade-in animation on mobile
2016-04-06 10:09:10 -03:00
gcampes
0777bc7cb6
Fix an issue with the emoji status resulted from the last merge
2016-04-06 10:09:04 -03:00
gcampes
126b28d432
Adds emoji status icons to the react user list component
2016-04-06 10:08:52 -03:00
Maxim Khlobystov
76aa113dda
Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide.
...
Conflicts:
bigbluebutton-html5/client/globals.js
bigbluebutton-html5/client/views/whiteboard/whiteboard.js
bigbluebutton-html5/server/collection_methods/users.js
bigbluebutton-html5/server/server.js
2016-04-06 10:08:08 -03: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
