Commit Graph

1207 Commits

Author SHA1 Message Date
KDSBrowne
e840c358b3 auto focus first selectable element userlist item dropdown 2017-06-05 07:04:12 -07:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Klaus Klein
9b41e3a475 Merge remote-tracking branch 'upstream/master' into Acl
* upstream/master:
  HTML5 - added new line at the end of the file
  Add check for min/max length for chat message
  HTML5 - fixed setting's dropdown re-render issue
2017-06-05 08:37:17 -03:00
Oleksandr Zhurbenko
df077afe51 Corrected findDOMNode import for the poll shape 2017-06-04 16:25:21 -07:00
Oleksandr Zhurbenko
0e55b04a7a Switched from the deprecated react-addons-css-transition-group package to a recommended one 2017-06-04 16:20:38 -07:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
3ef376e095 Switched from String refs to callback refs 2 2017-06-03 17:02:00 -07:00
Oleksandr Zhurbenko
a0224dcffc Replaced String refs with callback refs
String refs will be deprecated in the next React releases, since they have some performance issues
2017-06-03 16:58:27 -07:00
Anton Georgiev
ebd8cce82a Merge pull request #3976 from oswaldoacauan/fix-chat-max-message-length
[HTML5] Add check for min/max length for chat message
2017-06-02 15:27:02 -04:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
9b6f6e2fa1 fix merge conflict 2017-06-02 12:01:12 -07:00
KDSBrowne
95a81315d3 fix focus managment 2017-06-02 10:22:22 -07:00
JaeeunCho
eb4619dbde HTML5 - fixed long string at cc box 2017-06-02 08:27:55 -07:00
KDSBrowne
bf6b85414a remove nested select function 2017-06-01 16:38:56 -07:00
KDSBrowne
636e848a80 fix tab key focusing only second element in dropdown list 2017-06-01 14:49:42 -07:00
Klaus Klein
fc73992a63 Fix a few review comments 2017-06-01 17:40:55 -03:00
JaeeunCho
510288bfe1 HTML5 - added new line at the end of the file 2017-06-01 13:13:14 -07:00
JaeeunCho
8d776b1811 Merge remote-tracking branch 'upstream/master' into disappear_dialog 2017-06-01 13:10:22 -07:00
Klaus Klein
1db64e2bb7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl
* 'master' of https://github.com/bigbluebutton/bigbluebutton:
  HTML5 - removed 'lockedLayout' variable
  Update README.md
  Improved the detection if IP addresses in bbb-conf
  Removing event listeners in handleHide
  Fixed click listeners' initialization
  Bump version number to 1.1.0
  Update BigBlueButton.html
  remove new lines being rendered in log/development.log
  remove new operator
  add suggested changes
  HTML5 - put the order at media class
  HTML5 - removed unused media query
  HTML5 - removed unused media query
  HTML5 - fixed order and slide control position
  change file permission to 644
  fix new lint issues
  set files permission to 644
  Fix client lint issues except those which are comment related
  HTML5 - fixed fixed closed-caption display
  HTML5 - fixed closed-caption display
2017-06-01 16:38:58 -03:00
Oswaldo Acauan
067bd96272 Fix merge conflicts 2017-06-01 14:27:12 +00:00
Oswaldo Acauan
3702da3e08 Add check for min/max length for chat message 2017-06-01 14:24:29 +00:00
Klaus Klein
a4c8ff493a Code refactored 2017-05-31 14:54:43 -03:00
JaeeunCho
2b0e6df6d6 HTML5 - removed 'lockedLayout' variable 2017-05-29 13:34:33 -07:00
JaeeunCho
5efb697c9c HTML5 - fixed conflict 2017-05-29 13:24:29 -07:00
Anton Georgiev
4a4cb684ac Merge pull request #3960 from OZhurbenko/dropdown-listeners-fix
HTML5 - dropdown click listeners' fix
2017-05-25 13:57:52 -04:00
Anton Georgiev
250c6cdb8b Merge pull request #3948 from KDSBrowne/x0-lint-Client
[HTML5] - Fix client lint issues
2017-05-25 13:57:04 -04:00
JaeeunCho
4c9c5701c3 HTML5 - fixed setting's dropdown re-render issue 2017-05-24 15:42:02 -07:00
KDSBrowne
58c777b456 fix locale string format 2017-05-23 14:49:02 -07:00
KDSBrowne
eabf5cb4e1 use += and -= operator 2017-05-23 06:45:28 -07:00
KDSBrowne
f4dd6628ee remove switch statment 2017-05-23 06:35:55 -07:00
KDSBrowne
477ca85615 fix hoisting issue and switch to keydown event 2017-05-23 06:23:26 -07:00
Oleksandr Zhurbenko
c4250c3fa9 Removing event listeners in handleHide 2017-05-22 16:50:32 -07:00
Oleksandr Zhurbenko
98ab79507b Fixed click listeners' initialization 2017-05-22 16:39:08 -07:00
KDSBrowne
beddf61532 remove new operator 2017-05-19 07:25:24 -07:00
KDSBrowne
159a47694e add suggested changes 2017-05-18 16:16:17 -07:00
JaeeunCho
607a3f4e5d HTML5 - put the order at media class 2017-05-18 13:03:35 -07:00
JaeeunCho
050994fc06 HTML5 - removed unused media query 2017-05-18 12:58:21 -07:00
KDSBrowne
de6e7093f3 remove custom aria prop name 2017-05-18 11:38:07 -07:00
KDSBrowne
f6a701b103 remove PascalCase notation 2017-05-18 10:29:25 -07:00
KDSBrowne
225f8aef68 switch to arrow functions 2017-05-18 10:23:23 -07:00
JaeeunCho
8b6f8e857c HTML5 - removed unused media query 2017-05-17 13:09:10 -07:00
JaeeunCho
5ee206e73e HTML5 - fixed order and slide control position 2017-05-17 13:06:07 -07:00
JaeeunCho
4695395508 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-17 13:04:09 -07:00
KDSBrowne
d1543584ba change file permission to 644 2017-05-17 09:07:41 -07:00
KDSBrowne
f4d6f173ea fix new lint issues 2017-05-17 09:02:13 -07:00
KDSBrowne
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -07:00
Anton Georgiev
746ef9478c Merge pull request #3939 from KDSBrowne/userlist-accessibility
[HTML5] - Userlist accessibility improvement
2017-05-17 11:52:52 -04:00
Anton Georgiev
e9eef8119b recover meeting propery needed for lock settings 2017-05-17 11:51:25 -04:00
Anton Georgiev
b4f3c41993 Merge pull request #3951 from KDSBrowne/x0-change-locale-string-format
[HTML5] - Change the format of locale strings
2017-05-17 11:42:39 -04:00
Anton Georgiev
a89c70a04c Merge branch 'userlist-accessibility' of github.com:KDSBrowne/bigbluebutton into userlist-accessibility 2017-05-17 11:27:17 -04:00
Anton Georgiev
0579506e2e Merge pull request #3944 from Klauswk/FixUnselectableOption
Fix unselectable 'Choose Language' and fallback lang error.
2017-05-17 11:17:38 -04:00
KDSBrowne
985cf43a93 change message descriptions 2017-05-17 07:32:35 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
KDSBrowne
2f79f3ff20 change locale stringformat 2017-05-16 17:02:27 -07:00
KDSBrowne
f9fae74d08 fix merge conflicts 2017-05-16 09:33:26 -07:00
KDSBrowne
675a886fd0 fix merge conflicts 2017-05-16 09:28:28 -07:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
Anton Georgiev
f1a58eac24 Merge pull request #3941 from OZhurbenko/fix-issue-3938
[HTML5] Text Shape 2.0
2017-05-16 11:14:31 -04:00
Klaus Klein
8d4b69b578 Remove unnecessary fields 2017-05-16 08:26:19 -03:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
Klaus Klein
82f638384b Fix the lock user icon to work as flash, HTML5 2017-05-15 16:26:03 -03:00
KDSBrowne
fc2a36f14b remove element refs not being used 2017-05-15 09:01:46 -07:00
Klaus Klein
81ab785daa Made 'Choose options' unselectable, HTML5 close #3935 2017-05-15 10:58:26 -03:00
Oleksandr Zhurbenko
371419c41c Text shape preserves white space now and handles new lines 2017-05-12 12:46:10 -07:00
JaeeunCho
92bc296bc0 HTML5 - fixed closed-caption display 2017-05-12 12:17:08 -07:00
KDSBrowne
9e672c2c88 remove commented code 2017-05-12 11:23:55 -07:00
KDSBrowne
a824ca2a79 fix lint issues 2017-05-12 11:11:42 -07:00
KDSBrowne
dd1e830dc2 fix merge conflicts 2017-05-12 10:52:12 -07:00
KDSBrowne
1940d49c4b fix aria labeling 2017-05-12 10:45:41 -07:00
Anton Georgiev
b9f75f88ae Merge pull request #3928 from JaeeunCho/locked_status
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
66852961d4 Merge pull request #3920 from JaeeunCho/hidden_title
Tested, seems fine
2017-05-12 11:53:42 -04:00
Anton Georgiev
932209bf06 Merge pull request #3898 from mmarangoni/audio-locale-fix
Tested, seems to work fine
2017-05-12 11:31:52 -04:00
KDSBrowne
296f024d45 use the ref callback attribute 2017-05-11 07:11:17 -07:00
JaeeunCho
fc5856a4ce HTML5 - linted code 2017-05-10 14:05:18 -07:00
JaeeunCho
bd923e0f39 HTML5 - added locked status for users 2017-05-10 14:00:03 -07:00
KDSBrowne
73819c9d1d fix switch statment 2017-05-10 11:39:03 -07:00
KDSBrowne
7e0ff7bf76 clean up code more 2017-05-10 11:24:09 -07:00
KDSBrowne
f0bce326b9 clean up code 2017-05-10 11:10:27 -07:00
KDSBrowne
bd3c8fb405 add aria tags 2017-05-10 08:12:24 -07:00
KDSBrowne
9462221af6 remove unneeded ref and id's 2017-05-09 07:13:55 -07:00
KDSBrowne
735bdb4a87 fix query selector console error 2017-05-09 07:07:55 -07:00
JaeeunCho
4012a0d077 HTML5 - fixed navbar to be displayed 2017-05-08 14:03:22 -07:00
KDSBrowne
8bb1da0ed5 fix focus and tab order bugs 2017-05-06 16:04:59 -07:00
KDSBrowne
569ba42042 fix userlist styling 2017-05-06 09:01:16 -07:00
Anton Georgiev
1f640ea3e4 only offer taking over a locale for cc to moderators 2017-05-05 15:52:23 -04:00
KDSBrowne
77d529b2ac fix error for out of bound index 2017-05-05 12:11:28 -07:00
KDSBrowne
85a468f4b3 add key codes for left and right arrow 2017-05-05 07:37:01 -07:00
KDSBrowne
8194059e43 fix count bug 2017-05-04 14:58:33 -07:00
KDSBrowne
65323d0789 remove unused id's 2017-05-04 14:43:48 -07:00
KDSBrowne
eca2dbba93 clean up code 2017-05-04 14:41:09 -07:00
KDSBrowne
f6642b0dee make userlist keyboard accessible - incomplete 2017-05-04 13:39:53 -07:00
Anton Georgiev
bd56001733 disable cc menu if toggled off 2017-05-04 14:42:55 -04:00
Anton Georgiev
453a2cf6a4 code style improvements of closed-captions 2017-05-03 17:54:26 -04:00
Matthew Marangoni
d3cfbf93df Merge remote-tracking branch 'upstream/master' into audio-locale-fix 2017-05-03 14:49:00 -07:00
Matthew Marangoni
99788090ee fixed audio and settings modal reopening when changing locale in settings 2017-05-03 14:39:07 -07:00
Anton Georgiev
3904771fc3 if microphone lock is enforced, pick listenOnly join over using mic 2017-05-03 16:12:47 -04:00
Anton Georgiev
6d71e943a0 Merge pull request #3893 from antobinary/check-mute-user
HTML5: Update callServer to makeCall to fix user item calls
2017-05-03 13:54:15 -04:00
Anton Georgiev
038405f907 some changes to logClient api 2017-05-03 13:19:21 -04:00
Anton Georgiev
8ab7865419 Merge branch 'ClientLog' of github.com:Klauswk/bigbluebutton into test-3865 2017-05-03 12:59:33 -04:00
Anton Georgiev
935219148a Merge pull request #3871 from Klauswk/LeaveButtonOnErrorScreen
Add leave button to error screen
2017-05-03 12:58:28 -04:00
Anton Georgiev
3a4b8cc388 update callServer to makeCall to fix user item calls 2017-05-03 12:56:27 -04:00
Klauswk
b0b455e591 Merge branch 'master' into ClientLog 2017-05-03 13:40:57 -03:00
Klaus Klein
5a37750bf6 Change leave button label 2017-05-03 13:19:45 -03:00
Anton Georgiev
02c6f6d80f Merge pull request #3860 from JaeeunCho/userlist_name_space
HTML5 - fixed display unread count for long name user
2017-05-03 11:16:23 -04:00
Anton Georgiev
0521571218 Merge pull request #3838 from Klauswk/AddServerCallback
Add server callback with error
2017-05-03 11:11:35 -04:00
Anton Georgiev
8d037bc4fa resolve issues with modal on breakouts 2017-05-03 11:06:28 -04:00
KDSBrowne
583677df18 fix focus bug in userlist 2017-05-03 07:09:39 -07:00
Anton Georgiev
30e73e7640 Merge pull request #3879 from KDSBrowne/accessibility-update-07
[HTML5] - Accessibility update 07
2017-05-02 15:12:21 -04:00
Anton Georgiev
78937a5ac9 Merge pull request #3831 from oswaldoacauan/modal-refactor-pr
[HTML5] Refactor of the Modal component state
2017-05-02 15:09:38 -04:00
Anton Georgiev
5087e5b24b Handle audio on refactored modal (#2)
* handle audio on refactored modal

* wrap component with withModalMounter
2017-05-02 13:18:01 -04:00
Klaus Klein
131f23f42d Fix lint problems 2017-05-02 08:30:32 -03:00
KDSBrowne
c3ce8192d1 fix lint issues 2017-05-01 12:59:17 -07:00
Oswaldo Acauan
d434ba6893 Fix the audio-modal 2017-05-01 16:52:57 -03:00
KDSBrowne
80d4feedcc fix tabIndex for the settings closed caption submenu 2017-05-01 12:46:21 -07:00
KDSBrowne
eef9fd782a fix merge conflict 2017-05-01 12:23:01 -07:00
KDSBrowne
f2e7e360ff remove extra list separator 2017-05-01 11:54:40 -07:00
KDSBrowne
aa0f51e62d fix console errors for missing key and invalid prop 2017-05-01 11:43:01 -07:00
Klauswk
30b7c3c1e4 Merge branch 'master' into AddServerCallback 2017-04-28 17:28:45 -03:00
Klaus Klein
5ba575e0aa Removed unused import 2017-04-28 17:24:47 -03:00
Klaus Klein
9c2c736e65 Add leave button to error screen 2017-04-28 17:16:07 -03:00
Klaus Klein
31ae8854c9 Lint problems fixed 2017-04-28 17:01:02 -03:00
Anton Georgiev
a2e8a84e80 Merge pull request #3870 from antobinary/more-locales
HTML5: Add localizations to hardcoded strings
2017-04-28 15:40:30 -04:00
Anton Georgiev
85d6f7aa6e add label descriptions for cancel and save 2017-04-28 15:13:42 -04:00
Anton Georgiev
5d0022f214 localize user popup menu 2017-04-28 14:28:55 -04:00
Klaus Klein
5a4f05a41a Fix requests on PR #3865 2017-04-28 14:12:08 -03:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Anton Georgiev
5abf6413a8 localize controls in Settings menu 2017-04-28 11:56:27 -04:00
Anton Georgiev
121cb47093 localize mute, unmute buttons 2017-04-28 11:34:20 -04:00
Oswaldo Acauan
4dd5e3c6ac Re-add messages concatenation 2017-04-28 15:01:50 +00:00
Oswaldo Acauan
3d0c0d38e1 Fix merge conflicts 2017-04-28 14:59:09 +00:00
Oswaldo Acauan
9467731f47 Improve chat performance 2017-04-28 14:52:54 +00:00
Klaus Klein
1c8e78d1c1 Merge with master 2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3 Add client log, HTML5 2017-04-28 10:47:07 -03:00
Anton Georgiev
9684195c5f minor changes in strings 2017-04-27 17:23:43 -04:00
Anton Georgiev
4188394a82 Merge branch 'patch-1' of github.com:oswaldoacauan/bigbluebutton into test-3850 2017-04-27 16:20:41 -04:00
Anton Georgiev
ef0d2f5729 Merge pull request #3861 from antobinary/disallow-moderator-2
HTML5: demote html5 moderator user to viewer based on flag
2017-04-27 16:17:49 -04:00
Anton Georgiev
684f87e77a demote html5 moderator user to viewer based on flag 2017-04-27 16:07:27 -04:00
JaeeunCho
efe82d1671 HTML5 - fixed display unread count for long name user 2017-04-27 12:46:28 -07:00
Anton Georgiev
e3924a2538 Merge pull request #3828 from Klauswk/FixAuthentication
Fix authentication issue on HTML5
2017-04-27 15:01:27 -04:00
KDSBrowne
737da5937d add aria descriptionfor current status 2017-04-27 08:57:41 -07:00
Klaus Klein
d4917e975c Review change 2017-04-26 17:07:22 -03:00
Oswaldo Acauan
4466cd084e Update component.jsx 2017-04-26 11:57:40 -03:00
Oswaldo Acauan
4e29024783 Prevent breakout dropdown when theres no breakout 2017-04-26 11:55:49 -03:00
KDSBrowne
230bc1f11c fix merge conflicts 2017-04-26 07:14:25 -07:00
KDSBrowne
ef18f652aa fix lint issues 2017-04-26 07:08:47 -07:00
Klaus Klein
e56546137b Change callServer function name 2017-04-26 10:47:44 -03:00
Klaus Klein
d32dbb12f5 Fix wrong import 2017-04-25 14:26:14 -03:00
Klauswk
73fb753edb Merge branch 'master' into FixAuthentication 2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6 Fix auth and user kick, HTML5 closes #3844 #3828 2017-04-25 14:04:17 -03:00
Anton Georgiev
c2b6f48b87 Merge pull request #3848 from antobinary/audio-restructuring
HTML5: Fix issue with listenOnly not hanging up
2017-04-25 12:04:32 -04:00
KDSBrowne
a752b97809 add message descriptions 2017-04-25 05:21:12 -07:00
KDSBrowne
330abe06e5 fix aria semantics 2017-04-25 04:59:52 -07:00
KDSBrowne
1e4e730278 fix aria labels 2017-04-24 19:27:28 -07:00
KDSBrowne
9203cc60e3 add localized messages 2017-04-24 19:08:18 -07:00
Anton Georgiev
c80827ee20 fix issue with listenOnly not hanging up 2017-04-24 17:17:53 -04:00
Anton Georgiev
e78f2409e9 Merge pull request #3843 from Klauswk/HotfixChat
HotfixChat, HTML5 issues #3829
2017-04-24 15:34:28 -04:00
Anton Georgiev
835acfa195 Merge pull request #3835 from KDSBrowne/accessibility-05-update
[HTML5] - Accessibility update 05
2017-04-24 15:34:05 -04:00
Anton Georgiev
d7a61a8a7e Merge pull request #3801 from JaeeunCho/userlist_truncate
HTML5 - Truncate user name and chat name
2017-04-24 15:02:16 -04:00
Anton Georgiev
90d34da942 Merge pull request #3832 from Klauswk/FixFullScreen
Fix full screen when console is open, HTML5
2017-04-24 14:55:35 -04:00
Jaeeun Cho
5099d4bca7 Update styles.scss 2017-04-24 11:17:24 -04:00
Klaus Klein
650e93d4dd HotfixChat, HTML5 issues #3829 2017-04-24 08:33:08 -03:00
KDSBrowne
423318962d add aria labels to closed caption submenu 2017-04-23 06:26:01 -07:00
KDSBrowne
41a5e01e2c fix missing section announcment 2017-04-21 12:14:55 -07:00
KDSBrowne
1e07098527 add messages for settings application submenu 2017-04-21 12:04:46 -07:00
Anton Georgiev
5f6dd8e5f6 Merge pull request #3839 from antobinary/audio-restructuring
[HTML5] Fix undefined voiceBridge
2017-04-20 16:55:15 -04:00
Anton Georgiev
d3bf2ab0b7 fix undefined voiceBridge 2017-04-20 16:53:55 -04:00
Anton Georgiev
a9f2a18475 Merge pull request #3834 from antobinary/audio-restructuring
[HTML5] Audio restructuring part 1
2017-04-20 16:00:59 -04:00
Anton Georgiev
0cc9ce4048 moved componentWillMount to component.. 2017-04-20 15:57:35 -04:00
KDSBrowne
97402b4628 add aria-label to chat log 2017-04-20 06:53:03 -07:00
Anton Georgiev
5b0454a11c Merge pull request #3836 from Klauswk/FixAvatarIssue
Fix avatar issue in chat, HTML5 #3830
2017-04-19 17:25:58 -04:00
Anton Georgiev
79fc24e817 Merge pull request #3823 from Gcampes/unauthorized-page-fix
[HTML5] Fix unauthorized for slow connections
2017-04-19 17:24:06 -04:00
Anton Georgiev
40d0417b9d resolve lint warnings on modified files 2017-04-19 16:52:50 -04:00
Anton Georgiev
17fe4aa9b8 move audio tag to component 2017-04-19 16:42:48 -04:00
KDSBrowne
5fa9ae9bf1 change aria-labelledby to aria-describedby 2017-04-19 10:27:45 -07:00
Klaus Klein
23d472bcde Fix avatar issue in chat, HTML5 #3830 2017-04-19 14:11:13 -03:00
KDSBrowne
cc04f96955 add suggested changes 2017-04-19 10:10:17 -07:00
KDSBrowne
a4fcffaa9a add DropdownListTitle component 2017-04-19 08:28:13 -07:00
Anton Georgiev
67700f605b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-19 11:22:48 -04:00
Anton Georgiev
4c49f68771 pass params via bridge constructor 2017-04-19 11:01:28 -04:00
Anton Georgiev
9152bfbaf9 move deskshare verto outside of audio/ 2017-04-19 10:59:57 -04:00
gcampes
12dccd9158 merge conflicts 2017-04-19 08:19:56 -03:00
Klaus Klein
a071c34939 Fix console problem open on fullscreen, HTML 5 issue #3824 2017-04-18 17:00:50 -03:00
Oswaldo Acauan
5fa27107cb Fix merge conflicts 2017-04-18 19:42:55 +00:00
Oswaldo Acauan
334026833b Refactor Modal related components 2017-04-18 19:38:26 +00:00
Oswaldo Acauan
c8dd83aebe Split modal into two separated components and move state to a hoc on the base 2017-04-18 19:37:01 +00:00
gcampes
9f39f9ce6a merge conflicts 2017-04-18 16:14:39 -03:00
gcampes
5d1b280f05 Remove debug code 2017-04-18 14:28:35 -03:00
gcampes
5c3754c614 Fix ids displaying instead of messages on locale change 2017-04-18 14:26:27 -03:00
Klaus Klein
feb1efc1df Fixed button when console is open 2017-04-18 14:14:07 -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
KDSBrowne
ca09907d47 add formatted messages 2017-04-17 11:19:27 -07:00
KDSBrowne
bdcf34a38f fix focus bug causing missed options by nvda 2017-04-17 10:36:41 -07: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
KDSBrowne
2b8c9812ee fix merge conflict 2017-04-17 06:34:11 -07:00