Richard Alam
|
414d3568f6
|
- see if we can callback from flash to javascript
|
2012-08-24 15:06:18 +00:00 |
|
Richard Alam
|
51e7b4a114
|
- remove typo
|
2012-08-24 14:45:54 +00:00 |
|
Richard Alam
|
8012c8f48f
|
Merge branch 'master' into embedding-the-client
|
2012-08-24 14:09:32 +00:00 |
|
Richard Alam
|
809e16cc61
|
- fix tooltip
|
2012-08-23 22:00:20 +00:00 |
|
Richard Alam
|
ebf89cb65f
|
Merge branch 'use-generated-userid' into merge-master-with-use-generated-userid
|
2012-08-23 21:31:30 +00:00 |
|
Richard Alam
|
62b92a825c
|
- fix font size for late joiner
|
2012-08-23 21:29:54 +00:00 |
|
Richard Alam
|
17734c404b
|
- size the fonts properly...but problem with late joiner still
|
2012-08-23 21:12:46 +00:00 |
|
Richard Alam
|
aba57f70bd
|
- fix assigning of presenter
|
2012-08-23 19:56:57 +00:00 |
|
Richard Alam
|
d9e5c80c6c
|
- try generating userid instead of using red5 connection id as userid
|
2012-08-23 19:49:31 +00:00 |
|
Richard Alam
|
5895bbc8c6
|
- try to fix font size for late joiner
|
2012-08-23 17:40:39 +00:00 |
|
Richard Alam
|
13261976f9
|
- fix ClassCastException once more
|
2012-08-23 15:58:50 +00:00 |
|
Richard Alam
|
6f7ba912e6
|
- cleanup
|
2012-08-23 13:33:39 +00:00 |
|
Richard Alam
|
da8d48b909
|
- prototype js to as3 hook
|
2012-08-22 21:28:03 +00:00 |
|
Richard Alam
|
c90ae01f09
|
- take layout.xml from resources dir
|
2012-08-22 21:27:27 +00:00 |
|
tdj-br
|
138fe678fa
|
Merge pull request #58 from iMDT/master
Added a configurable timeout to detection of RTMP/RTMPT.
|
2012-08-22 03:20:22 -07:00 |
|
tdj-br
|
3a0552a2b6
|
Changed the template of config file.
|
2012-08-22 10:18:40 +00:00 |
|
imdt
|
472a6f325e
|
Created timeout on RTMP/RTMPT tests.
|
2012-08-22 10:04:48 +00:00 |
|
Fred Dixon
|
9fa7cf3da6
|
Added bbb-record --clean to clean out process and publish log files for recordings
|
2012-08-21 21:05:22 -04:00 |
|
Fred Dixon
|
bcafbc6d48
|
Filter our ffmpeg output to stderror when looking for errors in /var/log/bigbluebutton/presentation/* and /var/log/bigbluebutton/slides/*
|
2012-08-21 20:51:24 -04:00 |
|
Fred Dixon
|
83006b0426
|
removed 'set -e' that was preventing bbb-record --debug from processing more log files
|
2012-08-21 20:43:31 -04:00 |
|
Fred Dixon
|
fe78f961bc
|
Fixed error that was not searching /var/log/bigbluebutton/prentation log files for errors when doing bbb-record --debug
|
2012-08-21 20:13:50 -04:00 |
|
Fred Dixon
|
b2767aaf68
|
Output settings in red5 video for capture video (true/false)
|
2012-08-21 19:17:14 -04:00 |
|
Fred Dixon
|
3c70cf500b
|
Fixed syntax error for path to presenttion folder
|
2012-08-21 19:08:48 -04:00 |
|
Fred Dixon
|
bd16b27667
|
Removed execute permissions from slides.yml
|
2012-08-21 19:04:29 -04:00 |
|
Markos Calderon
|
0c9e45682e
|
added failed status
|
2012-08-21 16:55:41 -05:00 |
|
Richard Alam
|
67f316b525
|
- cleanup
|
2012-08-21 20:46:23 +00:00 |
|
Richard Alam
|
888e3d9a2f
|
- cleanup
|
2012-08-21 20:07:17 +00:00 |
|
Richard Alam
|
9749a80026
|
- fix annotation history when user joins late
|
2012-08-21 19:42:53 +00:00 |
|
Richard Alam
|
44b2e55d52
|
- try and fix synching of annotations for late joiners
|
2012-08-21 16:00:41 +00:00 |
|
Markos Calderon
|
d75ca5dca4
|
finish testing of sanity check
|
2012-08-20 18:12:58 -05:00 |
|
Richard Alam
|
ace0e438f9
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-08-20 20:25:31 +00:00 |
|
Richard Alam
|
0dacb217b0
|
- fix exception popup on Flash debug
|
2012-08-20 20:25:06 +00:00 |
|
Fred Dixon
|
fef6d0e2b1
|
Remove reference to Melomel
|
2012-08-20 16:16:48 -04:00 |
|
Richard Alam
|
edf56cacb3
|
- minimize logging
|
2012-08-20 15:54:37 +00:00 |
|
Richard Alam
|
d248cb0f8c
|
- fix some exception popups when running flash debugger
|
2012-08-20 15:19:19 +00:00 |
|
Richard Alam
|
cdb81be8d9
|
- try another way to fix Integer to Double class cast exception
|
2012-08-20 14:43:48 +00:00 |
|
Richard Alam
|
c07eeea844
|
- use SVC2 codec for deskshare...
|
2012-08-20 14:32:19 +00:00 |
|
Fred Dixon
|
ee29a96b6a
|
changed logging for publish/preentation.rb to /var/log/bigbluebutton/presenetation/publish-*
|
2012-08-19 17:20:15 -04:00 |
|
Fred Dixon
|
f2f75067ec
|
Changed logging for presentation.rb to /var/log/bigbluebutton/presentation/
|
2012-08-19 17:17:11 -04:00 |
|
Fred Dixon
|
263e20e8b3
|
Made bbb-record executable
|
2012-08-18 20:39:09 -04:00 |
|
Fred Dixon
|
fb58d0c7cc
|
Updated bbb-conf for 0.81-dev
|
2012-08-18 18:33:37 -04:00 |
|
Richard Alam
|
e04da4042a
|
Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare
Conflicts:
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.jar
deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/NetworkHttpStreamSender.java
|
2012-08-17 19:21:34 +00:00 |
|
Richard Alam
|
b2b3ac89be
|
- update deskshare applet wiht improvements from XOP
|
2012-08-17 17:48:35 +00:00 |
|
Richard Alam
|
6fb5c323b9
|
Merge remote branch 'xopnet/improve-deskshare-in-tunneling' into xop-improve-deskshare
|
2012-08-17 17:34:21 +00:00 |
|
Richard Alam
|
2563966a7d
|
- cleanup
|
2012-08-17 15:41:27 +00:00 |
|
Richard Alam
|
f182abf812
|
- record text annotations properly
|
2012-08-17 15:40:01 +00:00 |
|
Richard Alam
|
0be1db0cc9
|
- fix merge edit problem
|
2012-08-17 14:42:30 +00:00 |
|
Richard Alam
|
40dbd9bab5
|
- fix NPE when querying for annotations history
|
2012-08-17 14:41:42 +00:00 |
|
Richard Alam
|
33fcacb00b
|
- remove Ctrl-Z duplicate for whiteboard undo
- add presentation control key binding
|
2012-08-16 19:21:53 +00:00 |
|
Richard Alam
|
a61dba143f
|
Merge remote branch 'chad/master' into making-bbb-accessible
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
|
2012-08-16 15:34:07 +00:00 |
|