Markos Calderon
|
52403a6bf9
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into optimize-rap-worker
|
2011-12-13 15:00:21 -08:00 |
|
Markos Calderon
|
f889d23fc0
|
fix for userid mismatch in API
|
2011-12-13 14:44:17 -08:00 |
|
Markos Calderon
|
e84a27c51c
|
added config file for jedispool
|
2011-12-12 15:18:52 -08:00 |
|
Richard Alam
|
240c7df9ad
|
try to maximize deskshare view window by default
|
2011-12-09 21:02:50 +00:00 |
|
Richard Alam
|
192f784df0
|
- make chat window larger and move video dock to bottom left when
display is less that 768 height.
|
2011-12-09 20:28:00 +00:00 |
|
Richard Alam
|
95a6cb398c
|
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
|
2011-12-09 03:17:09 +00:00 |
|
Richard Alam
|
6e44d04c6a
|
fix problem where UI is not set properly when first moderator becomes presenter
|
2011-12-09 03:16:40 +00:00 |
|
Fred Dixon
|
bb8b64aff6
|
removed --version flag from bbb-record
|
2011-12-08 15:10:53 -08:00 |
|
Fred Dixon
|
906954156f
|
Only include files that end in .nginx -- this gets around a bug in the upgrade scripts where the packaging create /etc/bigbluebutton/nginx/slides.nginx:1 and cause nginx to fail to restart
|
2011-12-08 15:10:16 -08:00 |
|
Richard Alam
|
0bbe44e785
|
move assign presenter logic to users/participants. This fixes a race condition where the first moderator
doesn't become presenter by default.
|
2011-12-08 21:43:16 +00:00 |
|
Richard Alam
|
9224107ec2
|
Merge branch 'master' into refactor-chat-client
|
2011-12-07 21:52:17 +00:00 |
|
Markos Calderon
|
77f664c6bd
|
checking dirs instead of done files
|
2011-12-07 13:18:21 -08:00 |
|
Markos Calderon
|
c95a8bc56a
|
adding a checking in rap-worker
|
2011-12-06 12:22:35 -08:00 |
|
Fred Dixon
|
ae73711cd8
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2011-11-30 17:08:40 -08:00 |
|
Fred Dixon
|
4ab6c9e63e
|
Removed the creation of index.html for slides (no longer needed for testing)
|
2011-11-30 17:08:29 -08:00 |
|
Markos Calderon
|
aa2246a639
|
fixed issue 1081
|
2011-11-28 14:35:16 -08:00 |
|
Markos Calderon
|
e5d511239a
|
fixed issue 1074
|
2011-11-22 16:04:08 -08:00 |
|
Markos Calderon
|
8d120abf44
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2011-11-22 14:55:39 -08:00 |
|
Markos Calderon
|
5e03b75150
|
fix for issue 1080
|
2011-11-22 14:54:46 -08:00 |
|
Richard Alam
|
140d9a566c
|
provide way to add window on bottom-3rd-lower-right
|
2011-11-22 13:25:41 -05:00 |
|
Richard Alam
|
aa923319a7
|
Merge branch 'master' into refactor-chat-client
|
2011-11-22 15:36:25 +00:00 |
|
Richard Alam
|
53e14101e2
|
add new layout
|
2011-11-22 04:06:42 +00:00 |
|
Fred Dixon
|
2e604558b8
|
bbb-conf now correctly checks out git-core when setting up development environment
|
2011-11-21 11:09:20 -08:00 |
|
Fred Dixon
|
5000dcc13e
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2011-11-21 09:20:38 -08:00 |
|
Richard Alam
|
337b21342b
|
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
|
2011-11-21 15:25:11 -05:00 |
|
Richard Alam
|
3393fc5b62
|
add new locales
|
2011-11-21 15:24:55 -05:00 |
|
Fred Dixon
|
80ebe82610
|
Added sorting of modification date to demo10.jsp
|
2011-11-21 09:20:31 -08:00 |
|
Markos Calderon
|
ec94029de2
|
added comments for the ChatObject class
|
2011-11-21 09:13:48 -08:00 |
|
gugat
|
381e120c65
|
Use ffmpeg to concatenate videos. Mencoder command hangs with popen.
|
2011-11-21 09:03:41 -08:00 |
|
Markos Calderon
|
5e102ceb1b
|
sending a chatobject class to the server
|
2011-11-21 08:50:45 -08:00 |
|
Fred Dixon
|
af5683857c
|
Fixed incorrect path for demo4.jsp
|
2011-11-20 11:42:40 -08:00 |
|
Fred Dixon
|
a3849c9a52
|
Removed old comments from rap-worker.rb
|
2011-11-20 11:16:11 -08:00 |
|
Fred Dixon
|
b627af54fe
|
Added demo4/jquery.min.js (older version) for demo4.jsp
|
2011-11-20 11:15:07 -08:00 |
|
Fred Dixon
|
a4b541bdd3
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2011-11-20 06:35:15 -08:00 |
|
Fred Dixon
|
fc71c3c0eb
|
Added more checks to bbb-record --watch to monitor the processing of a recording
|
2011-11-20 06:33:55 -08:00 |
|
Richard Alam
|
bfd6316040
|
- stick with scala 2.7.7 for now as we have compile problems with upgrad
|
2011-11-19 19:53:47 +00:00 |
|
Richard Alam
|
9c76d27dc7
|
- up version fs-esl lib
|
2011-11-19 18:45:20 +00:00 |
|
Richard Alam
|
6e6cb5527e
|
- upgrade fs-esl lib
|
2011-11-19 18:44:41 +00:00 |
|
Richard Alam
|
0bb82324c5
|
- lower the timeout as 25sec is too long
|
2011-11-19 18:33:05 +00:00 |
|
Richard Alam
|
6b61b49ea0
|
- remove dependencies on children as we don't build the parent project but build each individually
|
2011-11-19 18:15:08 +00:00 |
|
Richard Alam
|
7ca98289b6
|
- parent build.gradle needs compile instead of providedCompile
|
2011-11-19 17:46:40 +00:00 |
|
Richard Alam
|
97b4a3e38a
|
- change jars that we need to package with red5
|
2011-11-19 17:38:04 +00:00 |
|
Richard Alam
|
3ae59e68fc
|
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into testing-with-red5-trunk
|
2011-11-19 15:33:16 +00:00 |
|
Markos Calderon
|
33dcf0e2b3
|
fixed send private message
|
2011-11-18 17:46:56 -08:00 |
|
Markos Calderon
|
57677bf239
|
fixed problem with pipe, however need some cleanup
|
2011-11-18 16:42:25 -08:00 |
|
Markos Calderon
|
ac6073527c
|
initial changes
|
2011-11-18 12:06:35 -08:00 |
|
Markos Calderon
|
2d6ae1210e
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2011-11-17 10:33:09 -08:00 |
|
Markos Calderon
|
67914cf1f4
|
fixed problem with demo10
|
2011-11-17 10:32:15 -08:00 |
|
Richard Alam
|
4619dee0c4
|
Merge branch 'master' into testing-with-red5-trunk
|
2011-11-16 21:29:20 +00:00 |
|
Richard Alam
|
5ea0e41b2d
|
upgrading to fixed red.jar for rtmpt
|
2011-11-16 21:28:09 +00:00 |
|