Commit Graph

7334 Commits

Author SHA1 Message Date
Richard Alam
75d908625c - setup messaging classes 2014-04-30 15:53:27 +00:00
Richard Alam
bfc4cb178e - setup testing 2014-04-30 15:43:25 +00:00
Richard Alam
5a1ea4f2a5 Merge branch 'connect-bbb-apps-html5' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5 2014-04-30 05:08:57 -07:00
Richard Alam
fb039114a9 Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5 2014-04-29 15:51:10 +00:00
Richard Alam
c3dff8a8a2 Merge pull request #320 from gugat/postscripts
Postscripts
2014-04-29 11:50:37 -04:00
Richard Alam
db01b1727f - set bbb-apps as available when it starts replying to the keep alive messages again 2014-04-29 15:33:53 +00:00
Gustavo Salazar
efda95fed6 delete temp files 2014-04-29 10:33:23 -05:00
Richard Alam
ef6ffa20df - make keep alive run on it's own thread 2014-04-28 22:00:48 +00:00
Richard Alam
55f80252b7 - remove PNG generation step in doc conversion as it takes a long time 2014-04-28 20:19:27 +00:00
Richard Alam
6aaf071987 - remove test message 2014-04-28 20:11:26 +00:00
Richard Alam
ec56469fb3 Merge branch 'connect-bbb-apps-html5' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5 2014-04-28 18:47:35 +00:00
Anton Georgiev
664b882ccb switched all variables to CamelCase 2014-04-28 15:49:22 +00:00
Richard Alam
5e6caccbac - add oauth signature 2014-04-27 16:38:25 -07:00
Richard Alam
e37cca26f5 - versioned api 2014-04-27 16:29:26 -07:00
Richard Alam
454b37a0df - setup 2014-04-26 19:51:18 -07:00
Richard Alam
79fe7f4b8b - cleanup 2014-04-26 19:48:06 -07:00
Richard Alam
e0f1da4acd Merge branch 'connect-bbb-apps-html5' of github.com:daronco/bigbluebutton into connect-bbb-apps-html5 2014-04-26 14:54:00 -07:00
Leonardo Crauss Daronco
3cc04e47c3 Get the token from the URL to authenticate the HTML5 client 2014-04-25 10:34:26 -04:00
Gustavo Salazar
b1e82fe58d post scripts for record and playback 2014-04-24 19:08:06 -05:00
Leonardo Crauss Daronco
08f23883e3 Add missing log/ dir in the HTML5 client 2014-04-24 17:41:28 -04:00
Leonardo Crauss Daronco
301bc098a8 Add a test server to authenticate the HTML5 client 2014-04-24 17:39:59 -04:00
Leonardo Crauss Daronco
5d1fb4c168 HTML5 client authentication using redis and the new messages
The client sends a 'validate_auth_token_request' to the server, that waits
a 'validate_auth_token_reply' response from bbb-apps to pass to the client.
Still have to get info from /api/enter, for now the meetingId and userId are
hard-coded in the client (AuthenticationModel).
2014-04-24 17:39:59 -04:00
Calvin Walton
7d78e46cad Support passing through XML extensions in getRecordings
Recording processing scripts can now add arbitrary XML elements in
the extensions section of the metadata.xml file, and those
element will be copied to the getRecordings XML response.
2014-04-24 16:34:59 -04:00
Richard Alam
907a4d4f32 Merge pull request #318 from BBBManager/connect-bbb-apps-html5
Changes to support RTMPS connections
2014-04-24 16:18:38 -04:00
Tiago Daniel Jacobs
97ad5e28f4 Changes to support RTMPS connections 2014-04-24 17:16:03 -03:00
Anton Georgiev
042c1ad937 updating 2014-04-24 18:41:44 +00:00
Anton Georgiev
f207c6fa16 Listener for some participants' events 2014-04-24 18:30:44 +00:00
Leonardo Crauss Daronco
b2b8960470 Merge pull request #1 from lfzawacki/connect-bbb-apps-html5
Use local log file on development
2014-04-23 20:51:50 -04:00
Lucas Zawacki
1bc0effc2f Use local log file on development 2014-04-23 18:48:04 -04:00
Leonardo Crauss Daronco
501eec737a Merge remote-tracking branch 'upstream/connect-bbb-apps-html5' into connect-bbb-apps-html5 2014-04-23 18:36:56 -04:00
Anton Georgiev
867c9fdb46 chat messages on channel "bigbluebutton:meeting:anton" are handled in bigbluebutton-apps and appear inside the flash client 2014-04-23 22:35:40 +00:00
Leonardo Crauss Daronco
1a894c18c4 Proxy messages from bbb-apps to the html5 clients 2014-04-23 18:27:43 -04:00
Leonardo Crauss Daronco
e551679685 Better redis channels for the html5 client 2014-04-23 17:37:19 -04:00
Richard Alam
b93167dca5 Merge branch 'connect-bbb-apps-html5' of github.com:daronco/bigbluebutton into connect-bbb-apps-html5
Conflicts:
	client/bbb-html5-client/lib/clientproxy.coffee
	client/bbb-html5-client/lib/redispubsub.coffee
2014-04-23 14:17:42 -07:00
Leonardo Crauss Daronco
8202cebfea Make the html5 always start in the session screen for testing 2014-04-23 17:13:09 -04:00
Anton Georgiev
fe8d969093 some work on listener for private/public chat messages 2014-04-23 20:54:03 +00:00
Leonardo Crauss Daronco
1031e49428 Move log path to the config file 2014-04-23 16:39:42 -04:00
Leonardo Crauss Daronco
068204a78f Using classes for the new files and structure in the html5 server 2014-04-23 16:18:25 -04:00
Richard Alam
f167a6eddf add comments 2014-04-22 16:15:47 -04:00
Richard Alam
f785c06e83 Merge branch 'connect-bbb-apps-html5' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5 2014-04-22 19:22:23 +00:00
Richard Alam
daf1f662b9 - add some TODO comment 2014-04-22 19:21:57 +00:00
Richard Alam
a7ee746650 add some comments 2014-04-22 14:52:38 -04:00
Richard Alam
0b40c1a10d more messages 2014-04-19 13:19:40 -07:00
Richard Alam
3ad6df7fe7 - documenting more messages 2014-04-19 13:01:33 -07:00
Richard Alam
92ec595df9 - fix format 2014-04-19 12:55:24 -07:00
Richard Alam
1337de5ed2 - create doc for messages 2014-04-19 12:53:08 -07:00
Richard Alam
c44f4c90a3 - wire up png converter 2014-04-19 09:23:06 -07:00
Richard Alam
f4de100179 - fix compile problem 2014-04-19 09:22:51 -07:00
Richard Alam
12921b1e24 Merge branch 'connect-bbb-apps-html5' into merge-with-upgrade-red5-branch 2014-04-18 17:21:44 -07:00
Richard Alam
78ea46ae35 Merge branch 'upgrade-to-red5-1.0.2-M1' into merge-with-upgrade-red5-branch 2014-04-18 15:58:53 -07:00