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

3136 Commits

Author SHA1 Message Date
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07:00
Anton Georgiev
deeec76c6f
Merge pull request #5511 from musickiper/adj-partList-chatModule-width 
Adjust default width in the style sheet of participants list and chat module
 2018-06-08 15:54:53 -04:00
James Jung
c9cb37cf52 seperate settings of resizable tags' enable attribute of userList and chat 2018-06-08 15:37:43 -04:00
James Jung
bc6b1bb092 Fix comments for userList and chat width 2018-06-08 15:00:13 -04:00
James Jung
01d703e9f1 Fix indentations 2018-06-08 14:53:15 -04:00
Anton Georgiev
e4978983ba
Merge pull request #5422 from gutobenn/webrtc_stats 
WebRTC video statistics
 2018-06-08 14:35:16 -04:00
Anton Georgiev
fc92889665
Merge pull request #5620 from KDSBrowne/fix/user-item-menu-items 
Removes need for setTimeout to prevent User-list menu items not activating
 2018-06-08 13:52:11 -04:00
Anton Georgiev
81a6b877b9
Merge pull request #5591 from KDSBrowne/edit/config/locale 
Improve html5 locale fallback selection
 2018-06-08 13:51:53 -04:00
prlanzarin
6f78cf057c Merge remote-tracking branch 'gutobenn/webrtc_stats' into webrtc_stats 2018-06-08 16:36:41 +00: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
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
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
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
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
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
Oswaldo Acauan
34dcad8cd6 Fix navbar being hidden on mobile in some cases. Closes #5568 2018-06-05 11:17:07 -03:00
Oswaldo Acauan
fb04db7b54 Fix current width calc 2018-06-04 16:43:54 -03: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
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
Anton Georgiev
cd4b8bc6fc
Merge pull request #5573 from gutobenn/disable-screenshare-safari 
Display a toast for screensharing not supported by Safari
 2018-05-31 16:49:09 -04:00
KDSBrowne
87c8917d8b fix user-item menu options not working 2018-05-30 11:20:42 -07:00
Anton Georgiev
e1d88e8817
Merge pull request #5539 from Tainan404/issue-5471 
Disable yes button on echo-test when clicked.
 2018-05-30 12:27:10 -04:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb 
Whiteboard and Cursor performance update
 2018-05-30 11:42:52 -04:00
Oswaldo Acauan
0eb4752818 Clean up 2018-05-30 11:19:19 -03:00
KDSBrowne
f57d5f265a change condition check in if statment 2018-05-30 06:09:33 -07:00
KDSBrowne
ef9c479523 remove usless map() 2018-05-30 06:07:25 -07:00
KDSBrowne
b3a6de7dda make reducer not act as a loop 2018-05-30 05:39:02 -07:00
KDSBrowne
4ed7b4cb46 put path to available locales in a const 2018-05-30 05:23:05 -07:00
Anton Georgiev
f13d37867e
Merge pull request #5601 from BobakOftadeh/ui-userlist-changes 
User list UI changes implemented
 2018-05-29 16:41:20 -04:00
Anton Georgiev
0aa7d5274e
Merge pull request #5595 from lfzawacki/better-video-stability 
[html5] Better video pausing, connection, re-connecting and stability
 2018-05-29 16:40:52 -04:00
Anton Georgiev
e7ef85bdf7
Merge pull request #5507 from KDSBrowne/xx.fix-dropdown-key-functionality-alt01 
Improve userlist dropdown menu key-board functionality
 2018-05-29 15:49:46 -04:00
Bobak Oftadeh
136fa72a7e User list UI changes implemented 2018-05-29 12:23:13 -07:00
Lucas Fialho Zawacki
665773ece0 Small naming fixes in visibility events and attachStream function 2018-05-29 18:54:01 +00:00
Lucas Fialho Zawacki
cb5022681d Catch exceptions on video tag play 2018-05-29 17:51:50 +00:00
KDSBrowne
97b5d4dbc9 remove cx() and its import 2018-05-29 07:48:53 -07:00
Anton Georgiev
06ad7805a4
Merge pull request #5583 from antobinary/adjust-api 
Revert special api changes made for html5 client
 2018-05-28 17:46:30 -04:00
Anton Georgiev
4be7323f3e
Merge pull request #5584 from BobakOftadeh/iOS-Model-Warning 
Warning modal now displays for iOS Chrome users
 2018-05-28 17:11:06 -04:00
KDSBrowne
4f2541c957 remove condition in cx() 2018-05-28 13:16:37 -07:00