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

11029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
150e6560b1 Merge pull request #2800 from ffdixon/update-index 
Added Chat, Emoji, and Polling to index page
 2015-09-23 17:01:51 -04:00
Fred Dixon
2051913359 Added Chat, Emoji, and Polling to index page 2015-09-23 17:00:26 -04:00
Fred Dixon
0f99dfe603 Merge pull request #2798 from bigbluebutton/ffdixon-patch-3 
Update bbb-conf
 2015-09-22 14:51:34 -04:00
Fred Dixon
ddc473105d Update bbb-conf 
Remove reference to rtmps
 2015-09-22 14:51:23 -04:00
Fred Dixon
3c7236b909 Merge pull request #2797 from capilkey/investigate-locking-more 
Force MediaItemRenderer to update
 2015-09-21 17:51:10 -04:00
Chad Pilkey
77c9c660d2 Merge pull request #2796 from ritzalam/fix-lock-settings 
- make lock settings behave like in 0.9
 2015-09-21 17:25:46 -04:00
Chad Pilkey
e9c0eb23cd rename bbb-client in .project file for better importing 2015-09-21 14:13:32 -07:00
Chad Pilkey
15a2ade0aa Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more 2015-09-21 13:50:44 -07:00
Chad Pilkey
d0366b2fba Make sure PhoneOptions are initialized before using 2015-09-21 13:46:16 -07:00
Chad Pilkey
6377f86ca1 make sure the user item renderers update when locking changes 2015-09-21 13:45:18 -07:00
Chad Pilkey
a736008046 fix locking being reversed 2015-09-21 13:44:23 -07:00
Richard Alam
11fbefb5ef - make lock settings behave like in 0.9 2015-09-21 20:42:04 +00:00
Richard Alam
1f5a7f5fc7 Merge pull request #2794 from ritzalam/fix-issue-where-users-hang-around 
Fix issue where users hang around
 2015-09-21 10:45:23 -04:00
Richard Alam
8ede5983ea - do not re-inject message into the actor but instead process the message inline to prevent 
race condition where a message gets processed before the injected message
 2015-09-21 14:42:07 +00:00
Richard Alam
878684b919 Merge branch 'change-logging-format' into fix-issue-where-users-hang-around 2015-09-21 13:56:06 +00:00
Richard Alam
5a986f5bc6 - change logging format 2015-09-21 13:55:23 +00:00
Richard Alam
1b8cb41152 - initialize voice user properly when disconnected from global audio 2015-09-17 20:26:00 -04:00
Ghazi Triki
920fc97532 Merge branch 'master' into client-logging-to-server 2015-09-16 21:11:33 +01:00
Richard Alam
c13e17a7d4 Merge pull request #2770 from riadvice/chat-message-limit 
Add a maximum allowed length to chat message
 2015-09-16 15:04:26 -04:00
Ghazi Triki
07d7f389c1 Logging format can be configured in flex client application. 2015-09-16 18:55:09 +01:00
Richard Alam
cc5c26b0bc Merge pull request #2785 from ritzalam/log-flash-capabilities 
Log flash capabilities
 2015-09-16 10:39:52 -04:00
Richard Alam
899b98f81b Merge pull request #2780 from riadvice/puffin-browser 
Enable video and audio sharing for Puffin browser 4.6 and above.
 2015-09-15 16:12:25 -04:00
Richard Alam
2bea0c778c - clean-up by removing some debug logs 2015-09-15 20:04:06 +00:00
Richard Alam
99569d7a2b - log flash player capabilities to aid us in debugging issues 2015-09-15 19:20:36 +00:00
Richard Alam
8afb3b8edf - clean up by removing some logs 2015-09-15 19:20:09 +00:00
Richard Alam
e24b8c7cbe Merge pull request #2781 from riadvice/pepperflash-webcam-fix 
Microphone name automatically set under Pepper flash before getting the browser permission.
 2015-09-15 10:52:43 -04:00
Richard Alam
1eac9dc709 Merge pull request #2783 from ritzalam/capilkey-fix-lock-settings 
fix lock settings
 2015-09-15 10:40:03 -04:00
Richard Alam
92aa4b9aef Merge pull request #2782 from antobinary/master 
html5client: [un]mute message was not going to the correct redis channel
 2015-09-15 10:39:32 -04:00
Richard Alam
643e7b7087 - cleanup 2015-09-15 14:38:41 +00:00
Richard Alam
2278ee01ec - upgrade bbb-commons-message version 2015-09-14 21:45:55 +00:00
Richard Alam
bbfbdf20e9 - cleanup 2015-09-14 21:25:27 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Anton Georgiev
233707395a limit flooding logs 2015-09-14 19:56:25 +00:00
Anton Georgiev
d7e414fa43 [un]mute message was not going to the correct redis channel 2015-09-14 19:55:04 +00:00
Richard Alam
247239caeb Merge branch 'figure-out-why-lock-settings-not-working' into capilkey-fix-lock-settings 2015-09-14 15:51:15 +00:00
Richard Alam
8514eec3ba Merge branch 'remove-java-warning-chrome' of https://github.com/capilkey/bigbluebutton into capilkey-fix-lock-settings 2015-09-14 14:21:20 +00:00
Ghazi Triki
405840edc4 Microphone name automatically set under Pepper flash before getting the browser permission. 2015-09-12 13:31:02 +01:00
Ghazi Triki
65f1b72294 Enable video and audio sharing for Puffin browser 4.6 and above. 2015-09-12 12:35:12 +01:00
Chad Pilkey
51650fb998 made the init audio and permissions message payloads actually contain something and corrected chatpermission message names 2015-09-11 15:02:28 -07:00
Chad Pilkey
e364a8c130 correct the vote counts in the accessbile poll message 2015-09-11 15:00:14 -07:00
Chad Pilkey
5eba1622ac remove an unused variable in the poll graphics 2015-09-11 14:59:52 -07:00
Richard Alam
85bf849221 Merge pull request #2778 from ritzalam/client-to-server-logging 
Client to server logging
 2015-09-11 16:27:11 -04:00
Richard Alam
571254f75c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-to-server-logging 2015-09-11 14:40:07 +00:00
Chad Pilkey
c7111089dc Merge pull request #2777 from OZhurbenko/meteor-ui 
Whiteboard optimization
 2015-09-10 18:31:29 -04:00
Oleksandr Zhurbenko
41c453c470 cleanup 2015-09-10 15:09:55 -07:00
Oleksandr Zhurbenko
d208da2c31 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-09-10 15:01:09 -07:00
Oleksandr Zhurbenko
2feabdc65b Fixed a bug with whiteboard's width in case when poll controllers appeared 2015-09-10 14:50:38 -07:00
Richard Alam
cfa6e30b23 Merge branch 'master' into client-to-server-logging 2015-09-10 17:52:58 +00:00
Richard Alam
977d4ba081 Merge pull request #2773 from ritzalam/update-locales 
- pulling locales from transifex (sept 10, 2015)
 2015-09-10 13:42:23 -04:00
Richard Alam
df19e44bc3 Merge pull request #2774 from kepstin/mixed-content 
Use protocol-relative links to load the 'get flash' button image
 2015-09-10 13:33:58 -04:00