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.

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

Improved vcard photo handling #19901

Merged
merged 4 commits into from
Apr 17, 2020
Merged

Conversation

nickvergessen
Copy link
Member

No description provided.

apps/dav/lib/CardDAV/CardDavBackend.php Show resolved Hide resolved
apps/dav/lib/CardDAV/CardDavBackend.php Outdated Show resolved Hide resolved
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.

Looks good.
🐘

@rullzer
Copy link
Member

rullzer commented Apr 1, 2020

CI says nope

@nickvergessen nickvergessen force-pushed the bugfix/noid/vcard-photo-handling branch from ff0b444 to fabec4c Compare April 2, 2020 08:47
@nickvergessen
Copy link
Member Author

@georgehrke final +1?

apps/dav/lib/CardDAV/CardDavBackend.php Show resolved Hide resolved
apps/dav/lib/CardDAV/CardDavBackend.php Outdated Show resolved Hide resolved
This was referenced Apr 4, 2020
@rullzer
Copy link
Member

rullzer commented Apr 14, 2020

sooooo?

@nickvergessen
Copy link
Member Author

I'm currently unsure about @georgehrke s comments.
Should we generate a new random etag?

nickvergessen and others added 4 commits April 15, 2020 15:49
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke georgehrke force-pushed the bugfix/noid/vcard-photo-handling branch from fabec4c to fe4527a Compare April 15, 2020 13:57
This was referenced Apr 15, 2020
@rullzer
Copy link
Member

rullzer commented Apr 17, 2020

Good to go now?

@georgehrke
Copy link
Member

👍 from my side

@rullzer rullzer merged commit ed56619 into master Apr 17, 2020
@rullzer rullzer deleted the bugfix/noid/vcard-photo-handling branch April 17, 2020 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants