Skip to content

Commit 18f6929

Browse files
git pu -Merge remote-tracking branch 'origin/main' into jaburnsi/domainPermissionsUIUpdates
2 parents 6aca9a8 + 1d1999d commit 18f6929

49 files changed

Lines changed: 1733 additions & 769 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Add TeamsCall and TeamsCallAgent to StatefulClient",
4+
"packageName": "@internal/calling-stateful-client",
5+
"email": "jinan@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Create a device ermissions sub directory",
4+
"packageName": "@internal/react-components",
5+
"email": "2684369+JamesBurnside@users.noreply.github.com",
6+
"dependentChangeType": "none"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Remove padding and margins from base dialpad component.",
4+
"packageName": "@internal/react-components",
5+
"email": "94866715+dmceachernmsft@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Add TeamsCall and TeamsCallAgent to StatefulClient",
4+
"packageName": "@internal/react-composites",
5+
"email": "jinan@microsoft.com",
6+
"dependentChangeType": "none"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Increase max listener limit to remove warning in console",
4+
"packageName": "@internal/react-composites",
5+
"email": "carolinecao@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

common/config/babel/.babelrc.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ process.env['COMMUNICATION_REACT_FLAVOR'] === 'stable' &&
88
// The plugin removes any AST node that is preceded by a comment that contains the tag:
99
// @conditional-compile-remove(demo)
1010
features: [
11+
'call-readiness',
1112
// Flag to add API only available in beta calling SDK to mocks and internal types.
1213
// This feature should be stabilized whenever calling SDK is stabilized.
1314
'calling-beta-sdk',
@@ -16,27 +17,28 @@ process.env['COMMUNICATION_REACT_FLAVOR'] === 'stable' &&
1617
// API for injecting custom buttons in he control bar for
1718
// `CallComposite` and `CallWithChatComposite`.
1819
'control-bar-button-injection',
20+
// props to allow Contoso to overwrite timestamp format for chat messages, one in locale and one in message thread component
21+
'date-time-customization',
1922
// Demo feature. Used in live-documentation of conditional compilation.
2023
// Do not use in production code.
2124
'demo',
25+
// dialpad
26+
'dialpad',
2227
// Ability to upload/download files in message thread.
2328
'file-sharing',
24-
// Adhoc calls to a Teams user.
25-
'teams-adhoc-call',
26-
// PSTN calls
27-
'PSTN-calls',
28-
// props to allow Contoso to overwrite timestamp format for chat messages, one in locale and one in message thread component
29-
'date-time-customization',
3029
// 1 to N Calling feature.
3130
'one-to-n-calling',
32-
// Support Calling SDK isReceiving flag, shows a loading spinner on the video tile when isAvailable is true but isReceiving is false
33-
'video-stream-is-receiving-flag',
34-
// dialpad
35-
'dialpad',
31+
// PSTN calls
32+
'PSTN-calls',
3633
// rooms
3734
'rooms',
38-
'call-readiness',
39-
'unsupported-browser'
35+
// Adhoc calls to a Teams user.
36+
'teams-adhoc-call',
37+
// Joining calls using teams token
38+
'teams-identity-support',
39+
'unsupported-browser',
40+
// Support Calling SDK isReceiving flag, shows a loading spinner on the video tile when isAvailable is true but isReceiving is false
41+
'video-stream-is-receiving-flag',
4042
],
4143
// A list of stabilized features.
4244
// These features can be listed in the conditional compilation directives without
@@ -46,7 +48,7 @@ process.env['COMMUNICATION_REACT_FLAVOR'] === 'stable' &&
4648
// Do not use in production code.
4749
'stabilizedDemo',
4850
]
49-
}
51+
}
5052
]);
5153

5254
plugins.push([

0 commit comments

Comments
 (0)