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

Allow URI as data for vcard PHOTO #13117

Merged
merged 3 commits into from Jan 4, 2019
Merged

Allow URI as data for vcard PHOTO #13117

merged 3 commits into from Jan 4, 2019

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv added this to the Nextcloud 16 milestone Dec 17, 2018
@skjnldsv skjnldsv self-assigned this Dec 17, 2018
@skjnldsv
Copy link
Member Author

/backport to stable15

@skjnldsv
Copy link
Member Author

/backport to stable14

@nickvergessen
Copy link
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
Copy link
Member Author

skjnldsv commented Dec 17, 2018 •
edited

#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

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 17, 2018
@skjnldsv skjnldsv force-pushed the vcard-avatar-fixes branch 2 times, most recently from bc4168e to 2c3ad43 Compare December 17, 2018 16:44
@skjnldsv skjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 17, 2018
@skjnldsv
Copy link
Member Author

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

@skjnldsv
Copy link
Member Author

Failure unrelated! Please review! :)

@skjnldsv
Copy link
Member Author

Bump! :)

@MorrisJobke MorrisJobke mentioned this pull request Jan 4, 2019
Merged
3 tasks
MorrisJobke
MorrisJobke approved these changes Jan 4, 2019
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Code makes sense 👍

skjnldsv and 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
Copy link
Member

rebased and autosquashed

@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 Jan 4, 2019
@rullzer rullzer merged commit 846d21e into master Jan 4, 2019
@rullzer rullzer deleted the vcard-avatar-fixes branch January 4, 2019 20:34
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Jan 4, 2019
Merged
@backportbot-nextcloud
Copy link

backport to stable15 in #13366

@backportbot-nextcloud
Copy link

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

@MorrisJobke
Copy link
Member

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

@skjnldsv Mind to do this?

@skjnldsv skjnldsv mentioned this pull request Jan 21, 2019
Merged
@skjnldsv
Copy link
Member Author

Backport in #13708

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

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@georgehrke georgehrke georgehrke approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst ChristophWurst is a code owner

@juliushaertl juliushaertl Awaiting requested review from juliushaertl

Assignees

@skjnldsv skjnldsv

Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: dav
Projects
None yet
Milestone
Nextcloud 16
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@skjnldsv @nickvergessen @MorrisJobke @georgehrke @rullzer