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

10866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
75343449a8 Revert "Updated application lifecycle : the application configuration is loaded before displaying the main application shell, all loaded resources will then be able to access the configuration without any issue." 
This reverts commit b5af206a43.
 2015-07-29 17:59:48 +00:00
Richard Alam
b5c2a0a7e9 Merge pull request #711 from riadvice/lifecycle-update 
Updated application lifecycle: load the configuration before display
 2015-07-29 11:41:56 -04:00
Richard Alam
8a09f6aaf7 Merge pull request #731 from bigbluebutton/pedrobmarin-development-auto-reconnect 
merge auto reconnect feature
 2015-07-28 17:13:21 -04:00
Richard Alam
856029fc2b Merge pull request #730 from ritzalam/fix-webrtc-user-on-reconnect 
- mic icon not showing up beside user's name when reconnect occurs i…
 2015-07-28 17:05:54 -04:00
Richard Alam
335b87b8bf - mic icon not showing up beside user's name when reconnect occurs if user is joined using webrtc 2015-07-28 21:04:18 +00:00
Oleksandr Zhurbenko
aee51542a3 A polling element appears when the poll is published for a current user 2015-07-28 13:25:04 -07:00
Oleksandr Zhurbenko
b07e49b6e2 When there is a poll waiting for a current user, a whiteboard shrinks 2015-07-28 13:21:56 -07:00
Oleksandr Zhurbenko
83ec5b8892 Added Polling related functions to the bbb_api_brigde 2015-07-28 13:14:03 -07:00
Richard Alam
1d3faae800 Merge pull request #728 from ritzalam/keep-track-of-user-connections 
- keep track of user's number of connections to red5 to manage auto-…
 2015-07-28 15:54:38 -04:00
Richard Alam
6297a60b7a - assign a presenter when there is none 2015-07-28 19:53:46 +00:00
Richard Alam
667a619c4a Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:46 +00:00
Richard Alam
2aaf36a0df Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:07 +00:00
Richard Alam
cbca7a9d21 Merge pull request #729 from ritzalam/add-missing-info-to-poll-result-recording 
- poll results recording has missing data required for processing
 2015-07-28 14:51:45 -04:00
Richard Alam
becfad11d6 - poll results recording has missing data required for processing 2015-07-28 18:48:47 +00:00
Chad Pilkey
963affb333 Merge pull request #726 from gthacoder/meteor-client-swipe-gesture 
HTML5 client: horizontal pan gesture on mobile devices.
 2015-07-28 14:35:16 -04:00
Richard Alam
df71d8a689 - keep track of user's number of connections to red5 to manage auto-reconnect 2015-07-28 18:29:00 +00:00
Maxim Khlobystov
9a7e52274e Made the vertical centering of the navbar title work in Firefox. 2015-07-28 14:15:43 -04:00
Oleksandr Zhurbenko
a813298e56 Small corrections 2015-07-27 16:35:27 -07:00
Oleksandr Zhurbenko
10be3d03e0 Added permissions for viewers and a presenter. Viewers can't retreive the total number of votes. Also, viewers can't retreive any data if they have voted already 2015-07-27 15:55:29 -07:00
Maxim Khlobystov
37dcd5f652 Made sure the screen is never darkened when both menus are closed on a mobile device. 2015-07-27 17:28:00 -04:00
Maxim Khlobystov
acc1c3183f Cleaning up (minimized session calls). 2015-07-27 17:21:25 -04:00
Richard Alam
6775aa0ec6 Merge pull request #725 from pedrobmarin/pedrobmarin-development-auto-reconnect 
loading bar and webrtc phone button
 2015-07-27 16:23:57 -04:00
Maxim Khlobystov
fd000912d8 Set the right-hand menu to open/close during a pan gesture. 2015-07-27 16:14:29 -04:00
Richard Alam
1add049668 Merge pull request #724 from ritzalam/fix-webcam-auto-reconnect-issue 
Fix webcam auto reconnect issue
 2015-07-27 16:06:20 -04:00
Pedro Beschorner Marin
5519278153 Merge remote-tracking branch 'bigbluebutton/pedrobmarin-development-auto-reconnect' into pedrobmarin-development-auto-reconnect 2015-07-27 20:03:43 +00:00
Pedro Beschorner Marin
b7580fe814 Closing Flash phone connection if user leaves Flash audio. 2015-07-27 20:02:19 +00:00
Richard Alam
df58235432 - Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into pedrobmarin-development-auto-reconnect 
- fix webcam auto-reconnect issue
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-27 19:58:56 +00:00
Oleksandr Zhurbenko
4288fd19b8 Added handling for 'poll_stopped_message' 2015-07-27 11:23:29 -07:00
Pedro Beschorner Marin
51a7d21ddd We still need this to close the loading bar. Added a control to avoid reconnection exception. 2015-07-27 18:07:41 +00:00
Richard Alam
30d1a86ce2 Merge pull request #722 from ritzalam/log-bbb-video-disconnection 
- do not disconnect when stream has stopped
 2015-07-27 12:02:53 -04:00
Richard Alam
14d6fdcb12 - do not disconnect when stream has stopped 2015-07-27 16:01:05 +00:00
Maxim Khlobystov
c89828c898 Allowed users to click the left hamburger button or apply a pan gesture in any combination. 2015-07-27 11:54:46 -04:00
Richard Alam
1275cbcf89 Merge pull request #721 from ritzalam/log-bbb-video-disconnection 
Log bbb video disconnection
 2015-07-27 11:35:39 -04:00
Richard Alam
3a6c02969e Merge pull request #720 from ritzalam/log-webrtc-failure 
Log webrtc failure
 2015-07-27 11:34:56 -04:00
Richard Alam
d00fcf2da6 - add more logging to see why webcams get disconnected 2015-07-27 15:32:51 +00:00
Richard Alam
662e151524 - log wbertc test failure 2015-07-27 15:30:37 +00:00
Maxim Khlobystov
5675f5bfc0 Added animations to the opacity of the opened menu's background + improved synchronization between opening left-hand menu manually and triggering it with a button. 2015-07-26 21:51:18 -04:00
Oleksandr Zhurbenko
8a45acef92 Added a meetingId and an initial number of votes to the Polls collection 2015-07-26 15:12:08 -07:00
Maxim Khlobystov
4ea901b5dd Made the click event work faster on mobile devices. 2015-07-26 16:03:14 -04:00
Oleksandr Zhurbenko
d48734044a Keeping only the array of id's in the poll info, without any unnecessary parent elements 2015-07-25 20:46:32 -07:00
Maxim Khlobystov
4c38ba1169 Limited the left-hand menu movements to the specific range (fully closed to fully opened) + let the pan gesture work only when it starts very close to the left edge of the screen. 2015-07-25 22:28:01 -04:00
Oleksandr Zhurbenko
48e2bfbc53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
 2015-07-25 19:08:15 -07:00
Ghazi Triki
c03c6519e6 Reverted back JS logging classes because they are used for monitoring. 2015-07-25 12:12:49 +01:00
Fred Dixon
4d40287f54 Merge pull request #719 from capilkey/quick-poll-button 
Added a quick poll button
 2015-07-24 23:05:19 -03:00
Oleksandr Zhurbenko
4a36514338 Improved the way we store a poll object into the collection and added the list of current users there 2015-07-24 16:09:27 -07:00
Chad Pilkey
3be37e99ac added a quick poll button, feedback is appreciated 2015-07-24 18:35:30 -04:00
Maxim Khlobystov
4fbdbefb6c Added the ability to open/close the left-hand menu with a pan gesture on mobile devices. 2015-07-24 18:20:00 -04:00
Richard Alam
6a1a7e796a - make sure we are connected first before vieweing deskshare stream 2015-07-24 19:59:54 +00:00
Oleksandr Zhurbenko
27ca4bacea Made the RegExp recognize URLs in the lines which contains text 2015-07-24 12:11:21 -07:00
Richard Alam
7ee48e9397 - stop desktop sharing when presenter get disconnect from red5/deskshare app 2015-07-24 19:01:27 +00:00