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

11143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Alam
0c197b2a4b Merge pull request #718 from pedrobmarin/pedrobmarin-development-auto-reconnect 
Added localization
 2015-07-24 13:30:08 -04:00
Pedro Beschorner Marin
20085e0f3b Merge remote-tracking branch 'origin/auto-reconnect' into pedrobmarin-development-auto-reconnect 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
 2015-07-24 13:25:25 -03:00
Richard Alam
9ef59a41c6 - fix client exception 2015-07-24 16:13:17 +00:00
Richard Alam
bad00ed7c1 Merge branch 'development' into pedrobmarin-development-auto-reconnect 2015-07-24 16:01:04 +00:00
Pedro Beschorner Marin
24619cad08 Added localization and testing parenting in Loading window 2015-07-24 16:00:59 +00:00
Richard Alam
27c8b521fb - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-07-24 16:00:30 +00:00
Richard Alam
4b552329d7 Revert " - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953" 
This reverts commit 94df500ba6.
 2015-07-24 15:59:42 +00:00
Richard Alam
94df500ba6 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-07-24 15:35:39 +00:00
Richard Alam
9b9d291117 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-24 14:27:20 +00:00
Richard Alam
f9f8fdc345 Merge pull request #709 from gthacoder/meteor-client-resizable-elements 
HTML5 client: resizable layout.
 2015-07-24 10:25:45 -04:00
Oleksandr Zhurbenko
12b34cc8fb Applied a new URL regex 2015-07-23 18:07:26 -07:00
Richard Alam
489fcca544 Merge pull request #717 from ritzalam/investigate-oom-issue-in-bbb-web 
- removing extensions element from getRecordings call. See if this i…
 2015-07-23 17:36:36 -04:00
Richard Alam
514055cf14 - removing extensions element from getRecordings call. See if this is causing memory to hang around. 2015-07-23 21:27:06 +00:00
Richard Alam
d63b54d291 Merge branch 'development' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-development 2015-07-23 19:45:19 +00:00
Pedro Beschorner Marin
1eef689a0a Cleanup 2015-07-23 19:08:06 +00:00
Pedro Beschorner Marin
b1ccea37a1 Merge branch 'auto-reconnect' into development 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-23 18:44:21 +00:00
Richard Alam
7997d8b511 Merge pull request #713 from capilkey/translate-poll-answers 
Translate poll answers
 2015-07-23 13:25:11 -04:00
Chad Pilkey
abab8c3e3b added an accessible poll results chat message 2015-07-23 13:06:46 -04:00
Chad Pilkey
be0e43baa2 translate the poll answers 2015-07-23 13:06:09 -04:00
Maxim Khlobystov
b44385d866 Minor UI fixes: disabled the blue border highlight on focused hamburder button + centered the navbar title vertically. 2015-07-23 08:14:41 -04:00
Ghazi Triki
a4d243b202 Added TabIndexer class for automating tab indexation. 2015-07-23 13:02:32 +01:00
Oleksandr Zhurbenko
80ff67b6f2 First prototype of the functions for polls 2015-07-22 20:31:08 -07:00
Maxim Khlobystov
b7b88dfa8b Prevented the whiteboard-chat border from harsh shifting due to the whiteboard's minimum width. 2015-07-22 18:32:10 -04:00