Merge branch 'develop' into fix-set-password
This commit is contained in:
6 files changed
+15
-5
No files matched your search
@@ -1 +1,3 @@
|
||||
{{title (t "resources.auth-method.title_plural")}}
|
||||
|
||||
{{outlet}}
|
||||
@@ -1 +1,3 @@
|
||||
{{outlet}}
|
||||
{{title @model.displayName}}
|
||||
|
||||
{{outlet}}
|
||||
+2
@@ -1,3 +1,5 @@
|
||||
{{title (t 'actions.set-password')}}
|
||||
|
||||
<Form::Account::Password::SetPassword
|
||||
@model={{@model}}
|
||||
@submit={{route-action "setPassword" @model}}
|
||||
|
||||
+3
-1
@@ -1 +1,3 @@
|
||||
{{outlet}}
|
||||
{{title @model.displayName}}
|
||||
|
||||
{{outlet}}
|
||||
+3
-1
@@ -1 +1,3 @@
|
||||
{{outlet}}
|
||||
{{title @model.displayName}}
|
||||
|
||||
{{outlet}}
|
||||
@@ -4,9 +4,9 @@
|
||||
</h2>
|
||||
<p>{{t "resources.role.principal.description"}}</p>
|
||||
<Copyable
|
||||
@text={{@model.id}}
|
||||
@text={{@model.role.id}}
|
||||
@buttonText={{t "actions.copy-to-clipboard"}}
|
||||
@acknowledgeText={{t "states.copied"}}
|
||||
>
|
||||
<code>{{@model.id}}</code>
|
||||
<code>{{@model.role.id}}</code>
|
||||
</Copyable>
|
||||
Reference in new issue
Block a user