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

10641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Chad Pilkey
3be37e99ac added a quick poll button, feedback is appreciated 2015-07-24 18:35:30 -04:00
Richard Alam
6a1a7e796a - make sure we are connected first before vieweing deskshare stream 2015-07-24 19:59:54 +00: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
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
b7b88dfa8b Prevented the whiteboard-chat border from harsh shifting due to the whiteboard's minimum width. 2015-07-22 18:32:10 -04:00
Maxim Khlobystov
eaa8fda2c0 Set the client to monitor the content of the textarea and adjust its height while resizing the userlist/whiteboard/chat horizontally. 2015-07-22 17:25:46 -04:00
Maxim Khlobystov
7c02dc4f81 Allowed users to change horizontal proportion between the whiteboard and chat. 2015-07-22 17:15:20 -04:00
Maxim Khlobystov
c0af831e77 Made the userlist menu horizontally resizable in landscape mode. 2015-07-22 16:34:15 -04:00
Maxim Khlobystov
a398426917 Made the automatic resizing of the chat input area work after opening/closing a private chat (template containing the textarea is rerendered every time, so the event handler needs to be reapplied). 2015-07-21 17:47:05 -04:00
Maxim Khlobystov
0a386ce67e Finished up the work on automatically resizing the chat input area based on its content. 2015-07-21 16:59:25 -04:00
Maxim Khlobystov
552b86e9bc Beginning work on making the manual and automatic methods of the message box resizing work together properly. 2015-07-20 18:23:51 -04:00
Maxim Khlobystov
63d51bc437 Made the chat input box resizable vertically. 2015-07-19 20:34:07 -04:00
Maxim Khlobystov
148d533c38 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-resizable-elements 2015-07-19 15:25:59 -04:00
Chad Pilkey
dce6edfe32 Merge pull request #708 from OZhurbenko/meteor-ui 
Notifications and other fixes
 2015-07-18 21:57:50 -04:00
Oleksandr Zhurbenko
da4ea8d38b Cleanup 2015-07-18 18:33:02 -07:00
Fred Dixon
7f611d1d44 Merge pull request #707 from capilkey/update-polling-modal 
Update polling modal
 2015-07-17 18:19:47 -04:00
Chad Pilkey
be9971c2cd fixed the weird colouring in the TitleWindow headers and removed uneeded duplication in CSS 2015-07-17 18:06:11 -04:00
Chad Pilkey
387c0770e3 added some extra content to the PollResultsModal 2015-07-17 18:05:29 -04:00
Oleksandr Zhurbenko
760ceef08b Switched notifications to counters, added the styling for notifications for desktop views 2015-07-17 14:50:49 -07:00
Maxim Khlobystov
f063e0bf92 Tied the height of message input to its content. 2015-07-16 19:01:54 -04:00
Oleksandr Zhurbenko
291f0d8847 Replaced icons to the status column, removed outline from switching slide buttons, increased space for usernames 2015-07-16 14:09:46 -07:00