Skip to content

include nc 13 in travis test and adjust cases accordingly#427

Merged
blizzz merged 2 commits into
masterfrom
update-test-matrix
Jan 15, 2018
Merged

include nc 13 in travis test and adjust cases accordingly#427
blizzz merged 2 commits into
masterfrom
update-test-matrix

Conversation

@blizzz

@blizzz blizzz commented Jan 15, 2018

Copy link
Copy Markdown
Member

to solve #425

let's see whether i caught everything

Comment thread templates/js_tpl.php
<&= escapeHTML(title == '' ? encodeURI(url) : title ) &>
</a>
<span class="bookmark_edit bookmark_edit_btn">
<img class="svg" src="<?php print_unescaped(OCP\image_path("", "actions/rename.svg")); ?>" title="<?php p($l->t('Edit')); ?>">

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.

(see #426 ;))

required for Nextcloud 14/master where it was removed
@blizzz blizzz force-pushed the update-test-matrix branch from 72ac02f to 4b3c3b1 Compare January 15, 2018 21:59
@blizzz

blizzz commented Jan 15, 2018

Copy link
Copy Markdown
Member Author

fixed with recent commit :)

UPDATE ah, not realized #426 was a PR…

@marcelklehr marcelklehr 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.

lgtm 🚢

Comment thread templates/js_tpl.php
title="<?php p($l->t('Delete')); ?>">
</span>
<span class="tag_edit">
<img class="svg" src="<?php print_unescaped(OCP\image_path("", "actions/rename.svg")); ?>"

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.

Is this a good idea? I have no clue how the templating works, though. From this I assume, it's a separate scope, which would give this a lgtm verdict.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

yeah, he methods are defined in lib/private/legacy/template/functions.php and also called by the Template class. These short forms are also used in server and shipped apps.

@blizzz blizzz merged commit 65504ed into master Jan 15, 2018
@blizzz blizzz deleted the update-test-matrix branch January 15, 2018 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants