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

10921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
343f7c7f5c Configuration settings for Chrome deskshare extension 2015-09-04 12:23:33 -07:00
perroned
6983730bda Configuration settings for external FreeSWITCH server 2015-09-04 12:22:47 -07:00
perroned
56e1782877 Load external JS libraries using HTTPS 2015-09-04 08:48:51 -07:00
perroned
ab4e38e155 (pkg) Force html5 client to use SSL 2015-09-04 08:48:09 -07:00
Richard Alam
2b7542aaed Merge pull request #2753 from riadvice/emoji-status 
Improvements for the user status icon feature
 2015-08-31 20:05:20 -04:00
Ghazi Triki
c255b94f85 Clicking on the same status icon again raises a "none" status event. 2015-09-01 00:11:00 +01:00
Ghazi Triki
9fcaf6c6ca Fixed missing emoji locales and minor improvement for the EmojiGrid padding. 2015-09-01 00:06:47 +01:00
Ghazi Triki
95a093ca0c Update status icons. 2015-08-31 23:47:40 +01:00
Fred Dixon
75241fc86b Merge pull request #2752 from ritzalam/revert-back-hand-icon 
- revert back to original hand icon
 2015-08-31 17:03:56 -04:00
Richard Alam
c7e3788af1 Merge pull request #2751 from riadvice/emoji-status 
Implementation of emoji status for users
 2015-08-31 12:46:40 -04:00
Ghazi Triki
f0eed97bb8 Remove status button is correctly displayed. 2015-08-28 19:50:34 +01:00
Ghazi Triki
7ec8c6e3b7 Merge branch 'master' into emoji-status 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-08-28 19:06:48 +01:00
Ghazi Triki
a7d2820c24 Improved emoji feature components. 2015-08-28 19:02:52 +01:00
Ghazi Triki
debafd24ca Displaying custom emoji icons. 2015-08-28 15:56:52 +01:00
Ghazi Triki
66a7f23146 Added userId to EmojiStatusEvent to able to send a request for a different user. 2015-08-28 11:08:18 +01:00
Richard Alam
7953086be9 Merge pull request #2749 from gthacoder/meteor-client-mobile-view 
Phone/Tablet Views.
 2015-08-27 18:02:57 -04:00
Maxim Khlobystov
89b4bac21a Made the userlist hidden by default on phones. 2015-08-27 17:47:40 -04:00
Maxim Khlobystov
4ecf1ea16a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-08-27 17:19:43 -04:00
Maxim Khlobystov
5be21ee80a Made sure the width and position of the Settings window are set appropriately on any device. 2015-08-27 17:11:59 -04:00
Ghazi Triki
35e8d03949 - Added new EmojiGrid component. 
- Replaced raise hand feature by emoji status in client (WIP)
 2015-08-27 21:31:46 +01:00
Ghazi Triki
3a11d30115 Fixed emojiStatus is correctly saved in UsersModel. 2015-08-27 21:25:54 +01:00
Maxim Khlobystov
ec33e1404b Made the notifications look appropriately sized regardless of the device type or screen orientation. 2015-08-26 17:37:27 -04:00
Richard Alam
ebd98168c4 Merge pull request #2748 from capilkey/add-checkbox-chat-sounds 
Miscellaneous Client fixes for 1.0
 2015-08-26 17:21:44 -04:00
Richard Alam
a2b613e80c Merge pull request #2747 from OZhurbenko/meteor-ui 
Polling update
 2015-08-26 17:20:15 -04:00
Chad Pilkey
760b7b306a add in an ICE connection timeout set to 60s 2015-08-26 16:56:52 -04:00
Chad Pilkey
cd58b764a4 clean up the presentation sizing on page load 2015-08-26 16:56:18 -04:00
Chad Pilkey
7415d5a8d8 move the chrome mic permission window down 50px 2015-08-26 16:55:52 -04:00
Chad Pilkey
0994e90d6d increased the audio dialog font size 2015-08-26 16:50:59 -04:00
Ghazi Triki
2fb8296ff0 - Fixed emojiStatus not set correctly in server. 
- Upgraded bbb-common-message version.
 2015-08-26 18:51:05 +01:00
Maxim Khlobystov
b362cb95f3 Polished up the sizing of Settings window. 2015-08-25 14:49:04 -04:00
Ghazi Triki
988d8cf56c Removed lower hand methods in server applications and replace raise hand by emoji status. 2015-08-25 09:46:00 +01:00
Oleksandr Zhurbenko
30a1d0d880 Fixed a bug with publishing a custom poll containing just one answer 2015-08-24 15:59:45 -07:00
Oleksandr Zhurbenko
8b6ebe63b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 2015-08-24 15:31:50 -07:00
Oleksandr Zhurbenko
e77c6377be Removed 40px restriction for the width and increased a default font-size for calculations 2015-08-24 15:22:59 -07:00
Maxim Khlobystov
092274e8ef Continued transitioning the mobile views to CSS pixels, corrected the sizes of Settings window's fonts/elements. 2015-08-24 17:20:14 -04:00
Fred Dixon
55516cd1c3 Merge pull request #2745 from kepstin/poll-recording 
Fix poll in recording when there are 0 responders
 2015-08-24 14:49:18 -04:00
Calvin Walton
cc23f30c2b Fix poll in recording when there are 0 responders 
There were a couple of problems:

* A division by 0 when calculating the percentages
* Positioning of the number of results counter was incorrect

Fixes #2739
 2015-08-24 14:42:31 -04:00
Chad Pilkey
2240ff0cd3 added a checkbox for audible chat notifications 2015-08-24 14:34:08 -04:00
Ghazi Triki
b360212612 Custom polling window simplified. 2015-08-24 14:34:08 -04:00
Ghazi Triki
c4d240950f Configuration property enableRaiseHand renamed to enableEmojiStatus. 2015-08-23 16:35:10 +01:00
Fred Dixon
e464edf890 Merge pull request #2742 from ffdixon/update-bbb-conf 
bbb-conf --clean also cleans logs for bbb-apps-akka and bbb-fsesl-akka
 2015-08-22 23:30:17 -04:00
Fred Dixon
49ece78679 bbb-conf --clean also cleans log files for bbb-apps-akka and bbb-fsesl-akka 2015-08-22 23:29:13 -04:00
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
Richard Alam
08f50745ee - revert back to original hand icon 2015-08-22 10:00:31 -04: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