BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,871 Commits 13 Branches 260 Tags 1.1 GiB
33393790b3
Commit Graph

12871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Alam
9f9d08772f Merge pull request #3177 from ritzalam/embed-javacpp-into-webapp 
Make starting of webstart app faster
 2016-06-15 16:21:25 -04:00
Richard Alam
66414eae68 - clean up removing logs and removing javacpp from the build 2016-06-15 20:11:59 +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
Richard Alam
e484aac978 - do not manually search for the native libraries as it causes 
startup time to take longer
 2016-06-15 18:34:34 +00:00
Oleksandr Zhurbenko
9bd1d6f15a Moved check for polling to AddShapeToCollection 
So that it worked for both get_whiteboard_shapes_reply and send_whiteboard_shape_message
 2016-06-15 11:09:05 -07:00
Oleksandr Zhurbenko
0ad772345a Removed unused properties 2016-06-14 13:02:37 -07:00
Oleksandr Zhurbenko
a0bfbe8433 Added Text shape functionality 2016-06-14 13:01:11 -07:00
Anton Georgiev
dddcc064cb Merge pull request #3171 from oswaldoacauan/feature-chat-2 
User List Sorting & Chat Lock
 2016-06-14 12:50:20 -04:00
perroned
1f6e40596f Working on screenshare for chrome/ff 2016-06-14 16:13:49 +00:00
perroned
e9fd499851 Readding verto sharing 2016-06-14 16:11:04 +00:00
Richard Alam
59fca31316 Merge pull request #3175 from antobinary/fix-meetings-querry 
Fix querrying for existing meetings for html5 client
 2016-06-14 10:13:39 -04:00
Anton Georgiev
a8e39edf15 allow reply for zero meetings too 2016-06-14 14:11:43 +00:00
Anton Georgiev
7fb2184c02 fix querry for existing meetings 2016-06-13 21:39:31 +00:00
Richard Alam
a9d90e9a66 Merge pull request #3174 from ritzalam/embed-javacpp-into-webapp 
- cache the jar files
 2016-06-13 15:49:58 -04:00
Richard Alam
e9acf88f9f - cache the jar files 2016-06-13 19:48:24 +00:00
Anton Georgiev
9ac502f13e Merge pull request #3173 from oswaldoacauan/feature-check-endpoint 
Add /check endpoint for HTML5 client
 2016-06-13 14:00:12 -04:00
Oswaldo Acauan
62e2005eef Add /check endpoint for HTML5 client 2016-06-13 14:56:41 -03:00
Richard Alam
7be339229e Merge pull request #3172 from ritzalam/embed-javacpp-into-webapp 
Improve screenshare webstart startup time
 2016-06-13 13:18:18 -04:00
Oswaldo Acauan
6414d6358a Remove debug messages 2016-06-13 14:15:15 -03:00
Richard Alam
441210d954 - include javacpp into main app source so we don't need to load another jar 
which hopefully improves screenshare startup time.
 2016-06-13 17:13:01 +00:00