BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,134 Commits 13 Branches 260 Tags 1.1 GiB
060b901459
Commit Graph

11134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
72659e62ac - try displaying poll result as whiteboard shape 2015-07-02 22:16:11 +00:00
Richard Alam
2f170aa285 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into reconnect-to-bbb-video 2015-07-02 22:12:18 +00:00
Fred Dixon
ae1efb02f1 Added support for bbb-apps-akka and bbb-fsesl-akka in bbb-conf start/stop/restart 2015-07-02 17:15:26 -04:00
Fred Dixon
04289d7fd6 Merge pull request #681 from ffdixon/development 
Incremented version to 1.0.0-dev
 2015-07-02 17:11:26 -04:00
Fred Dixon
c2ca2e13e3 Incremented version to 1.0.0-dev 2015-07-02 17:10:09 -04:00
Richard Alam
4b604d8e56 - fix issue where only presenter gets polling message from server 2015-07-02 20:43:16 +00:00
Oleksandr Zhurbenko
02825e3fbc Added notifications for the hamburger and Public buttons 2015-07-02 13:18:05 -07:00
Richard Alam
2eb1de6cab Merge pull request #679 from ritzalam/reconnect-to-bbb-video 
Reconnect to bbb video
 2015-07-02 15:25:08 -04:00
Richard Alam
6d7b93e6a4 - upgrade bbb-common-message version 2015-07-02 19:23:36 +00:00
Richard Alam
249c40302d - fix NPE when webcam is closed properly 2015-07-02 19:22:56 +00:00
Richard Alam
8097f58e3f Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into reconnect-to-bbb-video 2015-07-02 18:19:45 +00:00
Richard Alam
0a7f1300f3 Merge pull request #680 from capilkey/poll-client 
Uncommenting the PollingModule in config.xml.template
 2015-07-02 14:18:17 -04:00
Chad Pilkey
fa808ec594 Uncommenting the PollingModule in config.xml.template 2015-07-02 14:08:29 -04:00
Richard Alam
b3c9e2394b - fix webcam stream data into correct format (array) 2015-07-02 18:04:58 +00:00
Richard Alam
96b4700ae0 - fix logging 
- stop the stream only if it hasn't been stopped yet
 2015-07-02 17:11:12 +00:00
Richard Alam
40422d0934 - close webcam window when receiving webcam stream stopped message from server 2015-07-02 17:10:23 +00:00
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
Oleksandr Zhurbenko
28d31f9b8c Fixed a bug with notifications' appearing on relogin 2015-06-29 09:54:02 -07:00
Oleksandr Zhurbenko
33b2c8becd Fixed a bug with an open private chat on relogin 2015-06-29 09:01:20 -07:00
Oleksandr Zhurbenko
b970298f05 Added styling and icons as notifications for the user list 2015-06-26 15:58:23 -07: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
Oleksandr Zhurbenko
0f6f553e3e Added notifications for unread private messages 2015-06-24 17:21:50 -07: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
Pedro Beschorner Marin
5a6c3efd7d Better control of reconnection presenter status change 2015-06-24 13:33:11 +00:00
Richard Alam
d9295115c8 - handle voting, stop, and show result in the client 2015-06-23 21:50:38 +00:00
Pedro Beschorner Marin
b1638f3184 The welcome message is only sent once 2015-06-23 20:42:45 +00:00