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 |
|
Gustavo Salazar
|
9b03ac4292
|
Use playerglobal 11.2 instead of 10.3 when setting development environment
|
2012-09-12 09:19:48 -05:00 |
|
Fred Dixon
|
f39eed5dfe
|
reverted changes to bbb-conf
|
2012-09-11 18:45:16 -04:00 |
|
Fred Dixon
|
7bad4ffab8
|
Also delete sanity recordings in bbb-record --deleteall
|
2012-09-11 18:41:32 -04:00 |
|
Richard Alam
|
886f62337b
|
- qeury for server name so we can determine where to load locales.xml, config.xml, etc.
|
2012-09-11 21:51:27 +00:00 |
|
Richard Alam
|
17dc1fbde4
|
- cut down amount of whiteboard data by 2/3
|
2012-09-11 19:29:26 +00:00 |
|
Richard Alam
|
8825dc71ab
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-11 17:50:46 +00:00 |
|
Richard Alam
|
705ac86d2b
|
- throttle mouse cursor updates in presentation window
|
2012-09-11 17:50:16 +00:00 |
|
gustavo salazar
|
2eef1f4664
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-10 16:12:49 -05:00 |
|
gustavo salazar
|
6d90e31b85
|
Set playback_host in bigbluebutton.yml
|
2012-09-10 16:12:10 -05:00 |
|
Fred Dixon
|
c57e7de14d
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-10 16:22:58 -04:00 |
|
Fred Dixon
|
abce700f11
|
Merge pull request #62 from ryanseys/master
Add bbb-html5-client to labs
|
2012-09-10 13:21:47 -07:00 |
|
gustavo salazar
|
140376e084
|
"Audio" tag created in html.
|
2012-09-10 14:40:51 -05:00 |
|
Gustavo Salazar
|
6a8319ba9e
|
Show chat when audio is played.
|
2012-09-07 17:21:00 -05:00 |
|
Fred Dixon
|
d3b694167f
|
Modified bbb-conf to not require slides.yml
|
2012-09-07 16:45:31 -04:00 |
|
Ryan Seys
|
69e27955b3
|
Add bbb-html5-client to labs not as submodule
|
2012-09-07 15:02:21 -04:00 |
|
Ryan Seys
|
1288b0b1cc
|
Remove submodule
|
2012-09-07 15:00:13 -04:00 |
|
Ryan Seys
|
9a8283951f
|
Add bbb-html5-client to labs
|
2012-09-07 14:48:07 -04:00 |
|
Richard Alam
|
39b591fdf6
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2012-09-07 14:29:41 +00:00 |
|
Richard Alam
|
24b5d77de3
|
- align whiteboard icons
|
2012-09-07 14:29:22 +00:00 |
|