db9b2398dd
Fix group displaynames in activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-08 17:13:49 +01:00
f5ef9e02b2
emit pre-hooks earlier when not using part files
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:02:35 +01:00
fc4e0501f0
Fix integer overflow in ChunkingPlugin
...
Avoids errors when the size exceeds MAX_INT because of the cast to int. Better cast it to float to avoid this.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-06 18:47:26 +01:00
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import
...
Remove unused import statements
2018-02-14 22:23:07 +01:00
d3d045dd5c
Remove unused import statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
e2974f1133
Simplify return statement
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-13 21:55:24 +01:00
e5c08621af
Merge pull request #8023 from nextcloud/webdavsearch_limit_order_fixing
...
Respect limit and order in webdav search
2018-02-08 09:11:39 +01:00
c1ff12e234
CacheJail should apply limit and offset after searching
...
Else the results might not be correct.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 13:41:15 +01:00
6b5419ddf0
Adjust to updated searchdav library
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-07 13:41:15 +01:00
ec144281ef
Respect limit and order in webdav search
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 13:41:15 +01:00
9d6d23d1f7
keep previous exception when transforming to dav exception
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-07 13:34:30 +01:00
9896b15ec8
Only handle encrypted property on folders
...
Exposing the encrypted property is required for E2E. However, there is
no need to expose this on files as then it is server side encryption
(which the clients don't care about).
Better to not confuse the output.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-30 12:25:49 +01:00
eb51f06a3b
Use ::class statement instead of string
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 12:03:47 +01:00
a661f043e1
Remove unneeded semicolon and parentheses
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 23:46:40 +01:00
97c216ea06
Merge pull request #8071 from nextcloud/remove-silly-code
...
Cleanup unused code
2018-01-26 15:47:06 +01:00
c67736a542
Merge pull request #7707 from nextcloud/bugfix/noid/birthdaycalendar-different-uids
...
generate different UIDs for Birthday, Anniversary and Death event
2018-01-26 15:46:46 +01:00
c005fc6755
Cleanup unused code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 15:25:19 +01:00
c1e4f9f305
Use type casting instead of *val() method
...
It should be up to 6x faster
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 11:35:42 +01:00
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value
...
Return value immediately instead of assigning to a one-time variable
2018-01-26 10:15:39 +01:00
ec1d94c629
Merge pull request #8052 from nextcloud/fix-array-methods
...
Fix array method usages with a proper call
2018-01-26 09:53:13 +01:00
0a56d2185e
Return value immediately instead of assigning to a one-time variable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 00:02:03 +01:00
4dbee99b7b
Remove useless return statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:50:40 +01:00
7800a9bc24
Fix array method usages with a proper call
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:20:10 +01:00
c7d9e5fd63
Merge pull request #7354 from nextcloud/refacor-update-page-print
...
Refactor method to check if update is needed
2018-01-22 22:50:05 +01:00
24c58d39f4
Merge pull request #7909 from nextcloud/fix-migration-type-hints
...
Fix the type hints of migrations and correctly inject the wrapped sch…
2018-01-17 13:47:58 +01:00
4a5282ba21
Fix the type hints of migrations and correctly inject the wrapped schema into migrations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-17 11:37:36 +01:00
8614eb91db
Fix avatarHome
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 15:37:47 +01:00
91d3677446
Make sure the arrays are arrays
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-12 14:08:00 +01:00
e5cc8ebe7a
Return proper principal on the uploads collection listing
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 08:35:20 +01:00
1b8fc260c6
generate different UIDs for Birthday, Anniversary and Death event
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-01-04 20:15:24 +01:00
876238ce8b
Merge pull request #7533 from nextcloud/oc-28545-handle-oc-total-length-in-new-chunking
...
[oc] Handle OC-Total-Length in new chunking
2018-01-03 16:18:24 +01:00
0b4d18673e
Do not log user errors as log level 4
...
* hides log entries for the case the parent folder does not exist
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-03 11:58:55 +01:00
0585b776fb
Do no run SyncJob in cron
...
Fixes #7184
The SyncJob can be very resource intensive. Since it requests all users
on the system to create the system addressbook. In order to do this it
creates a vcard for every user and updates the addressbook.
There is no need for this job since the proper signals are emitted and
handled in the carddav backend to update the addressbook live.
Worst comes to worst there is always the occ command to bring the
address book in sync again.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 10:00:01 +01:00
8c5d656f3b
Handle OC-Total-Length in new chunking
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-15 14:46:36 +01:00
1ceeab9229
Fix unit tests for CalendarManager
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-12 09:33:52 +01:00
d98dea1eb1
Merge pull request #6884 from nextcloud/feature/3003/opt_out_of_birthday_calendar
...
Opt out of birthday calendar
2017-12-12 08:29:26 +01:00
f6ef779f97
Make ContactsStore a public API
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:18:58 +01:00
ba3c608a00
Merge pull request #6590 from nextcloud/dav-create-activities-for-publishing
...
Create activities for (un)publishing calendar events
2017-12-11 17:13:11 +01:00
c76c7a96fc
Update wording
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 16:28:40 +01:00
4c32de22bb
Create activities for (un)publishing calendar events
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-12-11 16:28:40 +01:00
6802e2b59a
Principal search: Take sharing settings into account
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
f543039858
exclude shared calendars from freeBusy
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
787e3d51b4
Fix functions to search for principals in the backend.
...
Add a "searchPrincipals" function to the NC principal backend.
Fix the "findByUri" function to respect the prefixPath.
Signed-off-by: Christoph Seitz <christoph.seitz@posteo.de>
2017-12-11 16:04:55 +01:00
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
f22e02cd79
Refactor method to check if update is needed
...
There was only one call, that actually needed the parameter to be set to true. So this change moved the print of the page to that location and replaces all other occurences with a direct call to the underlying OCP API.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-30 16:04:07 +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
2b51d84b98
generate birthday calendars in a background job after admin enabled them
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 16:17:18 +01:00
a87d986041
create a user's birthday calendar right after they requested it
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 11:28:34 +01:00
ef6f41a16c
respect admin / user choice about birthday calendars in corresponding hooks
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:57 +01:00
d59b3392ab
disallow users to create calendars with reserved names
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
1c106a66b1
adapt occ 'dav:sync-birthday-calendar command
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
5068d56fb0
add CalDAV interface that allows users to re-enable their birthday calendar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:50 +01:00
dc34622008
remember when a user deleted their contact birthdays calendar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-10 23:05:04 +01:00
8b22bfea4f
Add admin checkbox to disable birthday calendars
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 17:12:06 +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
Joas Schilling
Robin Appelman
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
blizzz
Georg Ehrke
Thomas Müller
Tobia De Koninck
Thomas Citharel
Christoph Seitz
Lukas Reschke
Daniel Calviño Sánchez
Björn Schießle
Leon Klingele
Julius Härtl
Vincent Petry