Commit Graph

14670 Commits

Author SHA1 Message Date
gcampes
5c3754c614 Fix ids displaying instead of messages on locale change 2017-04-18 14:26:27 -03:00
gcampes
eda7648043 Merge remote-tracking branch 'upstream/master' into settings-localization-dropdown
* upstream/master: (51 commits)
  Fix lint issues
  Fix lint issues
  Fix a few lint problems
  fix missing import causing breakouts to not work
  Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
  Fix poll options remain visible on html5, closes #3806 HTML5
  - user internal userId instead of external userId in register user message
  remove unnecessarily added svgs
  updated icons to v11, adjusted few icons
  Fix merge algoritm problem
  set chat input color to gray (text-color)
  Fixed user leave problem on private chat, close #3799 HTML5
  align emojis horizontally
  Check userId when validating token
  Cleanup  - remove extra > on meeting name on getRecording API response
  Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
  fix event name causing issues with listenOnly status
  Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
  improved logic for updating message-list
  Change to fetch from chat system id, issue #3792 HTML5
  ...
2017-04-17 15:49:35 -03:00
Richard Alam
d45263ca2d Merge pull request #3816 from riadvice/imporve-document-conversion
Make sure that blank swf is loaded if fallback document conversion does not work.
2017-04-13 10:47:52 -04:00
Anton Georgiev
a7bda6b049 Merge pull request #3815 from Klauswk/FixPollOptionsHTML5
Fix poll options remain visible on html5, closes #3806 HTML5
2017-04-12 16:38:49 -04:00
Klaus Klein
e244459514 Fix lint issues 2017-04-12 17:37:37 -03:00
Klaus Klein
63b58a7f79 Fix lint issues 2017-04-12 17:33:14 -03:00
Anton Georgiev
07d2cf9b14 Merge pull request #3810 from Klauswk/FixPrivateOfflineChatProblem
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-12 16:32:01 -04:00
Klaus Klein
3ad7f9b5a0 Fix a few lint problems 2017-04-12 17:19:39 -03:00
Anton Georgiev
e3ccc6aa3a Merge pull request #3814 from antobinary/ui-changes
HTML5: Switch to icons v11, update some icons in the client, minor UI touches
2017-04-12 16:14:03 -04:00
Anton Georgiev
eb2931fd77 Merge pull request #3817 from antobinary/fix-breakout-room-register-user
HTML5: Fix missing import causing breakouts to not work
2017-04-12 15:32:03 -04:00
Anton Georgiev
47f1ad0ed5 fix missing import causing breakouts to not work 2017-04-12 15:29:47 -04:00
Anton Georgiev
ab491cd7fc Merge pull request #3813 from ritzalam/fix-breakout-room-register-user
user internal userId instead of external userId
2017-04-12 15:27:24 -04:00
Ghazi Triki
0ef12cd076 Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded. 2017-04-12 18:17:08 +01:00
Klaus Klein
3cd497fbbe Fix poll options remain visible on html5, closes #3806 HTML5 2017-04-12 14:00:16 -03: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
492c9f77a0 remove unnecessarily added svgs 2017-04-12 12:49:56 -04:00
Anton Georgiev
573db8dcc3 updated icons to v11, adjusted few icons 2017-04-12 12:12:47 -04:00
Klaus Klein
3ac33c79d6 Fix merge algoritm problem 2017-04-12 09:03:14 -03:00
Klauswk
9649f7523d Merge branch 'master' into FixPrivateOfflineChatProblem 2017-04-12 08:33:07 -03:00
Anton Georgiev
026274f47f set chat input color to gray (text-color) 2017-04-11 17:05:10 -04: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
Klaus Klein
419902cc8b Fixed user leave problem on private chat, close #3799 HTML5 2017-04-11 16:46:51 -03:00
Anton Georgiev
b66fbf4bc4 align emojis horizontally 2017-04-11 15:39:50 -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
gcampes
4f9cf64a49 Fix issue with locale merging 2017-04-11 15:31:51 -03: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