Skip to content

Use nextcloud-password-confirmation - #12409

Merged
MorrisJobke merged 3 commits into
masterfrom
admin-vue-approval-fix
Nov 12, 2018
Merged

Use nextcloud-password-confirmation#12409
MorrisJobke merged 3 commits into
masterfrom
admin-vue-approval-fix

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Nov 12, 2018

Copy link
Copy Markdown
Member

@skjnldsvskjnldsv added this to the Nextcloud 15 milestone Nov 12, 2018
@skjnldsvskjnldsv self-assigned this Nov 12, 2018
skjnldsv added a commit to skjnldsv/nextcloud-password-confirmation that referenced this pull request Nov 12, 2018
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the admin-vue-approval-fix branch from b37995f to 1cb5f31CompareNovember 12, 2018 10:59

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice!

Comment threadcore/js/js.js Outdated
Comment threadcore/js/js.js Outdated
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 12, 2018

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The nicest!

Haven't tested, but code looks good 👍

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

shiny 👍 tested, working.

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 12, 2018

@JanDragonJanDragon left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Code looks good.

@MorrisJobke
MorrisJobke merged commit 237c70d into masterNov 12, 2018
@MorrisJobke
MorrisJobke deleted the admin-vue-approval-fix branch November 12, 2018 13:48
@ChristophWurst

Copy link
Copy Markdown
Member

@MorrisJobke one does not simply merge fixup commits

@ChristophWurst

Copy link
Copy Markdown
Member

@rullzer guess we need that CI check you once mentioned ;)

@rullzer

Copy link
Copy Markdown
Member

See ;) told you!

@skjnldsv

Copy link
Copy Markdown
MemberAuthor

Backport in #12416

@MorrisJobke

Copy link
Copy Markdown
Member

@MorrisJobke one does not simply merge fixup commits

Then don't set "4 - To release" if the history is not ready ;)

@ChristophWurst

Copy link
Copy Markdown
Member

blizzz added 4. to release

🙈

@blizzz

Copy link
Copy Markdown
Member

Didn't review commit messages, only code 👅

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@skjnldsv@ChristophWurst@rullzer@MorrisJobke@blizzz@JanDragon