Skip to content

Allow URI as data for vcard PHOTO - #13117

Merged
rullzer merged 3 commits into
masterfrom
vcard-avatar-fixes
Jan 4, 2019
Merged

Allow URI as data for vcard PHOTO#13117
rullzer merged 3 commits into
masterfrom
vcard-avatar-fixes

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Dec 17, 2018

Copy link
Copy Markdown
Member

@skjnldsvskjnldsv added this to the Nextcloud 16 milestone Dec 17, 2018
@skjnldsvskjnldsv self-assigned this Dec 17, 2018
@skjnldsv

skjnldsv commented Dec 17, 2018

Copy link
Copy Markdown
MemberAuthor

/backport to stable15

@skjnldsv

skjnldsv commented Dec 17, 2018

Copy link
Copy Markdown
MemberAuthor

/backport to stable14

@nickvergessen

nickvergessen commented Dec 17, 2018

Copy link
Copy Markdown
Member

Does this fix further issues from
https://github.com/nextcloud/server/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22feature%3A+dav%22+photo

at least #3366 and #4358 sound related?

@skjnldsv

skjnldsv commented Dec 17, 2018•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

#4358: definitely! I'll investigate #3366! :)
Thanks @nickvergessen 🤗

EDIT:, hum, I actually not thinking that it will fixe those two.
Ther'e not related to the PHOTO cache, but are thrown directly by the library. I guess this needs to be fixed in https://github.com/sabre-io/vobject

georgehrke
georgehrke reviewed Dec 17, 2018
View reviewed changes
Comment threadapps/dav/lib/CardDAV/PhotoCache.php Outdated
@skjnldsvskjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 17, 2018
georgehrke
georgehrke reviewed Dec 17, 2018
View reviewed changes
Comment threadapps/dav/lib/CardDAV/PhotoCache.php Outdated
@skjnldsv
skjnldsvforce-pushed the vcard-avatar-fixes branch 2 times, most recently from bc4168e to 2c3ad43CompareDecember 17, 2018 16:44
@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 17, 2018
@skjnldsv

skjnldsv commented Dec 17, 2018

Copy link
Copy Markdown
MemberAuthor

Sorry about the push mess. I'm tired it seems.... 💤

@skjnldsv

skjnldsv commented Dec 18, 2018

Copy link
Copy Markdown
MemberAuthor

Failure unrelated! Please review! :)

@skjnldsv

skjnldsv commented Dec 21, 2018

Copy link
Copy Markdown
MemberAuthor

Bump! :)

@MorrisJobkeMorrisJobke mentioned this pull request Jan 4, 2019
Merged
3 tasks
MorrisJobke
MorrisJobke reviewed Jan 4, 2019
View reviewed changes
Comment threadapps/dav/lib/CardDAV/PhotoCache.php
MorrisJobke
MorrisJobke reviewed Jan 4, 2019
View reviewed changes
Comment threadapps/dav/lib/CardDAV/PhotoCache.php
MorrisJobke
MorrisJobke reviewed Jan 4, 2019
View reviewed changes
Comment threadapps/dav/lib/CardDAV/PhotoCache.php Outdated
MorrisJobke
MorrisJobke approved these changes Jan 4, 2019
View reviewed changes

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

Code makes sense 👍

skjnldsvand others added 3 commits January 4, 2019 20:04
@skjnldsv@MorrisJobke
Allow URI as data for vcard PHOTO
fa6c257
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv@MorrisJobke
Log failure on parsing
1d2d7fd
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@MorrisJobke@skjnldsv
Update apps/dav/lib/CardDAV/PhotoCache.php
7f5c38b
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Co-Authored-By: skjnldsv <skjnldsv@users.noreply.github.com>
@MorrisJobke

MorrisJobke commented Jan 4, 2019

Copy link
Copy Markdown
Member

rebased and autosquashed

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 4, 2019
@rullzer
rullzer merged commit 846d21e into masterJan 4, 2019
@rullzer
rullzer deleted the vcard-avatar-fixes branch January 4, 2019 20:34
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Jan 4, 2019
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Jan 4, 2019

Copy link
Copy Markdown

backport to stable15 in #13366

@backportbot-nextcloud

backportbot-nextcloudBot commented Jan 4, 2019

Copy link
Copy Markdown

The backport to stable14 failed. Please do this backport manually.

@MorrisJobke

MorrisJobke commented Jan 18, 2019

Copy link
Copy Markdown
Member

The backport to stable14 failed. Please do this backport manually.

@skjnldsv Mind to do this?

@skjnldsvskjnldsv mentioned this pull request Jan 21, 2019
Merged
@skjnldsv

skjnldsv commented Jan 21, 2019

Copy link
Copy Markdown
MemberAuthor

Backport in #13708

@SpamReceiverSpamReceiver mentioned this pull request Nov 7, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@georgehrkegeorgehrkegeorgehrke approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: dav

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

5 participants

@skjnldsv@nickvergessen@MorrisJobke@georgehrke@rullzer