BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,959 Commits 13 Branches 260 Tags 1.1 GiB
25834dd4f8
Commit Graph

21959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghazi Triki
337c260bcf Globally catch any unhandled exception. 2018-06-07 18:11:38 +01:00
James Jung
97deeb67bd Fix indentations 2018-06-07 12:20:41 -04:00
Anton Georgiev
d8372fa2a2 cleanup 2018-06-07 16:13:20 +00:00
Anton Georgiev
5976ef8345 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-breakouts-url 2018-06-07 15:59:24 +00:00
Anton Georgiev
bbaca66e94 adjust to handle redirectURL being overwritten 2018-06-07 15:59:06 +00:00
Anton Georgiev
eb7a49f142 renamed noRedirect* to redirectToHtml5* 2018-06-07 15:59:06 +00:00
Anton Georgiev
a77ee38741 make breakout url for html5 and use it 2018-06-07 15:59:06 +00:00
Anton Georgiev
c5c4562b98
Merge pull request #5646 from antobinary/document-title-3 
Make HTML5 client title the same format as Flash client (to include meeting name)
 2018-06-07 11:53:51 -04:00
Anton Georgiev
78b84b981d remove conflicting setting of document.client 2018-06-07 15:18:39 +00:00
Anton Georgiev
21dcb0eaeb html5 client title - same format as Flash client 2018-06-07 15:18:11 +00:00
Chad Pilkey
13da7042b3 add option to save user names to a file to gear button 2018-06-06 16:17:57 -07:00
Anton Georgiev
e7a4ad2a92
Merge pull request #5616 from BobakOftadeh/pulse-animation 
Pulse animation added to the avatar when the user is talking.
 2018-06-06 16:30:12 -04:00
Chad Pilkey
d04610a237
Merge pull request #5644 from riadvice/exceptions-fixes 
Fix flash null exceptions
 2018-06-06 15:28:38 -04:00
Chad Pilkey
07d75b4205
Merge pull request #5640 from riadvice/2.0.x-release-fixes 
Put focus on PollResultsModal when it shows to avoid changing slides
 2018-06-06 13:06:30 -04:00
Bobak Oftadeh
5ef6bab9a5 Pulse animation added to the avatar and audio controls when the user is talking. 2018-06-06 09:50:22 -07:00
Ghazi Triki
28e67148ad Fix flash null exceptions. 2018-06-06 17:23:48 +01:00
James Jung
46e0d333ea Adjust variable initializations' places according to other merged updates 2018-06-06 12:12:43 -04:00
James Jung
95cc33d713 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into adj-partList-chatModule-width 2018-06-06 11:53:27 -04:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
KDSBrowne
bc6e44de7b add data-isopen attribute / remove firstChild 2018-06-06 04:47:54 +00:00
James Jung
c676d582d3 Make chat module resizable operation more reasonable 2018-06-05 15:08:49 -04:00
Anton Georgiev
a1cac0bfb9
Merge pull request #5639 from oswaldoacauan/disable-resize-mobile 
Tested too on Android - seems fine in both normal and full-screen modes
 2018-06-05 13:14:25 -04:00
Oswaldo Acauan
34dcad8cd6 Fix navbar being hidden on mobile in some cases. Closes #5568 2018-06-05 11:17:07 -03:00
Ghazi Triki
acc9c2006a Put focus on PollResultsModal when it shows to avoid changing slides. 2018-06-05 14:59:28 +01:00
Chad Pilkey
1001cc1ecd
Merge pull request #5638 from capilkey/show-individual-votes 
Improve the PollResultsModal spacing and sort
 2018-06-04 19:13:16 -04:00
Chad Pilkey
ca66c177e9 improve PollResultsModal sorting 2018-06-04 16:08:27 -07:00
Oswaldo Acauan
fb04db7b54 Fix current width calc 2018-06-04 16:43:54 -03:00
Chad Pilkey
6f1884ed1c update PollResultsModal spacing and grid header text 2018-06-04 12:37:53 -07:00
Oswaldo Acauan
a5d173a1f2 Remove redirect on resize and update userlist compact based on its width 2018-06-04 16:11:11 -03:00
Oswaldo Acauan
7bf922c87b Disable resizing of userlist and chat for mobile 2018-06-04 15:56:09 -03:00
Oswaldo Acauan
6922ab1c70 Disable resizing of userlist and chat for mobile 2018-06-04 15:44:23 -03:00
Augusto Bennemann
6f16948824 webRTC video stats: fetch stats on VideoListItem 2018-06-04 13:53:41 -03:00
prlanzarin
eb1a677b75 Only logging SFU errors at top level, added trace log level for intermediate stack debug 2018-06-04 16:14:38 +00:00
prlanzarin
d9f48afb5e Merge remote-tracking branch 'upstream/v2.0.x-release' into error-handling-sfu 2018-06-04 15:50:46 +00:00
Fred Dixon
f0ab539e33
Merge pull request #5633 from riadvice/record-window-position 
Put back recording window under the recording button
 2018-06-04 11:42:50 -04:00
prlanzarin
0ffe7e9dfb Some refactor to screenshare start procedures 2018-06-04 15:29:30 +00:00
prlanzarin
556b2c006b Added failover to prevent hanging processes in SFU 2018-06-04 15:08:42 +00:00
prlanzarin
bccb8d51a8 Fixed bitrate methods and ICE calls in screenshare 2018-06-04 15:07:20 +00:00
Ghazi Triki
b5a66652ed Put back recording window under the recording button. 2018-06-04 16:02:58 +01:00
Richard Alam
4645c7c920
Merge pull request #5632 from riadvice/chat-scroll 
Fix chat ribbon flickering when a lot of messages are arriving
 2018-06-04 10:44:37 -04:00
Ghazi Triki
a6e239c875 Show new chat messages ribbon only if no scrolling is to be expected. 2018-06-04 15:02:17 +01:00
Fred Dixon
1668b60069
Merge pull request #5628 from capilkey/show-individual-votes 
Add a table showing individual votes in the PollResultsModal
 2018-06-02 08:00:53 -04:00
Chad Pilkey
f7a5f675b6 add a table showing individual votes in the PollResultsModal 2018-06-01 16:06:49 -07:00
Richard Alam
4114dc58dc Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2018-06-01 13:15:24 -07:00
Richard Alam
afe236d68d Merge branch 'riadvice-chat-scroll' into v2.0.x-release 2018-06-01 13:14:38 -07:00
Richard Alam
17b66b9b97 Merge branch 'chat-scroll' of https://github.com/riadvice/bigbluebutton into riadvice-chat-scroll 2018-06-01 12:59:00 -07:00
Anton Georgiev
10dc48413d
Merge pull request #5626 from antobinary/configurable-title 
Make window title configurable (part of Branding)
 2018-06-01 15:47:54 -04:00
Anton Georgiev
1b755bfb24 make window title configurable 2018-06-01 18:31:41 +00:00
KDSBrowne
af3d7208d9 rework code to prevent race condition / removes need for setTimeout 2018-06-01 09:05:18 -07:00
Fred Dixon
02992e6787
Merge pull request #5611 from KDSBrowne/fix/user-item-menu-items 
Fix User-item menu options not being triggered
 2018-06-01 06:45:28 -04:00