Richard Alam
3482190b18
- minor cleanup
2012-08-10 15:53:40 +00:00
Fred Dixon
2bb5ef9d45
Merge pull request #56 from Vikrant1/patch-1
...
Update labs/bbb-api-php/includes/bbb-api.php
2012-08-08 14:06:06 -07:00
Vikrant1
c84d809ec4
Update labs/bbb-api-php/includes/bbb-api.php
...
Fixed function getCreateMeetingUrl() so that the duration parameter is passed properly when creating meeting. Minor change was required to the file:
Line 137 was changed to end with ";" instead of "."
2012-08-08 22:56:10 +02:00
Chad Pilkey
4c13535607
starting to make playback accessible
2012-08-03 20:10:54 +00:00
jtrobinson
ce164b48f3
fixeFixed timing of audio alerts.
2012-08-03 20:21:49 +00:00
Richard Alam
0f6c6e8e4d
- add background and remove intial text
2012-08-03 19:36:17 +00:00
Richard Alam
bbbe924b22
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-08-03 19:35:21 +00:00
Richard Alam
e95e4c72f0
- figure out why we dispatch a text created event when mouse moves out of canvas
2012-08-03 19:04:15 +00:00
jtrobinson
23068d4ec7
Merge branch 'master' of github.com:capilkey/bigbluebutton
2012-08-03 17:53:14 +00:00
jtrobinson
d12e176c42
Audio notifications for public and private chat messages; timing is still off
2012-08-03 17:53:02 +00:00
Gustavo Salazar
e523dbf9e6
Merge pull request #55 from mconf/video-playback-into-master
...
Video playback
2012-08-03 09:08:25 -07:00
Tiago Daniel Jacobs
6a8e5cf5f8
Initial commit of applet-jni test.
2012-08-03 07:22:16 -03:00
Markos Calderon
9b4a1b4815
Merge pull request #54 from bigbluebutton/fix-chat-url
...
Fix for event urls and support for https
2012-08-02 13:16:00 -07:00
Markos Calderon
2e8715988b
Fix for event urls and support for https
2012-08-01 18:55:50 -05:00
Gustavo Salazar
75e9b45db5
Set type to variable "filter"
2012-08-01 17:00:29 -05:00
Felipe Cecagno
e8dc780c37
integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success
2012-08-01 17:40:58 -03:00
Markos Calderon
309536977b
Merge pull request #51 from bigbluebutton/record-username
...
Added username for record in participants module
2012-07-31 15:37:00 -07:00
Markos Calderon
234078b09e
Added username for record in participants module
2012-07-31 15:34:56 -07:00
Chad Pilkey
ad9f9ef560
added simplified chat-timeline popcorn plugin
2012-07-31 21:15:14 +00:00
Richard Alam
306df55caa
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-07-31 20:03:53 +00:00
Richard Alam
c01b111c3c
- try to fix textbox resizing
2012-07-31 20:03:16 +00:00
Richard Alam
69c765cb6d
- try crating textbox for whiteborad
2012-07-31 19:42:19 +00:00
jtrobinson
ee0baad670
Hotkeys added for focusing to chat tabs, and for moving backward and forward through tabs
2012-07-31 18:55:59 +00:00
Fred Dixon
75264f4ca8
Reverted demo1.jsp back to original logic -- all users join as moderators
2012-07-31 14:05:34 -04:00
Richard Alam
c97f806154
- comment out some logs to test if we loose some lines when drawing rapidly
2012-07-31 17:19:51 +00:00
Richard Alam
3609d409df
- query for annotations when loading new page
2012-07-31 17:09:20 +00:00
Richard Alam
8d931eb94a
- setup toolbar properly when switching presenter
2012-07-31 15:49:10 +00:00
Richard Alam
405327d38d
Merge branch 'modify-wb-toolbar'
2012-07-31 15:02:10 +00:00
Richard Alam
3fb8c458e1
- fix buttons
2012-07-31 15:00:06 +00:00
Richard Alam
0f591f9d34
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-07-30 22:00:00 +00:00
Gustavo Salazar
b1c94c9262
Merge pull request #53 from gugat/fp11
...
Fp11
2012-08-01 14:13:26 -07:00
Gustavo Salazar
95d1a19e1e
Download playerglobal 11.2
2012-08-01 15:51:50 -05:00
Gustavo Salazar
6c3f430e88
Ask if h264 enabled.
2012-08-01 14:32:42 -05:00
Fred Dixon
f42a71742b
Merge pull request #52 from jfederico/master
...
Removed hardcoded url on demo_openid.jsp
2012-08-01 12:22:02 -07:00
jfederico
55621fc9b3
Removed the hardcoded url on demo_openid.jsp
2012-08-01 13:48:21 -04:00
Gustavo Salazar
7735ff6d62
build client for Flash Player 11
2012-07-31 17:49:09 -05:00
Richard Alam
578ef05915
- An example how to display textbox
2012-07-30 21:59:32 +00:00
Chad Pilkey
d6931fb0a8
fixed layout module startup error
2012-07-30 18:24:59 +00:00
Fred Dixon
55e5fd994d
Added for openID demo 2c0a2a3104
2012-07-30 13:51:42 -04:00
Fred Dixon
2c0a2a3104
Merge pull request #50 from jfederico/master
...
Added demo to join Demo Meeting using OpenID on Google and Yahoo
2012-07-30 10:50:32 -07:00
jtrobinson
72a40ee66a
Timed notifications are working as intended. Next step: Add audio alert to notifications
2012-07-30 16:14:07 +00:00
jfederico
93efd7dafe
Added demo_openid.jsp to join using OpenID on Google and Yahoo
...
Signed-off-by: jfederico <jesus@123it.ca>
2012-07-30 11:34:18 -04:00
jtrobinson
687f5e2828
Fixed bug of private message tabs not appearing; timed notifications still in progress
2012-07-30 15:26:41 +00:00
Richard Alam
bdc83d7fdf
- separate whiteboard buttons
2012-07-30 04:36:45 +00:00
Richard Alam
b34029140f
- extract out each button to maintain easily
2012-07-30 02:57:42 +00:00
Richard Alam
a26962bf66
- don't listen for 'w' and 'd' key chars to enable/disable whiteboard as it consumes text types into text field
2012-07-30 19:16:45 +00:00
Richard Alam
881c0c573f
- increase size of text field so that text doesn't get chooped when zooming
2012-07-30 19:16:12 +00:00
Richard Alam
87e989f34a
- fix problem where we don't handle properly if there is only 1 annotation
2012-07-30 18:57:02 +00:00
Richard Alam
35bc56625b
- fix undo logic
2012-07-30 18:51:15 +00:00
Richard Alam
ab92441af0
- when zooming/panning text, position the text toolbar properly
2012-07-30 18:28:22 +00:00
