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

11182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
e52b644301 Merge pull request #2741 from ffdixon/update-bbb-conf 
Added check to ensure PID for red5 matches that in /var/run/red5.pid
 2015-08-22 20:47:59 -04:00
Fred Dixon
ec2cd0567b Added check to ensure PID for red5 matches that in /var/run/red5.pid 2015-08-22 20:46:18 -04:00
Ghazi Triki
a05f9ef173 ServerLogTarget is now able to queue logs when the network connection is lost then send them once the network connection si back. 2015-08-22 18:32:52 +01:00
Ghazi Triki
96a27c103c Log level can be configured in flex client application. 2015-08-22 17:15:12 +01:00
Richard Alam
08f50745ee - revert back to original hand icon 2015-08-22 10:00:31 -04:00
Ghazi Triki
4de187d833 Created new logging target ServerLogTarget to store flex logs to server. 2015-08-22 13:02:51 +01:00
Fred Dixon
dc537f1257 Merge pull request #2738 from ffdixon/fix-bbb-conf 
Fix bbb-conf to better parse config.xml
 2015-08-21 17:09:17 -04:00
Fred Dixon
cdf41e874a xMerge remote-tracking branch 'upstream/master' 2015-08-21 16:58:03 -04:00
Fred Dixon
660f1aaecd Fixed error in parsing config.xml in bbb-conf 2015-08-21 16:55:16 -04:00
Fred Dixon
1527c51555 Merge pull request #2737 from ritzalam/redis-pubsub-keepalive 
Redis pubsub keepalive
 2015-08-21 13:46:27 -04:00
Oleksandr Zhurbenko
953a98b038 Added scaling and truncating to the bar with poll buttons with answers 2015-08-21 10:14:56 -07:00
Maxim Khlobystov
21f1bd6a60 Polishing up the font and element sizes for phones and tablets. 2015-08-21 10:59:09 -04:00
Maxim Khlobystov
81a2ce5827 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/chat.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-08-21 09:55:23 -04:00
Richard Alam
39baecef24 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into redis-pubsub-keepalive 2015-08-21 13:46:42 +00:00
Fred Dixon
c70dcfe9df Merge pull request #2736 from riadvice/custom-polling-improve 
Custom polling window simplified.
 2015-08-21 07:28:21 -04:00
Ghazi Triki
49ef1e3618 Custom polling window simplified. 2015-08-21 11:09:45 +01:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Chad Pilkey
0f667f4c05 Merge pull request #2735 from capilkey/misc-poll-fixes 
Misc poll fixes
 2015-08-20 16:44:02 -04:00
Chad Pilkey
f3db6617e5 improve poll label display 2015-08-20 16:37:46 -04:00
Chad Pilkey
fc9fee0858 fix presentation spelling 2015-08-20 16:37:06 -04:00
Maxim Khlobystov
88fb41263e Modified the UI styling to start using CSS pixels + separated phone, tablet and desktop views. 2015-08-20 15:45:26 -04:00
Chad Pilkey
90cd7ce2bc Merge pull request #2734 from riadvice/polling-multi-choice-window 
Added new window for adding custom polling choices.
 2015-08-20 15:43:36 -04:00
Oleksandr Zhurbenko
39e51604a0 Made a raise hand button transparent 2015-08-20 12:21:48 -07:00
Ghazi Triki
98f33db751 Added new window for adding custom polling choices. 2015-08-20 18:37:15 +01:00
Richard Alam
f7620cb4b0 Merge pull request #2731 from capilkey/make-votes-noticeable 
Make votes noticeable
 2015-08-19 21:16:51 -04:00
Richard Alam
dbe2e1c389 Merge pull request #2730 from OZhurbenko/meteor-ui 
Polling, Sorting and URL Validation
 2015-08-19 21:06:45 -04:00
Chad Pilkey
f5659af65c increased the font size of the vote button text 2015-08-19 21:04:39 -04:00
Chad Pilkey
fc460c393d Merge remote-tracking branch 'upstream/master' into variable-wb-poll-size 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2015-08-19 20:52:59 -04:00
Oleksandr Zhurbenko
5f6bd654d4 Changed the whole way of how we calculate height and width of text elements, as the previous one didn't work in Firefox. Also, if the number of the votes doesn't fit the box then it's displayed in black on the right. Changed the colors to dark grey 2015-08-19 17:42:38 -07:00
Chad Pilkey
95ca4ad190 added an audio queue when a poll is started 2015-08-19 20:41:02 -04:00
Chad Pilkey
bdfc6977f9 Made the vote buttons more visible 2015-08-19 20:12:43 -04:00
Richard Alam
282fecf351 - ping/pong message between red5 and bbb-apps 2015-08-19 18:32:07 +00:00
Fred Dixon
c875be4c1d Merge pull request #2727 from capilkey/variable-wb-poll-size 
Variable wb poll size
 2015-08-19 14:15:02 -04:00
Chad Pilkey
f84d479f9b fixed the poll display so that vote count is always visible 2015-08-19 13:13:13 -04:00
Maxim Khlobystov
8b06d43aec Fixed the mechanism of toggling the chat bar and made sure user is unable to resize the whiteboard when the chat is closed. 2015-08-19 12:47:00 -04:00
Richard Alam
d62366c860 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into redis-pubsub-keepalive 2015-08-19 14:55:54 +00:00
Richard Alam
ebad2dba97 Merge pull request #2729 from riadvice/puffin-browser 
Puffin browser detection
 2015-08-19 10:49:26 -04:00
Richard Alam
a3318e5f90 - send keep alive message 2015-08-19 14:33:46 +00:00
Ghazi Triki
7835bfb80c Webcam, desktop and micrphone sharing are disabled when Puffin browser is detected. 2015-08-19 09:51:35 +01:00
Maxim Khlobystov
f5fe166b50 Styling for the side menus. 2015-08-18 20:02:00 -04:00
Maxim Khlobystov
9fb02eae05 Made sure all the side menu elements are clickable. 2015-08-18 19:35:14 -04:00
Maxim Khlobystov
e98c96bd8b Fixed the issue of not being able to toggle userlist in landscape mode on mobile devices. 2015-08-18 18:09:24 -04:00
Ghazi Triki
f0ed185c71 determineBrowser function in bbb_blinker.js detects Puffin mobile browser. 2015-08-18 22:57:34 +01:00
Richard Alam
8be746b4ac - start implementing round-trip pubsub monitoring 2015-08-18 21:51:48 +00:00
Maxim Khlobystov
3b73497bea Added phone/tablet detection, made the navbars look bigger on a mobile phone in landscape orientation. 2015-08-18 15:01:49 -04:00
Chad Pilkey
8d232ac103 Changed the poll graphic to use dark-grey instead of black 2015-08-18 12:02:29 -04:00
Chad Pilkey
7846add9e9 The Poll WB mark height increases with number of answers 2015-08-18 11:52:12 -04:00
Richard Alam
2e7238ae74 Merge pull request #2725 from ritzalam/implement-custom-poll 
Implement custom poll
 2015-08-17 18:42:25 -04:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Richard Alam
d4a8897515 Merge pull request #2724 from gthacoder/meteor-client-png-legacy 
HTML5 client: PNG legacy issue.
 2015-08-17 17:28:03 -04:00