mohamed-ahmed
|
4d66f0273c
|
fixed some UI changes for freds demo
|
2013-10-03 21:16:42 +00:00 |
|
mohamed-ahmed
|
a3ae04c03d
|
Merge branch 'master' into throwaway-merge
|
2013-10-03 20:36:44 +00:00 |
|
mohamed-ahmed
|
a724ededbf
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
|
2013-10-03 20:36:19 +00:00 |
|
Richard Alam
|
b2305c7fe2
|
Merge pull request #268 from gugat/matterhorn_081
fixes audio extension problem in matterhorn
|
2013-10-03 12:56:54 -07:00 |
|
Gustavo Salazar
|
5dff55fb13
|
remove audio extension in webcam processing for matterhorn
|
2013-10-03 13:50:31 -05:00 |
|
mohamed-ahmed
|
9c0e4ca9dd
|
Merge branch 'master' into throwaway-merge
|
2013-10-03 16:07:28 +00:00 |
|
mohamed-ahmed
|
5ad337ad4c
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
|
2013-10-03 16:07:06 +00:00 |
|
mohamed-ahmed
|
825dcd110a
|
progess on changing layout
|
2013-10-03 16:05:23 +00:00 |
|
Richard Alam
|
60b43f6d36
|
Merge pull request #267 from gugat/locales
update locales
|
2013-10-02 12:12:20 -07:00 |
|
Gustavo Salazar
|
d673e6e484
|
update locales
|
2013-10-02 12:12:40 -07:00 |
|
Fred Dixon
|
6e5b15e1f0
|
Merge pull request #266 from gugat/matterhorn_081
matterhorn scripts work with new version of ffmpeg
|
2013-10-01 16:06:46 -07:00 |
|
Gustavo Salazar
|
ca6e32bc93
|
separate scaling and padding commands for deskshare
|
2013-10-01 17:11:23 -05:00 |
|
Gustavo Salazar
|
cfc6b3385b
|
set sample rate
|
2013-10-01 17:05:55 -05:00 |
|
Gustavo Salazar
|
c5e4820f25
|
don't pass the file extension
|
2013-10-01 17:02:36 -05:00 |
|
Gustavo Salazar
|
5d5d135557
|
set video quality
|
2013-10-01 16:53:39 -05:00 |
|
mohamed-ahmed
|
8207e1a274
|
comment explaining square fix
|
2013-09-30 18:25:20 +00:00 |
|
mohamed-ahmed
|
8213272485
|
fixed drawing reversed square in both flash client and html5 client
|
2013-09-30 18:23:29 +00:00 |
|
mohamed-ahmed
|
3e8a592934
|
can now draw circles in reverse like the bug i fixed in the flash client
|
2013-09-30 16:02:32 +00:00 |
|
Fred Dixon
|
6b7438e9f8
|
Updated wording of welcomeMessageFooter
|
2013-09-27 19:01:59 -04:00 |
|
mohamed-ahmed
|
9cade6bba8
|
fixed drawing circle in flah client
|
2013-09-27 20:04:23 +00:00 |
|
mohamed-ahmed
|
bd34ec292e
|
fixed drawing circle in flah client
|
2013-09-27 20:03:34 +00:00 |
|
mohamed-ahmed
|
f208ca8a2d
|
update cursor to appear the same size even when page is zoomed in
|
2013-09-27 17:09:24 +00:00 |
|
mohamed-ahmed
|
ad86f142d4
|
merged Gary's newUI and fixed conflicts
|
2013-09-27 16:07:38 +00:00 |
|
Fred Dixon
|
91493dc624
|
fixed small bug in bbb-conf --setip for LTI
|
2013-09-26 17:19:47 -04:00 |
|
Fred Dixon
|
a84c6ca8e8
|
Configuration updates for moving to 0.81-RC2
|
2013-09-26 16:42:27 -04:00 |
|
mohamed-ahmed
|
521dd3aa33
|
boarder now appears infront of ever other element (i.e. shapes_
|
2013-09-24 18:27:26 +00:00 |
|
mohamed-ahmed
|
b6dd5eae5e
|
added better styling to landing page
|
2013-09-24 18:05:28 +00:00 |
|
Richard Alam
|
597c64e808
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2013-09-24 15:39:40 +00:00 |
|
Richard Alam
|
aa018fcb21
|
- use default resolution from config.xml when skipping webcam settings check
|
2013-09-24 15:38:52 +00:00 |
|
Gary Deng
|
fb8af3bdf7
|
implement html5 new interface
|
2013-09-24 06:13:09 -07:00 |
|
Fred Dixon
|
0b9cfb591c
|
Merge pull request #263 from gugat/bbbrecord081
update bbb-record utility
|
2013-09-23 17:42:16 -07:00 |
|
Gustavo
|
0390c2c3c4
|
bbb-record update version
|
2013-09-23 23:16:04 +00:00 |
|
Gustavo
|
3e01ab5d29
|
republish only for matterhorn integration
|
2013-09-23 23:15:07 +00:00 |
|
Gustavo
|
6acbc14103
|
separate rebuild and rebuild all
|
2013-09-23 22:36:53 +00:00 |
|
Gustavo
|
d03114846a
|
angle brackets for params
|
2013-09-23 21:51:46 +00:00 |
|
Fred Dixon
|
d9bfdaeb73
|
Merge pull request #262 from gugat/locales08
Update locales
|
2013-09-23 14:47:07 -07:00 |
|
Gustavo
|
d8e1bce801
|
Update locales
|
2013-09-23 20:46:29 +00:00 |
|
mohamed-ahmed
|
8a28dc9df5
|
added comment explaining cursor calculations
|
2013-09-23 20:45:01 +00:00 |
|
mohamed-ahmed
|
3764cc4ae1
|
cursor now moves to correct location
|
2013-09-23 20:43:38 +00:00 |
|
mohamed-ahmed
|
2695586f8c
|
page resize now alsop handles fit to width
|
2013-09-23 20:11:32 +00:00 |
|
Richard Alam
|
b1ae469c8a
|
- skip check for cam setting even when starting sharing manually
|
2013-09-23 19:22:34 +00:00 |
|
mohamed-ahmed
|
ca8dfa7e21
|
fixed zooming to handle fit to width
|
2013-09-23 18:29:16 +00:00 |
|
Richard Alam
|
c1d30dc72b
|
- add config param to skip camera settings check
|
2013-09-23 15:24:07 +00:00 |
|
mohamed-ahmed
|
2a1d2f7525
|
simplified a function
|
2013-09-20 19:15:15 +00:00 |
|
Richard Alam
|
252d7129a7
|
- fix race condition where video share button doesn't show up somtimes when presenterShareOnly=true
|
2013-09-19 17:27:30 +00:00 |
|
mohamed-ahmed
|
f359337e6c
|
fixed page resize
|
2013-09-17 16:54:29 +00:00 |
|
mohamed-ahmed
|
ad297e8079
|
fixed ellipse tool
|
2013-09-17 15:34:17 +00:00 |
|
Richard Alam
|
fc4382d626
|
- fix problem where no one can share when presenterShareOnly is set to TRUE
|
2013-09-16 21:27:47 +00:00 |
|
mohamed-ahmed
|
20c9118b68
|
now the zooming will still be correct when the window is resized
|
2013-09-16 18:36:16 +00:00 |
|
mohamed-ahmed
|
58ab406e12
|
html5 client now handles the zoom event I created
|
2013-09-16 15:45:58 +00:00 |
|