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

feat: Reword login form disabled warning #37949 #37953

Merged
merged 2 commits into from Mar 19, 2024

Conversation

moan0s
Copy link
Contributor

@moan0s moan0s commented Apr 27, 2023

Summary

Rewords & restyles the warning used when the nextcloud login form is disabled

TODO

  • Decide if warning should be removed (this PR) or if the text should be replaced

Checklist

@szaimen szaimen added the 3. to review Waiting for reviews label Apr 27, 2023
@szaimen szaimen added this to the Nextcloud 27 milestone Apr 27, 2023
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

This PR is preferred by me over #37952. Just one small suggestion, see below.

core/src/views/Login.vue Outdated Show resolved Hide resolved
@szaimen szaimen requested review from a team, artonge, skjnldsv and Pytal and removed request for a team April 27, 2023 13:43
@szaimen
Copy link
Contributor

szaimen commented Apr 27, 2023

@moan0s please rebase this branch from master, run npm ci and npm run build and commit the changed files here. Then we can merge this. Thanks a lot! :)

@szaimen szaimen enabled auto-merge April 27, 2023 14:06
auto-merge was automatically disabled April 27, 2023 14:07

Head branch was pushed to by a user without write access

@moan0s
Copy link
Contributor Author

moan0s commented Apr 27, 2023

I hope I did the rebase correctly, files should be okay

Copy link
Member

@nimishavijay nimishavijay left a comment

Choose a reason for hiding this comment

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

Great catch, already a good improvement! left a comment with some slight changes in wording :)

core/src/views/Login.vue Show resolved Hide resolved
@skjnldsv skjnldsv mentioned this pull request May 3, 2023
This was referenced May 9, 2023
@szaimen szaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels May 16, 2023
@blizzz blizzz mentioned this pull request May 17, 2023
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

Needs a new Nextcloud vue 8.x version now to get released, updated here in server. Then we can rebase this branch and afterwards include the change here.

apps/files/js/app.js Outdated Show resolved Hide resolved
core/src/views/Login.vue Outdated Show resolved Hide resolved
@blizzz blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023
@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
This was referenced Nov 6, 2023
This was referenced Nov 14, 2023
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@timonegk
Copy link

I would also approve this change, any chance of merging it in the near future?

This was referenced Mar 12, 2024
@susnux susnux force-pushed the reword-disabled-login-form branch from b9a2e28 to abbd844 Compare March 17, 2024 18:56
@susnux susnux dismissed szaimen’s stale review March 17, 2024 18:57

nextcloud-vue was updated

@susnux susnux added bug design Design, UI, UX, etc. 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Mar 17, 2024
@susnux susnux force-pushed the reword-disabled-login-form branch from abbd844 to 654a2e6 Compare March 17, 2024 19:10
moan0s and others added 2 commits March 17, 2024 20:22
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
@susnux susnux force-pushed the reword-disabled-login-form branch from 654a2e6 to d397dd6 Compare March 17, 2024 19:24
@susnux
Copy link
Contributor

susnux commented Mar 17, 2024

Rebased - but I think drone does not work on forks?

@Altahrim Altahrim mentioned this pull request Mar 18, 2024
@skjnldsv skjnldsv merged commit d9e1350 into nextcloud:master Mar 19, 2024
96 of 103 checks passed
Copy link

welcome bot commented Mar 19, 2024

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

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 design Design, UI, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve or remove warning when hiding native login form
8 participants