Commit Graph

18998 Commits

Author SHA1 Message Date
Richard Alam
d09abe92e4 - allow to pass custom copyright text using create API 2017-12-20 14:28:01 -08:00
Richard Alam
00140f0cca
Merge pull request #4852 from ritzalam/all-custom-log
- allow passing of custom param (logo) to override default logo
2017-12-20 13:32:11 -08:00
Richard Alam
b8af2fd5ee Merge branch 'riadvice-fix-mute-meeting' into v2.0.x-release 2017-12-20 13:31:24 -08:00
Richard Alam
64a9cbfea1 - users come in as always unmuted, so no need to check muted flag 2017-12-20 13:30:35 -08:00
Richard Alam
f5502a1a2a - allow passing of custom param (logo) to override default logo 2017-12-20 11:06:00 -08:00
Ghazi Triki
276e9e2f5f Fix put meeting and at muted status. 2017-12-20 17:32:10 +01:00
Richard Alam
58d8e70303
Merge pull request #4844 from ritzalam/fix-logouttimer-and-mod-only-msg
- hardcode logoutTimer to zero as we don't use this feature in the r…
2017-12-20 07:37:12 -08:00
Richard Alam
0bfe54a5af
Merge pull request #4843 from ritzalam/fix-issue-4660
- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660
2017-12-20 07:37:02 -08:00
Richard Alam
8223a08029 - hardcode logoutTimer to zero as we don't use this feature in the release
- substitute keyworks in moderatorOnlyMessage
2017-12-18 12:52:33 -08:00
Richard Alam
ffc448f948 - fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660 2017-12-18 12:16:15 -08:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700
Improvements on Presentation Management
2017-12-15 19:03:54 -02:00
Anton Georgiev
b2aa8d4571
Merge pull request #4816 from jfsiebel/hide-audio-labels
Hide audio labels
2017-12-15 18:42:58 -02:00
Anton Georgiev
bfa8637edc
Merge pull request #4830 from OZhurbenko/fix-issue-3576
Fixed round buttons' icon centering
2017-12-15 18:24:49 -02:00
Oleksandr Zhurbenko
6de2b35cb2 Fixed round buttons' icon centering
Fixes #3576
2017-12-15 11:56:12 -08:00
Oswaldo Acauan
2eb2bbd8ab Fix case when there is no current selected 2017-12-15 16:49:47 -02:00
Anton Georgiev
c9c6797fc9
Merge pull request #4788 from antobinary/audio-work-3
Handle dial-in users in HTML5
2017-12-15 13:44:51 -02:00
Joao Siebel
218890d8a6 Alter status tooltip to match selected status 2017-12-15 11:11:28 -02:00
Anton Georgiev
9a92d972d8
Merge pull request #4822 from bigbluebutton/antobinary-update-index.html
Update index_html5_vs_flash.html
2017-12-14 14:00:14 -02:00
Anton Georgiev
696974d3b7
Update index_html5_vs_flash.html 2017-12-14 10:58:06 -05:00
Anton Georgiev
1b939ad2aa
Merge pull request #4803 from antobinary/adjust-polls-4778
Poll updated event - drop requesterId/presenterId and rename event
2017-12-14 13:25:34 -02:00
Joao Siebel
845692b9e5 Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels 2017-12-14 09:01:38 -02:00
Anton Georgiev
334c80083e
Merge pull request #4753 from jfsiebel/html5-tooltip
Add tooltip for buttons without label
2017-12-13 17:13:28 -02:00
Anton Georgiev
b450db91f7
Merge pull request #4683 from KDSBrowne/z14-fix-userlist-keyboard-accessibility
Fix user-list keyboard accessibility
2017-12-13 16:25:44 -02:00
Anton Georgiev
a30026a5ed
Merge pull request #4804 from OZhurbenko/fix-edge-default-locale
Fixed a problem with the default locale selection in Edge
2017-12-12 16:16:38 -02:00
Anton Georgiev
6e15b91cde
Merge pull request #4800 from OZhurbenko/fix-userlist-sorting
Fixed sorting in the user list
2017-12-12 16:14:24 -02:00
Oleksandr Zhurbenko
ed7b3f619a Corrected the detection of the clear_status 2017-12-12 09:27:51 -08:00
Oleksandr Zhurbenko
c31ee309f4 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-userlist-sorting 2017-12-12 09:11:22 -08:00
Oleksandr Zhurbenko
15f8099b84 Fixes a default locale selection for Edge, Windows 10 2017-12-12 09:05:43 -08:00
Maxim Khlobystov
b42668c65f
Merge pull request #4802 from OZhurbenko/fix-message-list-bottom-padding
Fixed last chat message view in Firefox
2017-12-12 11:37:46 -05:00
Anton Georgiev
38c87c7f75 poll voted - drop requesterId and rename event 2017-12-12 11:19:24 -05:00
Oleksandr Zhurbenko
c9770c02fb Fixed bottom padding for the last chat message in Firefox and Edge 2017-12-12 07:44:10 -08:00
Oleksandr Zhurbenko
ed0c338f8a Fixed sorting in the user list 2017-12-12 07:03:33 -08:00
Fred Dixon
d74d309be0
Merge pull request #4796 from jfederico/v2.0.x-release_bbb-lti-fix-getrecordings
bbb-lti: Fixes datatable and adds image preview
2017-12-11 16:27:56 -05:00
jfederico
aba6dfa5b7 bbb-lti: Added image preview to recordings 2017-12-11 18:48:16 +00:00
Joao Siebel
7009e4cebf Resolve linter problems 2017-12-11 16:47:34 -02:00
Joao Siebel
0d2276e8c5 Change actions button icon 2017-12-11 15:09:09 -02:00
jfederico
aea98ec5c8 bbb-lti: Fixed dataTable and made the eye icon toggle 2017-12-11 16:50:07 +00:00
Fred Dixon
bb5054bba2
Merge pull request #4794 from jfederico/v2.0.x-release_bbb-lti-fix-getrecordings
bbb-lti: Rework on the way XML is parsed in order to fix issue with getRecordings
2017-12-11 11:12:41 -05:00
jfederico
270d032a87 bbb-lti: Rework on the way XML is parsed in order to fix issue with getRecording 2017-12-11 15:47:38 +00:00
KDSBrowne
909a44bdd3 remove unused user-list-header 2017-12-11 07:32:23 -08:00
Joao Siebel
8740b7aac6 Hide labels from actions, status, mute/unmute and join/leave audio buttons 2017-12-11 11:48:50 -02:00
Anton Georgiev
96f773b954
Merge pull request #4751 from Tainan404/fix-userlist-bug
Fix false click in userlist.
2017-12-08 16:51:40 -02:00
Anton Georgiev
129f6a221a
Merge pull request #4769 from OZhurbenko/presenter-functionality-2x
Fixed Text Shape for the desktop FF 57 and 58, disabled spellCheck
2017-12-08 16:51:13 -02:00
Anton Georgiev
085eb57556 add ejectUserFromVoice for moderator 2017-12-08 11:40:52 -05:00
Richard Alam
f1e7e7021e
Merge pull request #4781 from capilkey/check-chat-message-parse-fail
Check for failed chat message parse
2017-12-08 11:26:35 -05:00
Richard Alam
3c90c4b7c4
Merge pull request #4761 from capilkey/fix-webcam-shortcut-lock
Block webcam popup opening when locked
2017-12-08 11:26:03 -05:00
Richard Alam
6bd2440cbf
Merge pull request #4760 from capilkey/chrome-microphone-access-warning
Add a warning about microphone access for chrome on HTTP
2017-12-08 11:25:28 -05:00
Richard Alam
89e8c669f3
Merge pull request #4754 from antobinary/join-via-html5-over-flash
Provide option to join via html5 over flash client
2017-12-08 11:24:50 -05:00
Joao Siebel
bf058959eb Remove log and add delay between hover/focus and showing the tooltip 2017-12-08 11:45:25 -02:00
Fred Dixon
dd91b2b78a
Merge pull request #4780 from capilkey/2.0-block-zoom-slider-change
(2.0 only) block zoom slider change processing when not presenter
2017-12-08 08:38:31 -05:00