Commit Graph

9765 Commits

Author SHA1 Message Date
perroned
09341689b6 Handlers for listen only dialog and UI 2015-03-31 12:36:16 -07:00
perroned
61f0f97517 Toggling for listen only 2015-03-31 12:35:37 -07:00
perroned
4e1ad3b42a Added extra field allowing for listen only 2015-03-31 12:35:09 -07:00
perroned
1316acba11 Allow HTML5 client to call into conference using listen only 2015-03-30 08:50:51 -07:00
perroned
79d59b2dbc Pass listen only field to BBB.joinVoiceConference 2015-03-30 08:50:10 -07:00
Richard Alam
2388a72198 Merge pull request #591 from bigbluebutton/update-locales-mar-27-2015
- update locales
2015-03-27 18:00:09 -04:00
Richard Alam
1d32fb7dc4 - update locales 2015-03-27 21:58:21 +00:00
Richard Alam
5766a973ee Merge pull request #590 from capilkey/improve-chat-sending
Improve chat sending
2015-03-27 17:37:55 -04:00
Chad Pilkey
6c6e092402 increase height of text in audio windows so it doesn't get cut off 2015-03-27 14:33:49 -07:00
Chad Pilkey
3245934d15 prevent enter from going into the input box 2015-03-27 14:33:15 -07:00
Chad Pilkey
3b5ab7cbbe improved the chat url regex 2015-03-27 14:32:27 -07:00
Fred Dixon
9270d01984 Merge pull request #576 from antobinary/options-rearrange-fix
html5client:chat options fix + Meteor update
2015-03-27 14:14:19 -04:00
Fred Dixon
0a9bf5d9b3 Merge pull request #577 from gthacoder/meteor-client-switching-stylesheets
HTML5 client: push menu update.
2015-03-27 14:14:04 -04:00
Chad Pilkey
ec6dffea13 Merge pull request #589 from OZhurbenko/fix-issue-1889
Cleaninig
2015-03-25 17:36:24 -04:00
Oleksandr Zhurbenko
98bd277324 Cleaninig 2015-03-25 14:34:01 -07:00
Richard Alam
8bfdd5a5f7 Merge pull request #586 from OZhurbenko/fix-issue-1889
Fix issue 1889
2015-03-25 17:22:14 -04:00
Richard Alam
78aa3fa271 Merge pull request #588 from bigbluebutton/fix-issue-1909
Fix issue 1909
2015-03-25 17:20:46 -04:00
Richard Alam
2a0786d19c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-1909 2015-03-25 21:15:20 +00:00
Richard Alam
315ac0688c - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1909 2015-03-25 21:14:48 +00:00
Richard Alam
614affb46d Merge pull request #587 from capilkey/fix-private-links
Three different bug fixes
2015-03-25 17:13:49 -04:00
Oleksandr Zhurbenko
f8a41a78d8 Cleaning and formatting 2015-03-25 14:12:38 -07:00
Chad Pilkey
4814fe65a2 annotations now follow the mouse if it leaves the WhiteboardCanvas 2015-03-25 14:08:51 -07:00
Chad Pilkey
056f880a53 add URL parsing to private chat messages 2015-03-25 14:06:03 -07:00
Chad Pilkey
f7a99342b5 increase webrtc transfer timeout 2015-03-25 14:05:26 -07:00
Oleksandr Zhurbenko
67ef6129c0 Trimming leading and trailing whitespace for the meetingId and fullname for both cases 2015-03-25 13:02:03 -07:00
Richard Alam
3f4bec3333 Merge pull request #585 from capilkey/fix-three-whiteboard-bugs
Fix some whiteboard annoyances
2015-03-25 10:11:01 -04:00
Chad Pilkey
7431f5186f reworked the pan and zoom so it breaks way less 2015-03-24 16:58:18 -07:00
Fred Dixon
654d446a26 Merge pull request #583 from bigbluebutton/ffdixon-fix-bbb-record
Update bbb-record
2015-03-23 20:08:17 -04:00
Fred Dixon
70b5335e91 Update bbb-record
Fix https://code.google.com/p/bigbluebutton/issues/detail?id=1879
2015-03-23 20:08:07 -04:00
Fred Dixon
2b265f7082 Merge pull request #582 from bigbluebutton/fix-issue-1849
Fix issue 1849
2015-03-23 18:40:14 -04:00
Richard Alam
afa579b43e - comment out trace logs to minimize noise 2015-03-23 22:38:50 +00:00
Richard Alam
bd4b95b0af - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1849 2015-03-23 22:28:28 +00:00
Chad Pilkey
80f44e5f21 switch from custom pop-up menu to modified combo box 2015-03-23 15:11:49 -07:00
Chad Pilkey
7a7619c311 avoid drawing the text tool input area outside the presentation bounds 2015-03-23 15:09:33 -07:00
Chad Pilkey
981d7c4d39 disable mouse input on the text annotations 2015-03-23 15:08:14 -07:00
Chad Pilkey
2423d934df remove unused TextDrawObject class, the real one is TextObject 2015-03-23 14:34:21 -07:00
Chad Pilkey
d8a3325337 moved 'Ready' text to locales 2015-03-23 14:33:16 -07:00
Richard Alam
7a33b04a9a Merge pull request #581 from bigbluebutton/pass-external-meeting-id-in-client-log
- pass external meeting id in client logs
2015-03-23 15:43:09 -04:00
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