Commit Graph

4704 Commits

Author SHA1 Message Date
Markos Calderon
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05:00
Markos Calderon
ef5689b73b added whiteboard pencil pending store the shape 2012-10-05 18:22:18 -05:00
Markos Calderon
48c0830efc setpresenter, mouse movement, and starting to send pencil drawings 2012-10-05 17:07:17 -05:00
Markos Calderon
18fa3870ec Merge pull request #66 from kepstin/html5-bridge
Html5 bridge UI updates
2012-10-05 11:59:28 -07:00
Calvin Walton
4fea74251b Add additional buttons with some presentation controls.
For now, the buttons are just going into the bottom bar, and some are
missing icons.
2012-10-05 14:57:02 -04:00
Calvin Walton
18a74e3871 Update HTML5 client CSS to closer match the mockup style 2012-10-05 13:33:37 -04:00
Markos Calderon
9352e198ef setPresenter integrated 2012-09-25 18:29:58 -05:00
Markos Calderon
23a03c21e7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-bridge 2012-09-24 14:27:31 -05:00
Gustavo Salazar
b9e79208c5 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-21 17:28:11 -05:00
Gustavo Salazar
2462802d54 Change ffmpeg commands to support version 0.11.2 2012-09-21 17:27:11 -05:00
Richard Alam
fc294df41f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-21 21:06:51 +00:00
Richard Alam
80744c488f - continue drawing when the mouse temporarily moves out of the canvas 2012-09-21 21:06:11 +00:00
Markos Calderon
c878ff5d06 added redirect and clientURL parameters to the API 2012-09-21 16:03:53 -05:00
Richard Alam
80204543e8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-21 20:44:39 +00:00
Richard Alam
2b71f9f964 - fix history for latecomers 2012-09-21 20:44:15 +00:00
Gustavo Salazar
f8510d749b Always set a value to "title" in dublincore.xml 2012-09-21 15:22:23 -05:00
Markos Calderon
173211bdec integrating setPresenter call 2012-09-21 14:42:17 -05:00
Richard Alam
d3ff17ab05 - extract bbb-api-bridge into it's own js file 2012-09-20 16:17:57 +00:00
Gustavo Salazar
b0cb319bf1 Set width to chat container 2012-09-16 14:38:18 -05:00
Markos Calderon
4e57ee7234 added a method for get the userid 2012-09-15 06:48:13 -07:00
Markos Calderon
3b64240494 Merge branch 'html5-bridge' of https://github.com/bigbluebutton/bigbluebutton into html5-bridge 2012-09-15 06:13:32 -07:00
Fred Dixon
5b06b2cb98 Merge pull request #63 from kepstin/html5-bridge
Add the new user interface
2012-09-16 11:10:24 -07:00
Calvin Walton
a4331acb06 Add the new user interface
It's still partially incomplete - missing the presentation controls, but
it's a start :)
2012-09-16 14:06:12 -04:00
Markos Calderon
cd53c08531 messages doesn't load in flex client - fixed 2012-09-15 06:13:01 -07:00
Markos Calderon
89e6b614a2 storing messages 2012-09-15 05:30:20 -07:00
Markos Calderon
baa9eef486 chat almost complete... pending chat history in flex client 2012-09-15 03:15:14 -07:00
Markos Calderon
84127f3d80 Initial Changes for chat module 2012-09-15 02:46:41 -07:00
Markos Calderon
8053c15b9e participants module full working 2012-09-15 01:44:17 -07:00
Markos Calderon
cc970323e1 last fix... 2012-09-15 00:50:57 -07:00
Markos Calderon
eba31e9dbb another fix 2012-09-14 23:40:34 -07:00
Markos Calderon
5fc2b46ce8 fix load participants 2012-09-14 22:09:37 -07:00
Markos Calderon
3994d3b592 fixing... send update list when participant left 2012-09-14 21:42:18 -07:00
Markos Calderon
0a3a33fbf2 Latest changes in integrating participants module 2012-09-14 21:18:29 -07:00
Markos Calderon
ce9d7c1706 API stores meeting in redis, apps stores users in redis 2012-09-14 16:48:05 -07:00
Richard Alam
1240723b99 - forgot to add /fcs/ handler 2012-09-14 19:32:50 +00:00
Richard Alam
6ea4b78f72 - fix problem where only one user is able to join the voice conf. We are renaming the sip context which makes
red5 not find it
2012-09-14 15:15:11 +00:00
Richard Alam
7aef1052f3 - call netstream.close() to stop the stream. Calling netstream.play(false) makes red5 look for a file to stream 2012-09-14 15:13:58 +00:00
Richard Alam
239744713a - call super methods of Red5 application adapter 2012-09-14 15:13:29 +00:00
Richard Alam
ad35b2ab08 - upgrade to red5 r4415 2012-09-12 20:39:34 +00:00
Richard Alam
a01b9df615 Merge remote branch 'origin/master' into upgrading-red5-r4415 2012-09-12 20:32:06 +00:00
Richard Alam
96cb775d30 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-12 20:27:34 +00:00
Richard Alam
58d3c90db1 - fix hardcoded locale location 2012-09-12 20:26:37 +00:00
Fred Dixon
f4fff9160c Also update hostname for metadata.xml in /var/bigbluebutton/published ... 2012-09-12 15:14:45 -04:00
Fred Dixon
11520ab392 bbb-conf --setip now updates the hostname for playback of recordings in metadata.xml 2012-09-12 14:53:21 -04:00
Fred Dixon
4b79d140ba bbb-record --check now checks if the IP address for a recording matches the value defined in bigbluebutton.properties 2012-09-12 14:52:36 -04:00
Richard Alam
48976c86db Merge branch 'master' into merge-master-with-upgrading-red5-r4406 2012-09-12 17:19:30 +00:00
Richard Alam
10189eccf9 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-09-12 16:05:20 +00:00
Richard Alam
870bd93013 - move bbb-api-bridge into it's onwn js file
- rename the api method names
 - cleanup
2012-09-12 16:00:38 +00:00
Richard Alam
8ac96a7a3c - change config.xml template to have full URL of SWF files 2012-09-12 15:33:03 +00:00
Richard Alam
781a03a149 Merge branch 'master' into merge-master-into-embedding-client 2012-09-12 15:19:30 +00:00