Skip to content

Conversation

@danxuliu
Copy link
Member

@danxuliu danxuliu commented Jul 12, 2019

Follow up to #15124
Fixes #16367

This fixes HTML messages in OC.Notification.showTemporary (as showHtml was not set based on isHTML), and also makes OCP.Toast to keep the old OC.Notification API when used directly.

@danxuliu danxuliu added bug 3. to review Waiting for reviews labels Jul 12, 2019
@danxuliu danxuliu added this to the Nextcloud 17 milestone Jul 12, 2019
@danxuliu danxuliu requested review from juliusknorr and skjnldsv July 12, 2019 06:56
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

sure

@MorrisJobke
Copy link
Member

JSUnit fails

@danxuliu
Copy link
Member Author

JSUnit fails

It should be fixed now.

This fixes HTML messages in "OC.Notification.showTemporary" (as
"showHtml" was not set based on "isHTML"), and also makes OCP.Toast to
keep the old OC.Notification API when used directly.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@MorrisJobke
Copy link
Member

Rebased and autosquashed.

@MorrisJobke MorrisJobke force-pushed the rename-parameter-in-ocp-toast-for-consistency-with-oc-notification branch from 3a1cc62 to 916c957 Compare July 12, 2019 14:15
@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 12, 2019
@MorrisJobke MorrisJobke merged commit c048c56 into master Jul 15, 2019
@delete-merged-branch delete-merged-branch bot deleted the rename-parameter-in-ocp-toast-for-consistency-with-oc-notification branch July 15, 2019 08:20
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.

OCP.Toast mismatch to old OC.Notifications options

5 participants