BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,592 Commits 13 Branches 260 Tags 1.1 GiB
9e9e85cddb
Commit Graph

20592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
a8bab253db Merge branch 'riadvice-recording-message' into v2.0.x-release 2018-06-11 10:50:00 -07:00
Ghazi Triki
718d65f30b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into recording-message 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml
 2018-06-11 18:33:27 +01:00
Anton Georgiev
338ab210b8
Merge pull request #5663 from antobinary/breakouts-improvements-2 
Breakouts improvements in HTML5
 2018-06-11 13:32:28 -04:00
Richard Alam
9e623fded8
Merge pull request #5662 from ritzalam/deploy-scripts 
- some dev scripts to build bbb-voice and bbb-video
 2018-06-11 13:17:58 -04:00
Richard Alam
1de74a6153 Merge branch 'riadvice-global-exception-catcher' into v2.0.x-release 2018-06-11 10:13:01 -07:00
Anton Georgiev
e2138e6d3d cleanup 2018-06-11 16:10:03 +00:00
Anton Georgiev
de7977122c fix incorrectly picked breakout expiration time 2018-06-11 16:05:53 +00:00
Anton Georgiev
827eb7425e Meeting expiration was picked before breakout exp 
resulting in keeping of the client tab open at end-of-meeting page
 2018-06-11 16:05:53 +00:00
Anton Georgiev
fd563c2577 make default breakouts expiration time 15 mins, not 15 sec 2018-06-11 16:05:53 +00:00
Richard Alam
f7f291e70e Merge branch 'global-exception-catcher' of https://github.com/riadvice/bigbluebutton into riadvice-global-exception-catcher 2018-06-11 08:52:08 -07:00
Richard Alam
fb6302fb79 Merge branch 'riadvice-popups-style' into v2.0.x-release 2018-06-11 08:50:59 -07:00
Richard Alam
9c776579c4 Merge branch 'popups-style' of https://github.com/riadvice/bigbluebutton into riadvice-popups-style 2018-06-11 08:33:52 -07:00
Richard Alam
fd652e84e0 - some dev scripts to build bbb-voice and bbb-video 2018-06-11 08:31:41 -07:00
Fred Dixon
2d27fd52cc
Merge pull request #5655 from riadvice/haitian-locale 
Add Haitian locale to flash client
 2018-06-11 10:10:47 -04:00
Ghazi Triki
9b274dd1f8 Fix locale Haitian Creole name. 2018-06-11 15:09:43 +01:00
Ghazi Triki
e5e0bdcd21 Switch LogoutWindow confirmation buttons order. 2018-06-11 15:04:48 +01:00
Ghazi Triki
fd91ed72e1 Fixed locale typo. 2018-06-11 11:29:24 +01:00
Ghazi Triki
4fdc77f2a5 Make sytle consistent for popups and buttons. 2018-06-09 00:07:37 +01: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
Tainan Felipe
39399fc235 revert unread counter for count by messages 2018-06-08 15:40:35 -03:00
Anton Georgiev
e4978983ba
Merge pull request #5422 from gutobenn/webrtc_stats 
WebRTC video statistics
 2018-06-08 14:35:16 -04:00
prlanzarin
1f50746c91 Revert pt_BR locales 2018-06-08 18:29:36 +00: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
Ghazi Triki
1a9374f19d Add Haitian locale to flash client. 2018-06-08 14:02:42 +01:00
Fred Dixon
63c23c1384
Merge pull request #5652 from riadvice/bigger-timer 
Bigger recording timer label & sync recording label with locale
 2018-06-08 06:08:27 -04:00
Ghazi Triki
dc5ff6e2b4 Bigger recording timer label & sync recording label with locale 2018-06-08 10:21:39 +01:00
Ghazi Triki
ec29839034 Add new reportErrorsInUI to config.xml 2018-06-07 18:49:32 +01:00
Maxim Khlobystov
ffb0357d7a
Merge pull request #5647 from antobinary/fix-breakouts-url 
Breakout rooms - join by following server-provided url to html5 client
 2018-06-07 13:49:32 -04:00
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
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