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

9777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
1bc477e297 - pass external meeting id in client logs 2015-03-23 19:41:45 +00:00
Richard Alam
e285315b41 Merge pull request #580 from kepstin/recording-merge-fix 
Recording: Fix video EDL merge function on EDLs with recording marks applied
 2015-03-23 11:47:09 -04:00
Calvin Walton
694213cf9b Recording: Fix video EDL merge function on EDLs with recording marks applied 
If the video EDL merge function is applied to an EDL that has already
been edited to apply recording marks, the merge function will change the
video start times to incorrect values on edit points during the timestamp
recalculation.

The fix is pretty simple; just pull in the timestamps from the entry that's
being merged in and apply them to the relevant videos.

This bug doesn't currently cause any issues in the BigBlueButton recording
scripts, since the existing code does the merge before the start/stop marks
are applied. But to avoid surprises later, it would be good to fix this.
 2015-03-23 11:10:43 -04:00
Fred Dixon
0580bfc30f Merge pull request #579 from gthacoder/meteor-client-joined-audio-notification 
HTML5 client: toast notification appearing when user joins the audio.
 2015-03-22 09:21:52 -04:00
Maxim Khlobystov
55090b7995 Added toast notifications appearing when user joins the audio. 2015-03-21 19:14:06 -07:00
Richard Alam
0ebb9af789 Merge pull request #578 from mconf/meeting-created-params-master 
Adding more data to bbb-apps event meeting_created_message
 2015-03-20 18:38:58 -04:00
Chad Pilkey
6bd3c4d1f4 Merge pull request #570 from BBBManager/bbb-lock-settings 
Bbb lock settings
 2015-03-20 13:09:17 -04:00
Felipe Cecagno
71313059e0 Merge branch 'meeting-created-params' into meeting-created-params-master 2015-03-20 12:39:17 -03:00
Mateus Dalepiane
85497ea6c3 Adding information to the event "meeting_created_message" 
The following information was added:
+ moderator_pass (Moderator password)
+ viewer_pass (Viewer password)
+ create_time (Create time)
+ create_date (Create date)
 2015-03-20 12:32:43 -03:00
Mateus Dalepiane
514f2b928d Adding information to create_meeting_request event [Bug #1429] 
This information is necessary so bbb-apps can send with the
meeting_created_message event
 2015-03-20 12:32:43 -03:00
Oleksandr Zhurbenko
5a167f362c Fixed issue 1889, added checking for an empty username and removing trailing and leading whitespaces 2015-03-19 16:51:56 -07:00
Maxim Khlobystov
a61d945389 Disabled the tooltips on mobile devices. 2015-03-19 14:57:50 -07:00
Maxim Khlobystov
1c2865e426 Rearranged the push menu icons so that they are in the same order as the vertically displayed list of panels. 2015-03-19 14:46:46 -07:00
Maxim Khlobystov
e905f561c5 Removed the unused Handlebars helper. 2015-03-19 14:38:37 -07:00
Maxim Khlobystov
7f833dda82 Made sure the push menu element is always created on mobile devices regardless of the orientation user chooses to enter the client in (to prevent the situations when the menu can't be opened because it doesn't exist). 2015-03-19 14:36:03 -07:00
Anton Georgiev
ac55b05a06 meteor update to 1.0.4.1 2015-03-19 15:07:16 +00:00
Anton Georgiev
144ffcef64 added a default option so that the dropdown event is triggered with even in a 2 people meeting 2015-03-19 14:59:15 +00:00
Fred Dixon
423ffdeffa Merge pull request #572 from bigbluebutton/fix-issue-1898 
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1898
 2015-03-18 19:54:23 -04:00
Fred Dixon
ef274f1f22 Merge pull request #569 from gthacoder/meteor-client-notifications 
HTML5 client: fix for WebRTC browser support notifications.
 2015-03-18 19:53:34 -04:00
Fred Dixon
c4d50d59dc Merge pull request #574 from capilkey/add-ready-notification 
Added a 'ready' notification when the client starts up for screen readers
 2015-03-18 19:53:09 -04:00
Fred Dixon
b214de3d2c Merge pull request #575 from capilkey/fix-webrtc-null-errors 
check for null before calling UA.stop()
 2015-03-18 19:52:57 -04:00
Chad Pilkey
afb5787941 check for null before calling UA.stop() 2015-03-18 15:36:29 -07:00
Chad Pilkey
c5e0436204 added a 'ready' notification when the client starts up for screen readers 2015-03-18 14:21:01 -07:00
Richard Alam
3e0af81aed Merge pull request #573 from kepstin/fix-beta-recording-update-script 
Fix beta recording update script
 2015-03-18 14:58:20 -04:00
Calvin Walton
e75bb15ad0 Fix beta recording update script 
It had some leftover debug code that caused it to only convert the
first 10 recordings instead of all of them.

The name of the '.done' file is changed so the update will be re-run
automatically.
 2015-03-18 14:56:00 -04:00
Richard Alam
acc58d250f - lower log level when not able to load html5 client 2015-03-18 18:19:55 +00:00
Richard Alam
e1d66c9e15 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1898 2015-03-18 17:51:40 +00:00
Fred Dixon
fe7c138fd4 Merge pull request #571 from antobinary/options-reorganize 
html5client: Options reorganize
 2015-03-17 18:36:53 -04:00
Anton Georgiev
8743ec75b1 clean tab height 2015-03-17 22:12:04 +00:00
Anton Georgiev
7ccbb38303 styling Options in portrait 2015-03-17 20:17:50 +00:00
Anton Georgiev
a068f8e470 private chat user pick from dropdown 2015-03-17 19:34:34 +00:00
Anton Georgiev
cb0eea2899 display a sample of the font-size 2015-03-17 14:57:40 +00:00
Anton Georgiev
4e08129191 font size -/+ control 2015-03-17 13:45:49 +00:00
Tiago Daniel Jacobs
8b429dcaa6 Process lock event for all users to make the UI consistent. 2015-03-16 20:44:27 +00:00
Tiago Daniel Jacobs
44e387b2dd Merge remote-tracking branch 'bbboficial/master' into bbb-lock-settings 2015-03-16 20:04:32 +00:00
Tiago Daniel Jacobs
64e72e9934 Fixed visibility of viewers locked label for a empty room with lockOnJoin false. 2015-03-16 20:03:56 +00:00
Oleksandr Zhurbenko
8ba30a585a Misprint fixed 2015-03-16 19:14:18 +00:00
Oleksandr Zhurbenko
f0cb2013a8 Fixed a bug when a client didn't set a proper default font size, when a user entered from a mobile device in landscape view 2015-03-16 19:14:06 +00:00
Oleksandr Zhurbenko
cbaa112f79 Improved code reuse 2015-03-16 19:13:55 +00:00
Tiago Daniel Jacobs
3c5ba8c5b9 Changing template to include the muteOnStart option 2015-03-16 18:06:41 +00:00
Maxim Khlobystov
f6de805f26 Fixed the issue with Firefox notified as not supporting WebRTC. 2015-03-15 19:03:31 -07:00
Fred Dixon
aa1158bc9d Merge pull request #568 from gthacoder/meteor-client-notifications 
HTML5 client: WebRTC support notifications + push menu update.
 2015-03-14 22:50:23 -04:00
Maxim Khlobystov
8e81f00155 Fixed the issue with blocked scrolling after zooming with the push menu opened. 2015-03-14 19:37:43 -07:00
Maxim Khlobystov
daf158c127 Cleaning up and adding some comments. 2015-03-14 19:31:01 -07:00
Maxim Khlobystov
da77337567 Made the content of the WebRTC-related notifications custom depending on the browser that is being used. 2015-03-14 19:25:49 -07:00
Maxim Khlobystov
792c88cf2a Created notifications for the browsers that don't support WebRTC. 2015-03-14 19:08:34 -07:00
Fred Dixon
dd9cdbf2f0 Merge pull request #567 from bigbluebutton/upload-locales-mar-13-2015 
- update locales
 2015-03-13 18:30:12 -04:00
Richard Alam
3c73519ec3 - update locales 2015-03-13 15:18:11 -07:00
Fred Dixon
d3ec15376e Update bbb-conf 
Change method to detect whether HTML5 server (specifically meteor) is running.
 2015-03-13 17:53:58 -04:00
Fred Dixon
d40fe78664 Merge pull request #566 from antobinary/fix-logouturl 
html5client: fix for logoutURL
 2015-03-13 17:33:36 -04:00