Richard Alam
f0e5762b12
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-08-07 16:16:49 +00:00
Richard Alam
5d999457a6
- fix textbox size for viewers
2012-08-07 16:16:18 +00:00
Tiago Daniel Jacobs
a8e76a118b
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-08-07 12:08:59 -03:00
Tiago Daniel Jacobs
65d1e4436f
Initial commit of installer folder.
2012-08-07 12:07:11 -03:00
Tiago Daniel Jacobs
a794bb5319
Initial Commit
2012-08-06 17:16:47 -03:00
Felipe Cecagno
548633c578
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
2012-08-06 13:52:56 -03:00
Felipe Cecagno
2076a1137d
fixing the NPE on the layout module when the user joins a conference with an adobe flash player debugger version
...
http://code.google.com/p/bigbluebutton/issues/detail?id=1261
2012-08-06 13:51:30 -03:00
Markos Calderon
b88fda975e
deleting wrong files
2012-08-06 11:36:15 -05:00
Richard Alam
d4691ddc9f
- cleanup
2012-08-05 08:15:21 +00:00
Richard Alam
74ad60fe68
- draw line and triangle
2012-08-05 07:30:46 +00:00
Richard Alam
638ae8d0d4
- draw line and triangle
2012-08-05 07:27:03 +00:00
Richard Alam
af15be0f4a
- draw circle when ctrl key is pressed
2012-08-05 06:45:40 +00:00
Richard Alam
fbfc49fd5d
- draw square when control key is pressed
2012-08-05 06:34:40 +00:00
Richard Alam
f0aba5e593
- text displays again
2012-08-04 23:36:27 +00:00
Richard Alam
3ed5651a98
- can't seem to display text properly...need to fix
2012-08-10 22:17:42 +00:00
Richard Alam
ba6e43484b
- pencil works
2012-08-10 19:29:14 +00:00
Richard Alam
a98da69b2b
- separate sending and displaying
2012-08-10 19:10:53 +00:00
Richard Alam
41e2f1cc0d
- handle Ctrl-KEY
2012-08-10 15:59:12 +00:00
Richard Alam
eef20d38c1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-08-10 15:54:01 +00:00
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
