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

10522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
847caa2488 Merge pull request #698 from capilkey/position-poll-wb 
remove the hardcoded poll whiteboard position
 2015-07-13 17:23:48 -04:00
Chad Pilkey
22b7d7bc69 remove the hardcoded poll whiteboard position 2015-07-13 17:20:30 -04:00
Richard Alam
2bad0501b5 Merge pull request #697 from ritzalam/add-more-logging-to-video-disconnect 
- add more logging to determine who detects the disconnect first
 2015-07-13 16:51:39 -04:00
Richard Alam
007a13d0e9 - add more logging to determine who detects the disconnect first 2015-07-13 20:50:38 +00:00
Richard Alam
88be8696f8 Merge pull request #696 from ritzalam/add-num-responders 
Add num responders
 2015-07-13 16:44:31 -04:00
Richard Alam
087c07a6a8 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into add-num-responders 2015-07-13 19:20:31 +00:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Richard Alam
116c274519 Merge pull request #692 from ritzalam/put-outgw-into-actor 
- put message sender and recorders into actors to isolate meeting ac…
 2015-07-13 14:48:42 -04:00
Richard Alam
511ec68d6a Merge pull request #695 from capilkey/hide-poll-button 
Remove poll button when the Polling Module isn't running
 2015-07-13 14:48:25 -04:00
Chad Pilkey
abc3966598 clear the vote buttons when the results are published 2015-07-13 13:51:06 -04:00
Chad Pilkey
9f5ebab201 clean up some unused code in PresentationWindow 2015-07-13 13:30:57 -04:00
Chad Pilkey
bf96c3a4bf hide the poll start button when the polling module is absent 2015-07-13 13:30:14 -04:00
Richard Alam
25ea23eb8d Merge pull request #693 from riadvice/improve-gitignore 
Improved .gitignore files with better patterns.
 2015-07-13 11:58:03 -04:00
Richard Alam
57cc039f9a Merge pull request #694 from capilkey/fix-issue-1964 
Fix issue 1964 - Meeting name label truncation
 2015-07-13 11:57:46 -04:00
Fred Dixon
2bf855543e Enable logging in redis publisher 2015-07-11 19:52:04 -04:00
Chad Pilkey
c06b1f9919 turn scrollpolicy off in MainApplicationShell 2015-07-10 12:51:12 -04:00
Chad Pilkey
0132f62f65 fixed issue 1964 making meeting name label truncate 2015-07-09 18:45:19 -04:00
Ghazi Triki
1ac5a308b5 Improve .gitignore files with better patterns. 2015-07-09 16:13:09 +01:00
Richard Alam
e52e6e7f43 - put message sender and recorders into actors to isolate meeting actor. This hopefully 
will isolate the meeting actor from exceptions when sending to pusub and recording to redis
 2015-07-08 22:21:12 +00:00
Richard Alam
9e022e2b9e Merge pull request #691 from ritzalam/display-poll-result 
- specify location of poll result display
 2015-07-08 16:58:33 -04:00
Richard Alam
95ff9d0925 - specify location of poll result display 2015-07-08 20:57:16 +00:00
Richard Alam
71c416d34c Merge pull request #690 from ritzalam/display-poll-result 
- store poll result into whiteboard history
 2015-07-08 13:34:04 -04:00
Richard Alam
ed271d41f4 - store poll result into whiteboard history 2015-07-08 17:30:38 +00:00
Richard Alam
905233b26b Merge pull request #689 from ritzalam/display-poll-result 
Display poll result
 2015-07-08 13:08:49 -04:00
Richard Alam
0693b83fc8 - fix exception when recording poll result 2015-07-08 17:07:40 +00:00
Richard Alam
d9e71196a9 - record poll result (Still need to fix the data) 2015-07-08 15:14:30 +00:00
Richard Alam
d9fdbe132a - minimize logging 2015-07-08 15:12:42 +00:00
Richard Alam
b6bc10df17 Merge pull request #688 from ritzalam/display-poll-result 
Display poll result
 2015-07-07 17:49:48 -04:00
Richard Alam
6783e709e9 - display poll result as whiteboard shape. 2015-07-07 21:37:21 +00:00
Richard Alam
a55711af2c - add whiteboardId into shape to be able to determine which page this poll result is related to 2015-07-07 21:36:35 +00:00
Richard Alam
3ed524a34c - upgrade bbb-commons-message version 2015-07-07 21:36:01 +00:00
Richard Alam
82c5b251d4 Merge pull request #687 from ritzalam/reconnect-to-bbb-video 
Try to display poll result in whiteboard
 2015-07-06 18:15:26 -04:00
Richard Alam
a83428301a - poll result message now compes into the client but doesn't get displayed in the whiteboard 2015-07-06 22:12:40 +00:00
Richard Alam
5060726035 - format poll result data correctly 2015-07-06 22:12:15 +00:00
Richard Alam
17ead75786 Merge pull request #684 from capilkey/poll-client 
Added a new whiteboard shape for the poll results
 2015-07-02 18:59:33 -04:00
Richard Alam
8451a2f6ee Merge pull request #682 from ffdixon/development 
Added support for bbb-apps-akka and bbb-fsesl-akka in bbb-conf
 2015-07-02 18:59:03 -04:00
Chad Pilkey
8abe9e04a5 add the PollGraphic to the shape 2015-07-02 18:42:51 -04:00
Chad Pilkey
c20768efc9 Merge remote-tracking branch 'upstream/development' into poll-client 2015-07-02 18:39:52 -04:00
Chad Pilkey
772e03bca7 added a new shape for poll results 2015-07-02 18:38:20 -04:00
Richard Alam
b67b59b379 Merge pull request #683 from ritzalam/reconnect-to-bbb-video 
Work on displaying whiteboard result
 2015-07-02 18:17:38 -04:00
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
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