averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-27 18:37:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
53,072 Commits 689 Branches 1,186 Tags
85e369cddb7b347cccd597ab2f65fc201632091d
Commit Graph

38 Commits

Author SHA1 Message Date
Christoph Wurst
85e369cddb Fix multiline comments 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-08 22:24:54 +02:00
Christoph Wurst
1a9330cd69 Update the license headers for Nextcloud 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-31 14:52:54 +02:00
Roeland Jago Douma
6ea1aef031 Merge pull request #19723 from nextcloud/bug/18603/avatar-response 
Always use status 200 for avatar response
 2020-03-03 16:15:14 +01:00
Daniel Kesselberg
68148f4073 Always use status 200 for avatar response 
As discussed in #18603 caching a 201 response is hard. It's now possible to distinguish between generated and uploaded avatars by reading the X-NC-IsCustomAvatar (0 = generated, 1 = uploaded) header.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-03-01 00:42:24 +01:00
Joas Schilling
a92ab77747 Also cache avatars when it's not allowed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-28 10:44:15 +01:00
Christoph Wurst
5bf3d1bb38 Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Joas Schilling
738e6bf079 Merge pull request #17715 from nextcloud/fix/5456/respect_avatar_privacy 
Honor avatar visibility settings
 2019-12-04 10:28:45 +01:00
Roeland Jago Douma
68748d4f85 Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Roeland Jago Douma
54eb27dab2 Update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-13 20:43:20 +01:00
Roeland Jago Douma
0bd1378f81 Honor avatar visibility settings 
Fixes #5456
Only when an avatar is set to public should we show it to the public.
For now this has an open question as to how to solve federated avatars.
But I assume a dedicated paramter or endpooint would make sense there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-28 13:48:34 +01:00
Michael Weimann
bf1253cb49 Implement guest avatar endpoint 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-02-07 14:23:16 +01:00
Joas Schilling
decd196162 Make the info available if the avatar was uploaded or generated 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-01 10:56:22 +02:00
John Molakvoæ (skjnldsv)
543188d0cb Removed debug stack 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-15 15:40:10 +02:00
John Molakvoæ (skjnldsv)
156da29cea Avatar imagick bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
eea6f74ca4 Controller tests fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
adf3856d35 Return Svg avatars 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
Roeland Jago Douma
e5cc8be9d5 Fix usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-04 08:48:54 +02:00
Morris Jobke
d3d045dd5c Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Morris Jobke
3d4c698f44 Improve OC_Image code to not guess the type of input, but actually request the specific methods to be called 
Followup to #7836

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-18 13:40:55 +01:00
Roeland Jago Douma
ba648eecdf Move avatar code to Avatar Class 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
604596ec16 Always generate avatar 
Even if no avatar is set we should just generate the image. This to not
duplicate the code on all the clients. And only server images from the
avtar endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Morris Jobke
0eebff152a Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Lukas Reschke
8ad17a66d6 Exclude avatar from Same-Site Cookie requirement 
Required to work with the upcoming Collabora avatar integration.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-10-11 14:41:34 +02:00
Joas Schilling
0aff1c9268 Return the user id in case of an error 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-29 11:10:30 +02:00
Roeland Jago Douma
aa6d8fcdbf Fix AvatarController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:15 +02:00
Roeland Jago Douma
5c602f3217 Cache all avatar responses 
* Cache for 30 minutes
* Also cache when avatar can't be found

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-30 09:43:36 +01:00
Roeland Jago Douma
b05fe45d52 Fix avatar on exif rotated images 
Fixes #1928

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-26 21:37:11 +02:00
Joas Schilling
656e3f7a24 Check the mimetype before reading the content and catch exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-18 16:22:20 +02:00
Roeland Jago Douma
6740c627b8 Move AvatarController over to FileDisplayResponse 2016-09-05 15:11:45 +02:00
Roeland Jago Douma
14136295b7 Cache avatars properly 
* Set proper caching headers for avatars (15 minutes)
* For our own avatar use some extra logic to invalidate when we update
 2016-08-30 09:00:16 +02:00
Roeland Jago Douma
b1a090f357 AvatarController use proper JSONResponse 
* Do not rely on DataResponse magic. We want JSON so use JSON
* Fix tests
 2016-08-29 21:52:14 +02:00
Roeland Jago Douma
2f03853fb9 AvatarController cleanup 
* Use all DI components
* Let the AppFramework resolve the AvatarController
* Update unit tests
* Unit tests no longer require DB
 2016-08-25 21:39:14 +02:00
Roeland Jago Douma
0cb8f74cd1 Delete IE8 support in the avatar controller 2016-08-16 20:48:04 +02:00
Joas Schilling
0215b004da Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
ba87db3fcc Fix others 2016-07-21 18:13:57 +02:00
Lukas Reschke
5fdde426eb Add fancy layout 2016-06-09 17:55:26 +02:00
Lukas Reschke
aba539703c Update license headers 2016-05-26 19:57:24 +02:00
Lukas Reschke
a4b19a5b1e Rename files to be PSR-4 compliant 2016-04-06 11:00:52 +02:00