Merge remote-tracking branch 'upstream/master' into account-linking-2

Author: ZiyamSanthosh

en/asgardeo/docs/apis/organization-apis/restapis/org-management.yaml

@@ -780,6 +780,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - ref
       properties:
         id:
@@ -795,6 +796,9 @@ components:
           type: string
           enum: [ ACTIVE, DISABLED ]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         hasChildren:
           type: boolean
           example: false
@@ -812,6 +816,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - created
         - lastModified
         - type
@@ -832,6 +837,9 @@ components:
           type: string
           enum: [ACTIVE, DISABLED]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         created:
           type: string
           example: '2021-10-25T12:31:53.406Z'
@@ -859,6 +867,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - created
         - lastModified
         - type
@@ -879,6 +888,9 @@ components:
           type: string
           enum: [ACTIVE, DISABLED]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         created:
           type: string
           example: '2021-10-25T12:31:53.406Z'
@@ -1019,6 +1031,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - created
         - lastModified
         - type
@@ -1039,6 +1052,9 @@ components:
           type: string
           enum: [ACTIVE, DISABLED]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         created:
           type: string
           example: '2021-10-25T12:31:53.406Z'

en/asgardeo/docs/apis/restapis/org-management.yaml

@@ -438,7 +438,7 @@ paths:
         - Organization
       description: |
         This API updates the editable fields of the organization associated with the currently accessing organization.
-        Currently only the organization name can be updated using this API.
+        Currently only the organization name and version can be updated using this API.
         
         <b>Scopes (Permissions) required:</b> `internal_organization_update`
       summary: Update organization details of the currently accessing organization.
@@ -703,6 +703,9 @@ components:
           type: string
           enum: [ACTIVE, DISABLED]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         attributes:
           type: array
           items:
@@ -770,6 +773,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - ref
       properties:
         id:
@@ -785,6 +789,9 @@ components:
           type: string
           enum: [ ACTIVE, DISABLED ]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         hasChildren:
           type: boolean
           example: false
@@ -802,6 +809,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - created
         - lastModified
         - type
@@ -822,6 +830,9 @@ components:
           type: string
           enum: [ACTIVE, DISABLED]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         created:
           type: string
           example: '2021-10-25T12:31:53.406Z'
@@ -849,6 +860,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - created
         - lastModified
         - type
@@ -869,6 +881,9 @@ components:
           type: string
           enum: [ACTIVE, DISABLED]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         created:
           type: string
           example: '2021-10-25T12:31:53.406Z'
@@ -1003,6 +1018,7 @@ components:
         - name
         - orgHandle
         - status
+        - version
         - created
         - lastModified
         - type
@@ -1023,6 +1039,9 @@ components:
           type: string
           enum: [ACTIVE, DISABLED]
           example: ACTIVE
+        version:
+          type: string
+          example: 'v1.0.0'
         created:
           type: string
           example: '2021-10-25T12:31:53.406Z'

en/asgardeo/docs/guides/organization-management/inheritance-in-organizations/email-sms-templates-inheritance.md

@@ -0,0 +1 @@
+{% include "../../../../../includes/guides/organization-management/inheritance-in-organizations/email-sms-templates-inheritance.md" %}

en/asgardeo/docs/guides/organization-management/inheritance-in-organizations/index.md

@@ -0,0 +1 @@
+{% include "../../../../../includes/guides/organization-management/inheritance-in-organizations/index.md" %}

en/asgardeo/docs/guides/organization-management/inheritance-in-organizations/login-registration-inheritance.md

@@ -0,0 +1 @@
+{% include "../../../../../includes/guides/organization-management/inheritance-in-organizations/login-registration-inheritance.md" %}

en/asgardeo/docs/guides/organization-management/inheritance-in-organizations/ui-branding-inheritance.md

@@ -0,0 +1 @@
+{% include "../../../../../includes/guides/organization-management/inheritance-in-organizations/ui-branding-inheritance.md" %}

en/asgardeo/mkdocs.yml

@@ -445,6 +445,10 @@ nav:
         - Share user profiles with organizations: guides/organization-management/share-user-profiles.md
         - Try a B2B use case: guides/organization-management/try-a-b2b-use-case.md
         - API authorization for organizations: guides/organization-management/api-authorization-for-b2b.md
+        - Inheritance in organizations:
+            - Inheritance in organizations: guides/organization-management/inheritance-in-organizations/index.md
+            - UI branding inheritance: guides/organization-management/inheritance-in-organizations/ui-branding-inheritance.md
+            - Email and SMS template inheritance: guides/organization-management/inheritance-in-organizations/email-sms-templates-inheritance.md
         - Organization discovery:
             - Organization discovery: guides/organization-management/organization-discovery/index.md
             - Email domain based organization discovery: guides/organization-management/organization-discovery/email-domain-based-organization-discovery.md

en/identity-server/7.1.0/docs/guides/organization-management/inheritance-in-organizations/email-sms-templates-inheritance.md

@@ -0,0 +1 @@
+{% include "../../../../../../includes/guides/organization-management/inheritance-in-organizations/email-sms-templates-inheritance.md" %}

en/identity-server/7.1.0/docs/guides/organization-management/inheritance-in-organizations/index.md

@@ -0,0 +1 @@
+{% include "../../../../../../includes/guides/organization-management/inheritance-in-organizations/index.md" %}

en/identity-server/7.1.0/docs/guides/organization-management/inheritance-in-organizations/ui-branding-inheritance.md

@@ -0,0 +1 @@
+{% include "../../../../../../includes/guides/organization-management/inheritance-in-organizations/ui-branding-inheritance.md" %}