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

10704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
b58fad25b9 Keep notifications and private chat tabs open when users refresh the page 2015-07-09 14:59:57 -07:00
Oleksandr Zhurbenko
393ec05dcf Added a way of how we can gistinguish page refreshing from relogin 2015-07-09 14:55:28 -07: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
d7f6e752a5 Merge pull request #686 from OZhurbenko/meteor-ui 
Chat notifications and UI changes
 2015-07-08 13:32:43 -04:00
Richard Alam
ed271d41f4 - store poll result into whiteboard history 2015-07-08 17:30:38 +00:00
Oleksandr Zhurbenko
76d27fa84b Refactoring 2015-07-08 10:09:29 -07: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
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