jfederico
573831ec30
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-web_fix-maxParticipants-by-tracking-joins-II
2016-06-29 13:40:54 -07:00
Gabriel Carvalho de Campes
50e5bdf62f
Solve issues from github comments
2016-06-29 14:24:27 +00:00
Gabriel Carvalho de Campes
76e98d2ae5
Remove color-generator because it is not being used
2016-06-29 14:09:23 +00:00
Anton Georgiev
be73090ee9
Merge pull request #3178 from JaeeunCho/logOut
...
fixes HTML5 client logout
2016-06-29 09:08:22 -04:00
Gabriel Carvalho de Campes
445849217b
Merge remote-tracking branch 'upstream/master' into userlist-update
...
* upstream/master:
Changed 'let' to 'const' where it was possible and adjusted imports
Fixed a bug with Polls deletion from all meetings
Fixed all the 120+ linter warnings
Fixed a bug with the deletion of the Poll
Conflicts:
bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
2016-06-28 19:55:31 +00:00
Gabriel Carvalho de Campes
a4d0f691dd
polish code
2016-06-28 19:52:03 +00:00
Jaeeun Cho
9eacf32497
fixes html5 clinet logout and nav-bar
2016-06-28 15:30:43 -04:00
Jaeeun Cho
eded89d5f0
fixes html5 clinet logout and nav-bar
2016-06-28 14:50:44 -04:00
perroned
b505f460dc
Begins adding webrtc deskshare to screenshare
2016-06-28 17:15:36 +00:00
Oswaldo Acauan
a70ec42c6e
Fix styles for big messages
2016-06-28 16:18:37 +00:00
Anton Georgiev
0d8d404886
Merge pull request #3189 from OZhurbenko/meteor-react
...
Linting and a fix for clearPollCollection method
2016-06-28 09:29:17 -04:00
Gabriel Carvalho de Campes
6e88731ebc
Updates the userlist
2016-06-28 13:10:20 +00:00
Oleksandr Zhurbenko
390935e304
Changed 'let' to 'const' where it was possible and adjusted imports
2016-06-27 14:48:46 -07:00
Oswaldo Acauan
d2e8d3d954
Improve auto-scroll behaviour
2016-06-27 19:00:10 +00:00
Oleksandr Zhurbenko
3d0132685f
Fixed a bug with Polls deletion from all meetings
...
Which happened when we published a poll, cleared a collection, and then received a poll_stopped_message
2016-06-27 11:30:37 -07:00
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Oleksandr Zhurbenko
40cedc28bc
Fixed a bug with the deletion of the Poll
...
It was always undefined here
2016-06-27 09:31:15 -07:00
Anton Georgiev
1181ad1d4a
Merge pull request #3184 from OZhurbenko/meteor-react
...
Whiteboard functionality
2016-06-27 11:34:36 -04:00
jfederico
da32546095
Restored changes for making maxPartiipants filter and html responses work on join requests
2016-06-27 11:22:10 -04:00
Oleksandr Zhurbenko
2b4aced77d
Fixed naming according to the BBB's style guide
2016-06-27 07:48:17 -07:00
Fred Dixon
88ad0fb09b
Merge pull request #3186 from bigbluebutton/ffdixon-patch-1
...
Update bbb-0.9-beta-recording-update
2016-06-26 08:52:32 -07:00
Fred Dixon
4628fd3a7a
Update bbb-0.9-beta-recording-update
2016-06-26 11:52:09 -04:00
Jaeeun Cho
3d36d3fed2
fixes html5 clinet logout and nav-bar
2016-06-24 19:09:32 -04:00
Oleksandr Zhurbenko
29e8524de0
Polishing
2016-06-24 14:30:37 -07:00
Jaeeun Cho
991034b5bf
Merge remote-tracking branch 'upstream/master' into logOut
2016-06-24 10:48:52 -04:00
Jaeeun Cho
3325ac4974
fixes html5 clinet logout and nav-bar
2016-06-24 10:48:09 -04:00
Oleksandr Zhurbenko
1e694b2a01
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
2016-06-23 13:55:40 -07:00
Oleksandr Zhurbenko
6920d8b2a6
Added a check for unknown shape types
2016-06-22 15:58:28 -07:00
Oleksandr Zhurbenko
22ab079f5c
Optimized polling strings and centered the strings
2016-06-22 15:20:08 -07:00
Oleksandr Zhurbenko
04e2e940c0
Fixed a but with inherited margin in Firefox
2016-06-22 15:17:31 -07:00
Oleksandr Zhurbenko
bca7b8c005
Added Polling shape functionality
2016-06-21 16:19:39 -07:00
perroned
c1e0605852
Simplfy watch video initiation
2016-06-21 17:38:28 +00:00
Anton Georgiev
2464911c1a
Merge pull request #3183 from antobinary/audio
...
[HTML5] change audio to default to SIP and fix import glitch
2016-06-21 11:57:50 -04:00
Anton Georgiev
4195905c2b
change audio to default to SIP
2016-06-21 15:34:10 +00:00
perroned
8877c30aa0
Clean up
2016-06-20 19:39:20 +00:00
Richard Alam
c283f87c03
Merge pull request #3182 from ritzalam/debug-screenshare-record-event
...
- forgot to add jedis jar intobuild which results in wrting recordin…
2016-06-20 14:24:30 -04:00
Richard Alam
5163d2519c
- forgot to add jedis jar intobuild which results in wrting recording event to redis failing.
2016-06-20 18:23:10 +00:00
perroned
0ab36e8ec3
Cleaning up
2016-06-20 15:59:48 +00:00
perroned
570b41ab81
Use one verto handle
2016-06-20 15:05:39 +00:00
Richard Alam
a9404040e6
Merge pull request #3181 from antobinary/screenshare-with-cursor-capture3
...
fix timestamps for recording purposes
2016-06-20 10:27:07 -04:00
Jaeeun Cho
73c9898698
fixes html5 clinet logout and nav-bar
2016-06-17 18:15:11 -04:00
perroned
13ffa169c2
Cleaning up
2016-06-17 20:36:45 +00:00
perroned
6a48605773
Verto manager screen share
2016-06-17 17:50:04 +00:00
perroned
86035fce39
Adds verto manager window functions
2016-06-17 17:47:24 +00:00
Anton Georgiev
6fc0f6ead0
Merge pull request #3180 from oswaldoacauan/fix-html5-btn
...
[HTML5] Fix renderCircle and add hideLabel prop to button component
2016-06-17 13:11:27 -04:00
Oswaldo Acauan
406c55f1c2
Fix renderCircle and add hideLabel prop
2016-06-17 16:42:17 +00:00
perroned
7ae2da4e9d
Grabs screen params from chrome/ff
2016-06-17 15:43:03 +00:00
Richard Alam
f1b372fb5c
Merge pull request #3179 from ritzalam/embed-javacpp-into-webapp
...
- remove MANIFEST from ffmpeg.jar as it declares dependencies to all…
2016-06-16 13:27:32 -04:00
Richard Alam
977b3dc046
- remove MANIFEST from ffmpeg.jar as it declares dependencies to all platform's native libs.
...
This triggers downloading of mac, linux jars even if you are running on windows.
2016-06-16 17:25:16 +00:00
Oleksandr Zhurbenko
0d1ad108f0
Fixed polling for the HTML5 viewers
2016-06-15 14:04:25 -07:00
