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

10690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oleksandr Zhurbenko
286e052074 Got rid of exceptions which appeared when you login for the first time 2015-07-07 09:25:29 -07: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
Oleksandr Zhurbenko
fc2d0c1275 Styling for unread chat notification in a mobile view 2015-07-06 14:01:58 -07:00
Oleksandr Zhurbenko
bf257c3926 Removed a close user list button from the userlist 2015-07-06 09:50:36 -07:00
Oleksandr Zhurbenko
f353b603be Fixed a hamburger notification for desktop and fixed :hover for the user list 2015-07-06 09:46:20 -07:00
Oleksandr Zhurbenko
7e4b134298 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/views/sharedTemplates.html
 2015-07-03 12:48:05 -07:00
Oleksandr Zhurbenko
77a201099c Added styling for the hamburger and Public buttons and changed Public button's event which handles read public messages 2015-07-03 11:06:40 -07:00
Oleksandr Zhurbenko
b0f0099a6a Changed usernames' cursor 2015-07-03 10:57:23 -07:00
Pedro Beschorner Marin
ed12579fb0 Some refactoring 2015-07-03 12:29:44 +00:00
Chad Pilkey
aafbbd2948 Merge pull request #685 from gthacoder/meteor-client-hamburger-buttons 
HTML5 client: hamburger buttons.
 2015-07-02 19:00:07 -04: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
Maxim Khlobystov
ddad7b1589 Corrected the size of a hamburger icon for landscape and desktop portrait modes. 2015-07-02 18:46:06 -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
Maxim Khlobystov
50a2b794fd Unified the button structure and added a tooltip to the hamburger button. 2015-07-02 18:20:31 -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
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