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

Test/pull from master #2

Merged
merged 69 commits into from
Dec 11, 2019
Merged

Test/pull from master #2

merged 69 commits into from
Dec 11, 2019

Conversation

LeoMosiah
Copy link

No description provided.

zbettenbuk and others added 30 commits October 16, 2019 10:38
decodeURIComponent is not needed any more and after adding a validation such meeting name should not happen to be stored.
Fixes showing etherpad in follow-me mode.
Fixes a crash on iOS when disposing streams.
Skip the first character, since it's now like ^123456.0.0
- Remove network-activity "feature"
    - It wasn't in use
    - It relied on internal React Native components, bound to break anytime
- Show an infinite loading indicator
- Style it just like the LoadConfigOverlay
    - Since it kinda represents the opposite, an "unload" then SDK is done
* first pass at mod_muc_domain open source plus example

* doc - prosody config and config.js examples for mapper
Separate each implementation (3 as of this writing) into each own "handler"
class.

This should make the code easier to understand, maintain and extend.
Currently only 2 options are implemented, mainly aimed at helping troubleshoot
audio related problems:

- Disable native call integration (it disables CallKit / ConnectionService)
- Disable P2P
saghul and others added 28 commits November 6, 2019 18:30
Matches the app / SDK deployment target and avoids compilation warnings.
It was introduced in Xcode 9 and made the default in Xcode 10. We were forcing
the use of the legacy version, which doesn't support some new features that we
wish to enable, such as building the SDK for distribution.
When ConnectionService is used (the default) we were attaching the handlers too
early, and since attaching them requires that the RNConnectionService module is
loaded, it silently failed. Instead, use the initialize() method, which gets
called after all the Catalyst (aka native) modules have been loaded.
Samsung devices (of course) seem to stick with the earpiece if we first select
Bluetooth but then set speaker to false. Reverse the order to make everyone
happy.

This only applies to the generic and legacy handlers.
* Adds a hook to insert body html.

* Adds a hook to insert head html.
…tsi#4842)

* Adds an option to set email through iframe API init and to stats.

* Simplifies configuring email and displayName in stats.

Removes enableStatsID as not needed as when off we are sending as callstats id xmpp resource which is unique per call and id must be something that sticks between calls (callstatsUsername).

* Adds email and displayName in stats config for mobile.

* chore(deps): Updates lib-jitsi-meet to latest dd31f0a.

* Removes enableStatsID from config and whitelist.
# Conflicts:
#	config.js
#	ios/Podfile.lock
#	ios/app/src/Info.plist
#	ios/app/watchos/app/Info.plist
#	ios/app/watchos/extension/Info.plist
#	ios/jitsi-meet.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
#	react/features/base/color-scheme/defaultScheme.js
#	react/features/base/dialog/components/native/styles.js
#	react/features/chat/components/native/ChatMessage.js
#	react/features/chat/components/native/styles.js
#	react/features/chat/components/web/Chat.js
#	react/features/chat/components/web/ChatMessage.js
#	react/features/chat/components/web/MessageContainer.js
#	react/features/chat/components/web/MessageRecipient.js
#	react/features/conference/components/native/Conference.js
#	react/features/conference/components/web/Subject.js
#	react/features/deep-linking/components/DeepLinkingMobilePage.web.js
#	react/features/filmstrip/components/web/Toolbar.js
#	react/features/invite/components/info-dialog/web/InfoDialog.js
#	react/features/recent-list/functions.web.js
#	react/features/remote-video-menu/components/web/PrivateMessageMenuButton.js
#	react/features/toolbox/components/web/Toolbox.js
#	react/features/welcome/components/WelcomePage.web.js
#	react/features/welcome/components/styles.js
@LeoMosiah LeoMosiah merged commit c3ff31a into develop Dec 11, 2019
@LeoMosiah LeoMosiah deleted the test/pull-from-master branch December 11, 2019 12:11
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.