Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Mic selection #3620

Merged
merged 1 commit into from
Jan 8, 2021
Merged

Conversation

keianhzo
Copy link
Contributor

Closes #2799 This PR adds support for Mic selection from preferences.

@keianhzo keianhzo requested a review from robertlong December 24, 2020 12:07
@keianhzo keianhzo self-assigned this Dec 24, 2020
@robertlong
Copy link
Contributor

@keianhzo could you resolve these merge conflicts? I would just get rid of the changes to the localization files. We don't use sync-locales.js anymore. The preferences-screen.js file was changed significantly to add localization support. I wasn't super confident in fixing the merge conflicts. Let me know if you'd like to pair on that.

@keianhzo keianhzo force-pushed the room-ui-redesign-audio branch 2 times, most recently from a44e3d3 to ba0a83b Compare January 6, 2021 13:45
@keianhzo
Copy link
Contributor Author

keianhzo commented Jan 6, 2021

@robertlong The conflicts should be fixed.

src/assets/locales/ja.json Outdated Show resolved Hide resolved
src/assets/locales/pt.json Outdated Show resolved Hide resolved
src/assets/locales/ru.json Outdated Show resolved Hide resolved
src/assets/locales/zh.json Outdated Show resolved Hide resolved
src/utils/media-devices-manager.js Show resolved Hide resolved
src/App.js Show resolved Hide resolved
@keianhzo keianhzo force-pushed the room-ui-redesign-audio branch from ba0a83b to dbf1463 Compare January 8, 2021 20:40
@keianhzo
Copy link
Contributor Author

keianhzo commented Jan 8, 2021

@robertlong This should be ready to merge. I've removed the translations. I run out of time for the refactor, I'll do it as a follow-up when this lands.

@robertlong robertlong merged commit fc6f99f into room-ui-redesign Jan 8, 2021
@robertlong robertlong deleted the room-ui-redesign-audio branch January 8, 2021 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants