Commit Graph

14646 Commits

Author SHA1 Message Date
Anton Georgiev
47f1ad0ed5 fix missing import causing breakouts to not work 2017-04-12 15:29:47 -04:00
Richard Alam
a5bc64362d - user internal userId instead of external userId in register user message 2017-04-12 16:50:54 +00:00
Anton Georgiev
5d75b79372 Merge pull request #3791 from Klauswk/FixUserDropDown
Fix user drop down - HTML5 Issue #3764
2017-04-11 16:00:21 -04:00
Anton Georgiev
a192eb5740 Merge pull request #3796 from Klauswk/FixWelcomeMessage
Fix multiple welcome messages, issue #3792 HTML5
2017-04-11 15:59:48 -04:00
Anton Georgiev
a8ac6fa0a5 Merge pull request #3809 from ritzalam/match-userid-with-token
Check userId when validating token
2017-04-11 15:54:12 -04:00
Chad Pilkey
183ac7b411 Merge pull request #3795 from riadvice/webrtc-quality
Display WebRTC stats inside the Flex client
2017-04-11 15:50:16 -04:00
Richard Alam
6717308530 Check userId when validating token
- check if the client validating the token mathes the userId of the registered user. If
   we don't, the client can pass any token and impersonate other users.
2017-04-11 19:32:18 +00:00
Anton Georgiev
d8faea566f Merge pull request #3798 from antobinary/private-chat-3786
[HTML5] Fix client freeze on private chat partner leaving. Fix for #3786
2017-04-11 15:02:22 -04:00
Chad Pilkey
19d99b471a Merge pull request #3800 from riadvice/audio-window-browser-suggestion
Show message "Recommend using either Firefox or Chrome for better audio" in audio window
2017-04-11 14:27:27 -04:00
Richard Alam
dcade4f278 Merge pull request #3808 from ritzalam/fix-get-recordings-api
Cleanup
2017-04-11 14:20:21 -04:00
Richard Alam
7c9c09b5b0 Cleanup
- remove extra > on meeting name on getRecording API response
2017-04-11 17:22:54 +00:00
Ghazi Triki
01b4a5f6e4 Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint. 2017-04-11 08:29:00 +01:00
Anton Georgiev
8e9605bc8e Merge pull request #3802 from antobinary/fix-listenonly
[HTML5] Fix event name causing issues with listenOnly status
2017-04-10 16:45:48 -04:00
Anton Georgiev
11871d7d0b fix event name causing issues with listenOnly status 2017-04-10 16:18:05 -04:00
Ghazi Triki
a40deced61 Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used. 2017-04-10 20:22:30 +01:00
Anton Georgiev
28165f2584 improved logic for updating message-list 2017-04-10 11:02:58 -04:00
Klaus Klein
b432ffd68b Change to fetch from chat system id, issue #3792 HTML5 2017-04-10 11:04:27 -03:00
Klaus Klein
6727f14ab7 Fix multiple welcome messages, issue #3792 HTML5 2017-04-10 09:55:22 -03:00
Ghazi Triki
92554f8b3e Squashed commits for displaying WebRTC stats inside the Flex client. 2017-04-10 11:16:46 +01:00
Fred Dixon
a8349183fa Merge pull request #3794 from ffdixon/clean-up-bbb-conf
Fixed output of free memory + minor code cleanup
2017-04-08 18:57:02 -04:00
Fred Dixon
52a74d0063 Fixed output of free memory + minor code cleanup 2017-04-08 17:41:20 -05:00
Klaus Klein
94c5151e44 Adjust code for readability, issue #3764 2017-04-07 15:52:17 -03:00
Klaus Klein
c35e36f582 Change code to better readability 2017-04-07 14:12:29 -03:00
Anton Georgiev
d9592aba04 fix issue with new chat session opened 2017-04-07 11:00:44 -04:00
Anton Georgiev
adf63397a3 Merge pull request #3780 from KDSBrowne/accessibility-update-03
[HTML5] - Accessibility update 03
2017-04-07 08:11:30 -04:00
Anton Georgiev
c257839e5b Merge pull request #3753 from KDSBrowne/actions-button-fix
[HTML5] - Actions Button Fix
2017-04-07 08:08:14 -04:00
Anton Georgiev
462deffc37 Merge pull request #3782 from riadvice/emoji-time-fix
Updated HTML5 emoji status names to match with the Flex client.
2017-04-07 08:06:54 -04:00
Richard Alam
d80c34eb25 Merge pull request #3790 from kepstin/presentation-poll-labels
recording presentation: Improve calculations of bar sizes in poll results
2017-04-06 18:09:46 -04:00
Calvin Walton
e77b50d2c6 recording presentation: Reduce the top/bottom margin so bars fit better
gnuplot's auto-margins don't work well on this graph, so manually specify
the top/bottom (actually left/right - the graph is rotated 90°) to make
the bars fit better, particularly when using wide aspect ratio slides.
2017-04-06 18:04:10 -04:00
Anton Georgiev
e3f66da499 update chat unless user just left 2017-04-06 17:08:20 -04:00
Klaus Klein
1c22f38add Fix user drop down 2017-04-06 17:41:08 -03:00
Calvin Walton
0a1667f293 recording presentation: Correctly calculate width of bar in poll results
The code was previously dividing by the total number of votes rather than
the max number of votes, which meant it was underestimating the width of
the bars. In some cases, this meant that the label for number of votes would
overlap the percentages.

Fixes #3725
2017-04-06 14:35:31 -04:00
Anton Georgiev
5286a6acb7 Merge pull request #3788 from Gcampes/patch-3
[HTML5] - Fix user not being removed on tab close
2017-04-06 13:23:37 -04:00
Gabriel Carvalho de Campes
82a3018171 [HTML5] - Fix user not being removed on tab close 2017-04-06 14:06:03 -03:00
Ghazi Triki
fd6092e5a8 Merge pull request #1 from antobinary/test-ghazi-pr
Extra commit for html5 client emojis
2017-04-06 17:41:04 +02:00
KDSBrowne
8469691256 fix slide control and actionbar btn overlap 2017-04-06 08:13:28 -07:00
Anton Georgiev
b87ba1f3ea adjust emoji statuses and icon names 2017-04-06 10:42:01 -04:00
KDSBrowne
3ff1096cf4 fix merge conflict 2017-04-06 07:11:57 -07:00
Anton Georgiev
b007c68aaa Merge branch 'emoji-time-fix' of github.com:riadvice/bigbluebutton into test-ghazi-pr 2017-04-06 08:44:30 -04:00
Anton Georgiev
fe998aacd3 Merge pull request #3769 from Gcampes/settings-refactor
[HTML5] Adds settings service
2017-04-06 08:31:59 -04:00
Anton Georgiev
ed7d09b8a2 Merge pull request #3783 from Klauswk/AddSendButton
HTML5 close #3765, Added send button aside chat textbox
2017-04-06 08:20:02 -04:00
Anton Georgiev
65cbc6a41c Merge pull request #3771 from KDSBrowne/accessibility-02-update
[HTML] Accessibility update 02
2017-04-06 08:18:35 -04:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03:00
KDSBrowne
800c47f462 remove default messages 2017-04-05 17:02:07 -07:00
KDSBrowne
7e4bf60588 remove FormattedMessage import 2017-04-05 15:49:05 -07:00
KDSBrowne
757d374383 remove span element 2017-04-05 15:38:15 -07:00
KDSBrowne
e932f707a9 clean up code 2017-04-05 15:35:09 -07:00
KDSBrowne
a8067b7bd8 clean up render function 2017-04-05 12:43:50 -07:00
KDSBrowne
e01f34cf23 fix merge conflicts 2017-04-05 09:56:41 -07:00
gcampes
f0ac39f420 Merge remote-tracking branch 'upstream/master' into settings-refactor
* upstream/master: (63 commits)
  add styles for separator
  In whiteboard text tool, a single click while editing a text sends it without creating a new text zone.
  Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777
  - escape all user passed strings
  - display length of recording in minutes instead of milliseconds
  - fix window size  - run dos2unix to remove ^M but it formatted the whole file :(
  - add dimension of screen share
  add formatted message for close chat link
  add formatted message for userlist toggle btn label
  remove unused import
  fix DropdownListSeparator to work with NVDA
  remove local storage usage and add separator
  change role from section to region
  add menu item separation NVDA fiendly
  add formatted messages and remove generic divs
  remove direct DOM manipulation
  remove span element
  add aria-label for unread messages
  add missing import to fix JoinAudio Btn
  fix lint issues
  ...
2017-04-05 13:56:07 -03:00