BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,467 Commits 13 Branches 260 Tags 1.1 GiB
60f9dda8e8
Commit Graph

10467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
60f9dda8e8 Merge pull request #678 from ritzalam/reconnect-to-bbb-video 
Reconnect to bbb video
 2015-07-02 10:46:30 -04:00
Richard Alam
4190ad3aa7 - close stream if no video packet received within a few seconds 2015-07-02 14:41:17 +00:00
Richard Alam
721bcf9342 - fix parsing of video stream name 2015-07-02 14:40:52 +00:00
Richard Alam
3033724471 - reopne webcam windows 2015-06-30 22:26:35 +00:00
Richard Alam
87790f1735 Merge pull request #676 from ritzalam/reconnect-to-bbb-video 
- force stop broadcasting of webcam when disconnected to bbb-video
 2015-06-30 17:42:37 -04:00
Richard Alam
7f5f5a5ee7 - force stop broadcasting of webcam when disconnected to bbb-video 2015-06-30 21:01:59 +00:00
Richard Alam
fb94468edf Merge pull request #675 from ritzalam/reconnect-to-bbb-video 
Reconnect to bbb video
 2015-06-30 15:58:15 -04:00
Richard Alam
dc10228627 Merge pull request #674 from ritzalam/cleanup-webcam-stream-in-bbb-video 
- detect webcam stream start/stop on bbb-video and send correspondin…
 2015-06-30 15:58:03 -04:00
Richard Alam
be27e7bd9a - when client detects that connection to bbb-video has been disconnected, close all webcam windows 
in video dock and reconnect if needed.
 2015-06-30 19:53:26 +00:00
Richard Alam
60d01a450b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into cleanup-webcam-stream-in-bbb-video 2015-06-30 17:36:45 +00:00
Richard Alam
79ede8d290 Merge pull request #673 from jfederico/master 
Added support for POST requests to getRecordings and getMeetings
 2015-06-30 13:27:30 -04:00
Richard Alam
8e504aa2a8 - detect webcam stream start/stop on bbb-video and send corresponding message to bbb-apps. We need 
a way to detect that webcam stream stopped server side because when the client's connection
   to bbb-video is disconnected due to network issue, the notification that the stream stopped
   from the client side can't be sent to the server.
 2015-06-30 17:23:53 +00:00
Jesus Federico
9e51241b08 Added support for POST requests to getRecordings and getMeetings 2015-06-29 18:18:39 -04:00
Richard Alam
e5ae1e30ff Merge pull request #672 from capilkey/poll-client 
UI for voting on polls and viewing votes
 2015-06-29 15:55:19 -04:00
Richard Alam
40f5606cb1 Merge pull request #671 from ritzalam/implement-polling-v3 
- stop poll if presenter leaves or presentation page changed
 2015-06-29 15:54:47 -04:00
Chad Pilkey
087223b3fe first pass at a UI for voting and viewing votes 2015-06-26 18:31:14 -04:00
Chad Pilkey
3ebc23619f moved the poll specific views from the presentation module to polling module 2015-06-26 18:29:12 -04:00
Richard Alam
36601345c2 - stop poll if presenter leaves or presentation page changed 2015-06-24 20:32:00 +00:00
Chad Pilkey
cb597c6f0b Merge remote-tracking branch 'upstream/development' into poll-client 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2015-06-24 14:39:10 -04:00
Chad Pilkey
16aab6378a first pass at creating buttons for voting 2015-06-24 14:17:48 -04:00
Chad Pilkey
46840dd727 moved some poll strings to locales 2015-06-24 14:17:25 -04:00
Chad Pilkey
67cc2fc651 fixed some compiler warnings in PollGraphic 2015-06-24 14:11:31 -04:00
Richard Alam
ad84c4e5be Merge pull request #670 from ritzalam/implement-polling-v3 
- cleanup of unused polling code
 2015-06-24 12:04:36 -04:00
Richard Alam
be9becacc1 - cleanup of unused polling code 2015-06-24 16:02:17 +00:00
Richard Alam
6a54c6e664 Merge pull request #669 from ritzalam/implement-polling-v3 
Implement polling v3
 2015-06-24 11:34:22 -04:00
Richard Alam
a0345d23b3 - add some way to test polling 2015-06-24 15:32:24 +00:00
Richard Alam
6f9fcd87e1 - handle poll messages in the client 2015-06-24 15:16:36 +00:00
Richard Alam
d9295115c8 - handle voting, stop, and show result in the client 2015-06-23 21:50:38 +00:00
Richard Alam
a5645e29af Merge pull request #668 from ritzalam/implement-polling-v3 
Implement polling v3
 2015-06-23 15:37:07 -04:00
Richard Alam
dcfa4ee8fb - cleanup unneded polling events 
- process start poll message
 2015-06-23 19:34:58 +00:00
Richard Alam
da76271e92 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3 2015-06-23 19:30:35 +00:00
Richard Alam
c1aa51b66f Merge pull request #667 from capilkey/poll-client 
fixed the poll start button css
 2015-06-23 15:30:19 -04:00
Richard Alam
d46053d05e - start poll message now sent from client and then back to clients 2015-06-23 19:29:09 +00:00
Chad Pilkey
628d47968d fixed the poll start button css 2015-06-23 15:09:44 -04:00
Richard Alam
5d50d5bc2d Merge pull request #666 from capilkey/poll-client 
Poll start button and start of publish poll
 2015-06-23 11:41:52 -04:00
Chad Pilkey
078f9accb9 added a poll image to the branding folder 2015-06-23 11:34:43 -04:00
Chad Pilkey
49366a5782 started on the publish poll client code 2015-06-23 11:34:09 -04:00
Chad Pilkey
4d8b14c0b7 added a button to start the polls 2015-06-23 11:33:07 -04:00
Richard Alam
84446f93fa Merge pull request #665 from ritzalam/implement-polling-v3 
Implement polling v3
 2015-06-22 17:30:24 -04:00
Richard Alam
acb8a8c89a - implement sending of polling messages thru redis 2015-06-22 21:27:44 +00:00
Richard Alam
b8128945f4 - add new polling messages 2015-06-22 21:13:11 +00:00
Richard Alam
4df38f47a4 Merge pull request #664 from ritzalam/implement-polling-v3 
Start implementing redis messages between red5 and bbb-apps
 2015-06-22 11:36:03 -04:00
Richard Alam
8b84fd92b4 - implement redis messages for polling 2015-06-19 21:10:25 +00:00
Richard Alam
7c3cfa665f - implement poll message handlers 2015-06-19 16:07:21 +00:00
Richard Alam
2e65d9bcec Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3 2015-06-19 14:30:49 +00:00
Richard Alam
25b99bcef6 Merge pull request #662 from gthacoder/meteor-client-sliding-in-on-top 
HTML5 client: new sliding menu.
 2015-06-19 10:26:22 -04:00
Richard Alam
9a30d48a1a Merge pull request #663 from ritzalam/implement-polling-v3 
- implement message handlers
 2015-06-19 10:25:06 -04:00
Richard Alam
35ebeb3bce - try to fix log location 2015-06-19 14:24:29 +00:00
Richard Alam
cbce9d61eb - implement message handlers 2015-06-18 22:09:08 +00:00
Maxim Khlobystov
e765987170 Fixed the issue with the screen not darkening after opening one of the menus while the other one is open. 2015-06-18 17:05:18 -04:00