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.

Sign up for GitHub

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

Jump to bottom

[stable22] Fix file creation from template without ext #28881

Merged
merged 3 commits into from
Sep 21, 2021
Merged

[stable22] Fix file creation from template without ext #28881

merged 3 commits into from
Sep 21, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Sep 17, 2021 •
edited by PVince81
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #28871

@skjnldsv @backportbot
Fix file creation from template without ext
265aedc 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 22.1.2 milestone Sep 17, 2021
@PVince81
Copy link
Member

@artonge thanks for fixing the partial backport. When you do, please make sure to remove or strike out the conflict notice in the original post. I've done that for you now 🙂

@PVince81
Copy link
Member

looks like you forgot recompiling. I just tested and it was broken.

I'll recompile and retest

@PVince81
Copy link
Member

/compile amend /

@artonge @nextcloud-command
Fix partial backport
c128e0a 
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@PVince81
Copy link
Member

strangely from this PR I can't create a text file from template, not even with an extension

but it works on stable22 with an extension

maybe issue with the conflict resolution ?

@artonge
Copy link
Contributor

artonge commented Sep 21, 2021

/compile amend /

@artonge @nextcloud-command
Use legacy call of generateOcsUrl
0e77b0f 
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@artonge
Copy link
Contributor

artonge commented Sep 21, 2021 •
edited
Loading

@PVince81 problem fixed here: 0e77b0f need approval now :)

@MichaIng MichaIng merged commit 3558d87 into stable22 Sep 21, 2021
@MichaIng MichaIng deleted the backport/28871/stable22 branch September 21, 2021 17:37
@blizzz blizzz mentioned this pull request Sep 23, 2021
Merged
4 tasks
@MichaIng MichaIng modified the milestones: Nextcloud 22.1.2, Nextcloud 22.2.0 Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artonge artonge artonge approved these changes

@MichaIng MichaIng MichaIng approved these changes

@julien-nc julien-nc Awaiting requested review from julien-nc

@PVince81 PVince81 Awaiting requested review from PVince81

@Pytal Pytal Awaiting requested review from Pytal

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees
No one assigned
Labels
bug feature: templates
Projects
None yet
Milestone
Nextcloud 22.2.0
Development

Successfully merging this pull request may close these issues.
4 participants
@PVince81 @artonge @MichaIng @skjnldsv