BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,909 Commits 13 Branches 260 Tags 1.1 GiB
f0bce326b9
Commit Graph

14909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KDSBrowne
bdcf34a38f fix focus bug causing missed options by nvda 2017-04-17 10:36:41 -07:00
gcampes
0fd59394e7 remove unwanted debug, adds back log for error 2017-04-17 14:20:09 -03:00
gcampes
16c8497e36 Merge remote-tracking branch 'upstream/master' into unauthorized-page-fix 
* upstream/master: (26 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.
  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
  Fix multiple welcome messages, issue #3792 HTML5
  ...
 2017-04-17 14:15:40 -03:00
gcampes
832d916fd8 Fix unauthorized on slow connection 2017-04-17 14:14:31 -03:00
KDSBrowne
3bddf30a92 change formattedMessage description 2017-04-17 10:04:24 -07:00
KDSBrowne
4ac45b30f9 add aria label for userlist btn notification 2017-04-17 10:00:15 -07:00
KDSBrowne
cb4f6005d6 add aria label 2017-04-17 09:23:24 -07:00
Anton Georgiev
450d2f3435 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-17 11:37:49 -04:00
Ghazi Triki
bc898c145a More fine tuning for document conversion fall-back. 2017-04-17 15:35:29 +01:00
KDSBrowne
2b8c9812ee fix merge conflict 2017-04-17 06:34:11 -07:00
KDSBrowne
f229fb4a35 add defaultMessage to error-screen component 2017-04-14 16:26:34 -07:00
KDSBrowne
4a480f77eb fix aria labels for hide and close chat btns 2017-04-14 16:18:40 -07:00
KDSBrowne
1279b339c0 center icon and voice user status 2017-04-14 11:46:56 -07:00
Ghazi Triki
a2644c430c Improve the document conversion fallback logic by merging the pdf page extraction and image conversion using 'convert' to a single step page to image conversion using 'gs'. Anti-aliasing for text and shapes is also improved. 2017-04-13 18:29:33 +01: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
KDSBrowne
e316f38cda fix merge conflicts 2017-04-11 07:07:49 -07:00
KDSBrowne
8fe66f35f9 change some descriptions 2017-04-11 06:52:30 -07: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
KDSBrowne
b80d55b6a1 elaborate on some descriptions 2017-04-10 14:28:07 -07:00
KDSBrowne
d4511eae5b add description to messages 2017-04-10 14:21:54 -07:00
KDSBrowne
803e7f0a87 change line endings 2017-04-10 14:11:48 -07:00