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

[stable24] Temporary passwords fixes 31952 #32764

Merged
merged 1 commit into from
Jun 9, 2022
Merged

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Jun 8, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #31981

@artonge
Copy link
Contributor

artonge commented Jun 8, 2022

/compile amend /

…y passwords

for mail shares:

1- Changes style of "forgot password?" and "Back" button
2- Adds information about share password's expiration time in the emails sent.
3- Shows password expiration time in the Share menu
4- Fixes an issue when the message "Password expires..." would be shown for non email share types (which don't have temporary passswords)
5- At share's creation, password should only be sent when it's a permanent one

See also #31952

Signed-off-by: Cyrille Bollu <cyrpub@bollu.be>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nextcloud-command nextcloud-command force-pushed the backport/31981/stable24 branch from fc9d845 to e35cbd2 Compare June 8, 2022 13:22
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@PVince81 PVince81 added the 4. to release Ready to be released and/or waiting for tests to finish label Jun 8, 2022
@artonge
Copy link
Contributor

artonge commented Jun 9, 2022

CI failure unrelated

@artonge artonge merged commit 15649fc into stable24 Jun 9, 2022
@artonge artonge deleted the backport/31981/stable24 branch June 9, 2022 09:07
@blizzz blizzz mentioned this pull request Jun 9, 2022
2 tasks
id="request-password-button-not-talk"
value="<?php p($l->t('Request password')); ?>"
class="primary" />
<a id="request-password-button-not-talk"><?php p($l->t('Forgot password?')); ?></a>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StCyr any reason you reverted this ? I thought we wanted to keep the text "Request password" instead of "Forgot password"

maybe an oversight during conflict resolution ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants