80b27fdb93
Merge pull request #7342 from nextcloud/fix_carddav_converter
...
CardDAV convertor check should not be to wide
2017-12-11 16:03:07 +01:00
5b20600da9
Merge pull request #7313 from nextcloud/ensure-that-x-oc-mtime-header-is-an-integer-with-chunked-uploads
...
Ensure that X-OC-MTime header is an integer with chunked uploads
2017-12-11 15:07:05 +01:00
40633c5e54
CardDAV convertor check should not be to wide
...
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 11:58:02 +01:00
de8fefeb18
Merge pull request #7395 from nextcloud/remove-unused
...
Remove unused variables
2017-12-06 13:09:01 +01:00
a73f86912f
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-05 09:58:15 +01:00
d2fe30d464
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-04 15:23:20 +01:00
c8a29ec942
A failed storage is a not available storage
...
We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-04 15:23:11 +01:00
2a7b1bae10
Reject X-OC-MTime header if given as a string with hexadecimal notation
...
In PHP 7.X hexadecimal notation support was removed from "is_numeric",
so "sanitizeMtime" directly rejected those values; in PHP 5.X, on the
other hand, "sanitizeMtime" returned 0 when a string with hexadecimal
notation was given (as it was the behaviour of "intval"). To provide a
consistent behaviour between PHP versions, and given that it does not
make much sense to send X-OC-MTime in hexadecimal notation, now
X-OC-MTime is always rejected if given as a string with hexadecimal
notation.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-28 01:08:52 +01:00
ffe034abb0
Don't use runInSeparateProcess
...
Directly calling "header" in the PHPUnit process causes the "Cannot
modify header information - headers already sent by" error to be thrown.
Instead of running the test in a separate process, which is slower, this
commit wraps the call to "header" in a method that can be mocked in the
tests.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:45 +01:00
2af3d8a9b2
Make possible to provide a specific HTTP request object to File
...
This will be used in a following commit to test how the X-OC-MTime
header is handled.
This commit is based on the "make File::put() more testable" commit
(included in 018d45cad97e0) from ownCloud by Artur Neumann.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:41 +01:00
01e346b2ae
Ensure that X-OC-MTime header is an integer also with chunked uploads
...
This commit extends the changes introduced in pull request #3793 also to
chunked uploads.
The "sanitizeMTime" method name is the same used in the equivalent pull
request to this one from ownCloud (28066).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:37:51 +01:00
3f7267e0e9
Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error
...
catch errors when parsing calendar data for calendar query requests
2017-11-27 17:50:37 +01:00
573551253e
Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncToken
...
Log InvalidSyncToken on DAV in debug level
2017-11-27 17:27:41 +01:00
ea117bac31
catch errors when parsing calendar data for calendar query requests
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-27 17:14:18 +01:00
88905c6293
Log InvalidSyncToken on DAV in debug level
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:37:11 +01:00
26a5fff423
Log NotImplementedException on DAV in debug level
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:17:01 +01:00
f347e2e4a6
Merge pull request #7047 from nextcloud/add-support-for-files-with-no-permissions
...
Add support for files with no permissions
2017-11-20 16:15:52 +01:00
eeb0cfdaf5
Merge pull request #7152 from nextcloud/bugfix/noid/adjust_calendarobject_size_after_applying_class
...
remove cached size from shared calendar objects
2017-11-17 08:28:34 +01:00
20868e17e8
Merge pull request #7193 from nextcloud/bugfix/noid/invitation-email-refinements
...
refine invitation email
2017-11-16 21:11:44 +01:00
f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api
...
Calendar API for apps
2017-11-16 21:10:35 +01:00
b073b13d9f
refine invitation email
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-16 13:54:19 +01:00
072652b2af
show name of organizer in from name of invitation email
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-14 21:23:27 +01:00
19b77039d7
remove cached size from shared calendar objects
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-12 17:30:22 +01:00
7784672cc0
add option to filter CalendarAPI by componenttype
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
fa416e031b
integrate Dav app with Calendar API
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
b754a2e385
Merge pull request #7042 from nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects
...
ensure uid for calendar objects is unique
2017-11-07 21:55:09 +01:00
f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables
...
Remove unused variables
2017-11-07 16:18:40 +01:00
31c5c2a592
Change @georgehrke's email
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
4df08f296b
ensure uid for calendar objects is unique
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-06 14:25:08 +01:00
5445b1ff17
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:43:45 +01:00
43147aeada
fancify invitation emails
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:03 +01:00
1bb048d11f
Correctly use the email templating
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
b14b933062
Language depending dates
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
cf04093fa6
Fix phpStorm complaints
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
c899f35261
DAV: Initial email customization support
...
Signed-Off-By: Leon Klingele <leon@struktur.de>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:19:39 +01:00
555d582f35
Return whether the file is readable or not in the DAV permissions
...
Until now it was safe to assume that every file was readable by its
owner, so there was no need to return whether the file was readable or
not. However, with the introduction of end to end encryption that is no
longer the case, and it is now necessary to explicitly provide that
information.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:00 +01:00
b3ff9a2248
Merge pull request #6849 from nextcloud/fix-missing-translation-of-personal-calendar-in-activity
...
Fix missing translation of "Personal" calendar in activities
2017-10-31 15:05:26 +01:00
143ff6a622
Add a doc why this should not be removed
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-23 12:35:55 +02:00
1855204ad9
remove reminders from read-only shared calendars
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-10-22 14:19:29 +02:00
bb1af9b284
Merge pull request #6811 from nextcloud/feature/noid/disable_caldav_invitations
...
Opt out of IMip CalDAV Plugin
2017-10-19 11:57:52 +02:00
bdb0265644
Fix missing translation of "Personal" calendar in activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-16 18:41:33 +02:00
b958725f78
Make it possible to opt out of IMip Plugin for CalDAV
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-10-16 13:49:46 +02:00
7828cf454e
add admin settings panel for dav app
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-10-16 13:49:08 +02:00
79c4538511
Dav: codestyle fixes in PluginManager
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-14 20:51:59 +02:00
a829ac787a
Let apps register Sabre plugins or collections
...
upstream #26761
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-14 20:50:53 +02:00
7c53f921a9
Use ::class to avoid errors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 12:36:20 +02:00
fd5465d509
Fix class name, regression from 44cf67accd
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 12:35:52 +02:00
3b4ab6560b
Check if the user/group exists for dav shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-05 12:48:10 +02:00
155d451cf8
Fix copy paste errors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
blizzz
Morris Jobke
Roeland Jago Douma
Lukas Reschke
Daniel Calviño Sánchez
Thomas Müller
Georg Ehrke
Björn Schießle
Roeland Jago Douma
Joas Schilling
Leon Klingele
Julius Härtl
Vincent Petry