Commit Graph

2301 Commits

Author SHA1 Message Date
Nextcloud bot f3ec3bfa4a
[tx-robot] updated from transifex 2020-09-18 02:16:56 +00:00
J0WI 1639289b95 Update urls to stackoverflow.com to "HTTPS"
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2020-09-17 17:38:27 +02:00
Morris Jobke 99c9423766
Remove @suppress SqlInjectionChecker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-16 15:53:56 +02:00
Morris Jobke 04a3580d19
Remove phan config - was replaced by Psalm
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-16 14:46:29 +02:00
Nextcloud bot 869f3f5895
[tx-robot] updated from transifex 2020-09-15 10:48:26 +00:00
Morris Jobke c1ff011990
Merge pull request #22799 from nextcloud/bugfix/noid/dont-log-microsoft-webdav-client-trying-to-tag
Don't log Microsoft WebDAV client trying to tag things
2020-09-14 14:43:54 +02:00
Joas Schilling 2dbd6424f7
Don't log Microsoft WebDAV client trying to tag things
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-11 11:52:05 +02:00
Georg Ehrke b5204a78cc
Mitigate encoding issue with user principal uri
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-09-10 16:00:03 +02:00
Julius Härtl 1dddf6adc7
Properly catch exception from writing to stream when copying a file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-10 09:03:53 +02:00
Christoph Wurst 1f7f93a695
Update license headers for Nextcloud 20 (again)
There are still lots of outdated headers, so time for another round of
updates.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-07 14:37:44 +02:00
John Molakvoæ 54438c9d26
Merge pull request #21945 from nextcloud/fix-contact-download-picture
Changed Content-Disposition header to download Contact Photo with correct extension
2020-09-07 08:40:23 +02:00
Nextcloud bot da8cff9061
[tx-robot] updated from transifex 2020-09-07 02:16:39 +00:00
Nextcloud bot 27fbab131c
[tx-robot] updated from transifex 2020-09-06 02:16:52 +00:00
Jacob Neplokh e8a4feb1c6
Change Content-Disposition Header
- Make ALLOWED_CONTENT_TYPES public in order to use
- Add $fileName variable which uses "$node->getName()" to get the proper file name and "$file->getMimeType()" along with the ALLOWED_CONTENT_TYPES array in PhotoCache.php to get the proper file extension
- Make "$fileName" the name of the file in the Content-Disposition header when downloading a Contact's photo
- Add filename to the CardDAV integration image export test header
- Change headers in ImageExportPluginTest to reflect changes

Signed-off-by: Jacob Neplokh <me@jacobneplokh.com>
2020-09-05 11:46:25 -07:00
Nextcloud bot 62ab3eb700
[tx-robot] updated from transifex 2020-09-05 02:16:45 +00:00
John Molakvoæ 593d64d935
Merge pull request #17456 from brad2014/feature/brad2014/12391-improve-imip-mail-message-take-2 2020-09-04 19:53:02 +02:00
Julius Härtl 4cf29e598d
Do not keep the part file if the forbidden exception has retry set to false
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-03 11:00:24 +02:00
Brad Rubenstein 442af8c5d5 Minor cleanup: php-cs-fixer, tests, interface consistency
IMipPlugin.php Removed blank lines to make php-cs-fixer happy.
Minor cleanup:  bugs found by Psalm static checker
IEMailTemplate: The public interface to addBodyListItem also needs to include the new plainIndent parameter.
IMipPlugin: Fixes an undefined variable for events that do not have DTEND.  Also use explicit string conversion for parameters and properties in several places.

The new email template adds an additional blank line before "button" links in plain text, so the tests were fixed to include that additional blank line.

Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2020-09-02 17:54:36 +02:00
Nextcloud bot 41d95d9e5a
[tx-robot] updated from transifex 2020-08-30 02:16:07 +00:00
Nextcloud bot 2bc4094deb
[tx-robot] updated from transifex 2020-08-29 02:17:47 +00:00
Nextcloud bot 40e2339151
[tx-robot] updated from transifex 2020-08-28 02:16:21 +00:00
Roeland Jago Douma 7685d1fc61
Merge pull request #22421 from nextcloud/group-folder-quota-warning
show better quota warning for group folders and external storage
2020-08-26 21:15:47 +02:00
Robin Appelman 06ae93b270
fix tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-26 15:46:24 +02:00
Robin Appelman 460db942a0
Update apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
2020-08-26 12:20:46 +00:00
Robin Appelman aadf0f6f87
move calendar settings into their own group
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-25 19:11:28 +02:00
Nextcloud bot b287760694
[tx-robot] updated from transifex 2020-08-25 02:17:40 +00:00
Christoph Wurst 2a054e6c04
Update the license headers for Nextcloud 20
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-08-24 14:54:25 +02:00
Nextcloud bot d9b9de6d7d
[tx-robot] updated from transifex 2020-08-23 02:16:43 +00:00
Nextcloud bot bcbe1e1c9d
[tx-robot] updated from transifex 2020-08-22 02:16:27 +00:00
Nextcloud bot 69482049e6
[tx-robot] updated from transifex 2020-08-21 02:16:43 +00:00
brad2014 b0687b1182 Make icon set for CalDav event presentation, use in iMIP email.
iMIP e-mails were, as a hack, using filetypes icons for caldav
elements (titles, locations).  This commit creates a folder of
caldav element icons. To start, they are used in iMIP emails,
but eventually should be used by any app that wants to have icon
labels for caldav elements.

Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
2020-08-20 22:16:47 +02:00
brad2014 781359a582 iMIP email improvements (take 2)
This PR is a replacement for PR #17195. It is intended to be simpler
to review and approve, with fewer changes, some disabled by default.

It addresses issues #12391 and #13555, with the following changes:

- The plainText of iMIP emails has been upgraded as described in
issue #12391. The HTML design style has not been changed.

- Some of the HTML and plainText content has been rearranged
(simplified header language, moving the event title to from text
body to the first item in the bullet list, spelling corrections,
moving the description to the end of the list), per issue #12391.

- The interface for EMailTemplate has been extended: addBodyListItem
now takes an optional `plainIndent` parameter. Existing callers
see no change. Where new calls set the  new parameter >0, the list
item label (metaInfo) is put in column 1, and the value is indented
into column 2 (properly accounting for multiple lines, if any).

- An optional dav config setting has been added,
`invitation_list_attendees`. It defaults to 'no', leaving emails
unchanged. If set by the site admin to 'yes', then iMIP emails
include, for the organizer and each attendee, their name, email,
and a ✔︎ if they have accepted the invitation.

- Minor refactoring.

Notes:

- The labels for organizers and attendees list items are new, and
require translation/localization.

- Dav config settings are documented in the code, but not in the
Administrator's Guide.

Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
2020-08-20 22:16:47 +02:00
Joas Schilling 553cda2a6d
Don't load all calendar objects into memory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-20 07:56:25 +02:00
Morris Jobke 4361d65f5f
Merge pull request #22041 from nextcloud/feature/noid/typed_events_dav
Add Typed Events for CalDAV- and CardDAV-related Events
2020-08-19 19:34:12 +02:00
Morris Jobke fedf9c69d9
Use matching parameter names form interfaces and implementations
Found by Psalm 3.14.1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-19 18:16:35 +02:00
Georg Ehrke e6433eeb02
Typecast parameter of getAddressBookById
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-19 15:30:13 +02:00
Nextcloud bot 746e3f174f
[tx-robot] updated from transifex 2020-08-19 02:17:11 +00:00
Georg Ehrke 67f1ef4658
Add Typed Events for CalDAV- and CardDAV-related Events
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-18 21:40:57 +02:00
Morris Jobke 05df385538
Merge pull request #22236 from nextcloud/bugfix/noid/dav_sharing_backend_canWrite_isOwner
CalDAV: Add ability to limit sharing to owner
2020-08-18 16:48:43 +02:00
Georg Ehrke 14755d85d6
Add ability to limit sharing to owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-18 13:18:00 +02:00
Daniel Kesselberg 6f8147b18f
Fix some MissingDocblockType or InvalidDocblock warnings.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-08-14 15:10:48 +02:00
Roeland Jago Douma f1dd87dc50
Merge pull request #22200 from cweiske/duplicated-sql-where-line
Remove duplicated SQL addWhere line
2020-08-14 05:43:42 +02:00
Nextcloud bot 9bd58553db
[tx-robot] updated from transifex 2020-08-14 02:31:59 +00:00
Morris Jobke e9f5c7f649
Merge pull request #22128 from nextcloud/bugfix/noid/cleanup-chunks-on-failure
Delete chunks if the move on an upload failed
2020-08-13 20:47:08 +02:00
Julius Härtl 6722246aca
Return proper status when file didn't exist before
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-13 15:26:42 +02:00
Nextcloud bot 3a39f2ae91
[tx-robot] updated from transifex 2020-08-13 02:16:38 +00:00
Morris Jobke 55e79b8a6a
Merge pull request #22199 from nextcloud/techdebt/noid/PHPUnit_Framework_MockObject_MockObject
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to …
2020-08-12 13:55:36 +02:00
Morris Jobke 234b510652
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-12 13:55:19 +02:00
Julius Härtl cda5cfc01e
Adjust chunking test for non-existing target node
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-12 08:18:46 +02:00
Julius Härtl 860f6d8fcf
Delete chunks if the move on an upload failed
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-12 08:18:46 +02:00
Nextcloud bot ad6a4219a2
[tx-robot] updated from transifex 2020-08-12 02:16:50 +00:00
Christian Weiske ebe7081c2b Remove duplicated SQL addWhere line 2020-08-11 21:35:48 +02:00
Nextcloud bot 2498280801
[tx-robot] updated from transifex 2020-08-11 02:16:56 +00:00
Nextcloud bot 3db61c43ab
[tx-robot] updated from transifex 2020-08-09 02:16:37 +00:00
Nextcloud bot 1df567d5ad
[tx-robot] updated from transifex 2020-08-07 02:16:39 +00:00
Nextcloud bot cb1d9cfaf0
[tx-robot] updated from transifex 2020-08-06 02:17:11 +00:00
John Molakvoæ (skjnldsv) d2c0569b49
Fix search providers order and IDs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-08-05 17:57:17 +02:00
Joas Schilling 55473dd2eb
Merge pull request #22104 from nextcloud/enh/search/make-app-handle-the-order-logic
Make apps handle the order logic
2020-08-05 16:38:45 +02:00
Joas Schilling ea8f68bea6 Hand in the route and the parameters of the request
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-08-05 12:52:16 +00:00
John Molakvoæ a4d511d827
Merge pull request #22099 from nextcloud/fix/unified-search 2020-08-05 14:17:42 +02:00
John Molakvoæ (skjnldsv) d98f7c1bd8
Make apps handle the order logic
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-08-05 11:37:45 +02:00
Georg Ehrke b0c5457c42
IAddressBook: add isShared and isSystemAddressBook
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-05 09:04:41 +02:00
Nextcloud bot 1cf9f42817
[tx-robot] updated from transifex 2020-08-05 02:16:56 +00:00
John Molakvoæ (skjnldsv) 71b62c4203
Show mime icon, bump bundles, make the SearchResultEntry class non-abstract, Fix header search icon, various fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-08-04 21:36:22 +02:00
John Molakvoæ 72b45f9546
Merge pull request #22020 from nextcloud/feature/20918/calendar_search
Add Event and Task Backends for Unified Search
2020-08-04 20:54:27 +02:00
blizzz 7d2f5aff1a
Merge pull request #22062 from nextcloud/fix/noid/displayname-in-incoming-remote-share-notification
fix display of remote users in incoming share notifications
2020-08-04 16:26:41 +00:00
Georg Ehrke 900617e7d7
Add Event and Task Backends for Unified Search
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-04 16:01:59 +02:00
Nextcloud bot 0eed71870d
[tx-robot] updated from transifex 2020-08-04 02:16:30 +00:00
Georg Ehrke 5fb2562332
Implement Contacts Backend for Unified Search
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-03 16:29:01 +02:00
Joas Schilling a0ee4b584c
Short php syntax
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-03 11:25:21 +02:00
matt 4679e85076
adding social profile to search index
required in order to optimize regular background updates of contact avatars from social networks (see https://github.com/nextcloud/contacts/pull/1722#discussion_r463782429)
2020-08-02 14:16:50 +02:00
Arthur Schiwon 04521c6afc
coding style fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-07-30 21:18:20 +02:00
Arthur Schiwon b79e34c57b
fix check for Cloud ID, missing return statements, wrong param use
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-07-30 21:10:54 +02:00
Morris Jobke ce314d9484
Merge pull request #21814 from nextcloud/techdebt/noid/federated_share_added-into-typed-event
Move federated_share_added into a typed event
2020-07-23 21:42:48 +02:00
Morris Jobke 7e6c0ec284
Use assertEqualsCanonicalizing instead of deprecated assertEquals parameter
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-23 17:11:29 +02:00
Morris Jobke 0123cd0ae3
Use assertStringContainsString instead of assertContains on strings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-23 17:11:29 +02:00
Morris Jobke 0763a17332
Move federated_share_added into a typed event
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-23 08:33:17 +02:00
Nextcloud bot 99d0ba5f7e
[tx-robot] updated from transifex 2020-07-23 02:17:03 +00:00
Nextcloud bot 2e4cc6da17
[tx-robot] updated from transifex 2020-07-22 02:16:38 +00:00
John Molakvoæ (skjnldsv) 6fcd075730
Use DOMContentLoaded and fix sharebymail loading issue
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-07-20 12:42:08 +02:00
Nextcloud bot d925c45373
[tx-robot] updated from transifex 2020-07-19 02:17:06 +00:00
Roeland Jago Douma 79c677e26d
Merge pull request #21859 from nextcloud/techdebt/dav-psr-container
Migrate DAV to the PSR container
2020-07-17 08:21:48 +02:00
Nextcloud bot 2c79083f27
[tx-robot] updated from transifex 2020-07-17 02:17:12 +00:00
Christoph Wurst 5005510d82
Migrate DAV to the PSR container
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-07-16 15:44:03 +02:00
Nextcloud bot 89fe5415f8
[tx-robot] updated from transifex 2020-07-16 02:19:30 +00:00
Morris Jobke 3e8087bff1
Merge pull request #21838 from nextcloud/enh/dav/do_not_log_invalid_range
Do not log RequestedRangeNotSatisfiable exceptions in DAV
2020-07-14 21:44:49 +02:00
Roeland Jago Douma 68f1283691
Do not log RequestedRangeNotSatisfiable exceptions in DAV
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-07-14 20:46:33 +02:00
Morris Jobke 7e281a07bb
Use IBootstrap for the app federatedfilesharing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-14 16:34:43 +02:00
Nextcloud bot 7868d4e3b2
[tx-robot] updated from transifex 2020-07-10 02:16:48 +00:00
Morris Jobke aab646a9d0
Update system addressbook card only when there was a change based on a cached etag
Due to our old and new hook system the card dav backend listens to old and new hooks. This triggers this code multiple times and always causes an update. With this change we cache the etag during a request and only trigger the update if the etag has changed. This does not catches all not needed updates, but it does not need another round trip to the database and still covers most cases where multiple attributes are updated during one single request.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-09 11:43:58 +02:00
Morris Jobke 08bfd63406
Merge pull request #21704 from nextcloud/fix/18895/fix-unit-tests
Fix unit tests from #18895
2020-07-06 14:10:17 +02:00
Morris Jobke e878c0a054
Merge pull request #21074 from jvsalo/shared-lock-multi-release
Fix releasing a shared lock multiple times
2020-07-06 14:06:41 +02:00
Morris Jobke db782fefa1
Merge pull request #21222 from nextcloud/bugfix/18965/reduce-contacts-search-load
Reduce contacts search load
2020-07-06 13:56:06 +02:00
Morris Jobke 2b6cadbcd9
Fix unit tests from #18895
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-06 13:32:42 +02:00
Morris Jobke d78449c01c
Merge pull request #18895 from nextcloud/bugfix/noid/fix_birthday_calendar_color
Changes the Birthday calendar color to slightly brighter one
2020-07-06 13:20:55 +02:00
Morris Jobke d3d11cb826
Merge pull request #21626 from nextcloud/enhancement/injectible-callables
Callable parameter injection
2020-07-05 22:03:12 +02:00
Roeland Jago Douma 4d8b4ef3cc
Merge pull request #21533 from nextcloud/techdebt/noid/dedicated-method-to-get-a-users-language
Techdebt/noid/dedicated method to get a users language
2020-07-04 08:56:13 +02:00
Christoph Wurst 8150bcb60c
Use \OCP\IContainer::injectFn to boot the DAV app
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-07-03 14:37:53 +02:00
Joas Schilling db8267db26
Use the new method everywhere
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-03 10:59:43 +02:00
Roeland Jago Douma 0157e30ad4
Merge pull request #21599 from nextcloud/debt/noid/type-to-types
Replace TYPE with TYPES
2020-07-02 12:21:01 +02:00
Daniel Kesselberg 87dd760a89
Replace TYPE with TYPES
As TYPE::* is deprecated.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-06-30 23:46:22 +02:00
Joas Schilling d7c0b9cced
Also always return in app commands
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-26 15:12:11 +02:00
Joas Schilling a2f34f46b2
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-24 18:13:37 +02:00
Joas Schilling 89ed2c37bf
Update share type constant usage
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-24 16:49:16 +02:00
Roeland Jago Douma d523925db5
Merge pull request #21467 from nextcloud/enhancement/dav-bootstrap
Move DAV to the new bootstrap mechanism
2020-06-20 16:23:01 +02:00
Nextcloud bot ce9d3b36df
[tx-robot] updated from transifex 2020-06-20 02:16:35 +00:00
Christoph Wurst 1285be2bd1
Move DAV to the new bootstrap mechanism
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-06-19 15:10:20 +02:00
Nextcloud bot dd0b9655b2
[tx-robot] updated from transifex 2020-06-19 02:16:27 +00:00
Nextcloud bot df18c47b42
[tx-robot] updated from transifex 2020-06-16 02:16:05 +00:00
Joas Schilling 00e7b2b956
Reduce load of the contacts search when we know it can't match
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-15 08:47:30 +02:00
Joas Schilling fdd8c86c60
Fix pagination of contacts search
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-10 09:38:59 +02:00
Christoph Wurst d0d6cb6ea6
Merge pull request #21302 from nextcloud/techdebt/noid/adjust-to-parent-implementation
Adjust to parent implementation
2020-06-09 08:52:40 +02:00
Joas Schilling 03c05d60c0
Adjust to parent implementation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-08 11:30:05 +02:00
Roeland Jago Douma 9a196d12a8
Merge pull request #20272 from nextcloud/enh/sabre/gzip_propfind
Gzip the propfind response
2020-06-08 11:23:30 +02:00
Nextcloud bot e212908cec
[tx-robot] updated from transifex 2020-06-07 02:15:50 +00:00
Roeland Jago Douma 7b6b946470
Allow for compression of the PROPFIND responses
For now it just gzip and only for propfind (the 99% case). Already saves
a bunch since the propfinds compress so nicely.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-06-06 15:55:04 +02:00
Nextcloud bot 4cf4ed3697
[tx-robot] updated from transifex 2020-06-06 02:16:00 +00:00
Thomas Citharel b61b74e81a
Fix empty event UUID reminder notifications
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-06-04 11:25:36 +02:00
Nextcloud bot cbde1d102c
[tx-robot] updated from transifex 2020-05-25 02:16:22 +00:00
Jaakko Salo 6886b46ee2 In LockPlugin, only release a lock if it was acquired
When uploading new files, getNodeForPath() will not succeed
yet so the lock cannot be acquired.

In that case, don't try to unlock it either.

Signed-off-by: Jaakko Salo <jaakkos@gmail.com>
2020-05-24 20:26:38 +03:00
Nextcloud bot 23080fcd9c
[tx-robot] updated from transifex 2020-05-23 02:16:22 +00:00
Nextcloud bot 3b519f776a
[tx-robot] updated from transifex 2020-05-22 02:17:20 +00:00
Nextcloud bot d870e9ece5
[tx-robot] updated from transifex 2020-05-21 02:17:26 +00:00
Nextcloud bot a8ac6df1d0
[tx-robot] updated from transifex 2020-05-18 02:16:22 +00:00
Nextcloud bot a84eec88e8
[tx-robot] updated from transifex 2020-05-16 02:17:14 +00:00
Nextcloud bot d132f81d28
[tx-robot] updated from transifex 2020-05-15 02:17:17 +00:00
Nextcloud bot 75d50a55b8
[tx-robot] updated from transifex 2020-05-14 02:16:36 +00:00
Nextcloud bot ab2df70e3a
[tx-robot] updated from transifex 2020-05-13 02:16:26 +00:00
Roeland Jago Douma 6aea539745
Merge pull request #20844 from nextcloud/feature/noid/maintenance-mode-webdav-translated
Translate the maintenance mode message in webdav
2020-05-11 13:10:26 +02:00
Georg Ehrke a45f4035e6
Merge pull request #20860 from nextcloud/bugfix/noid/macos_contacts_sync_prefer_personal_over_app-generated
macOS contacts: prefer personal over app generated
2020-05-08 12:03:25 +02:00
Georg Ehrke cbbe11fa1f
Rename app-generated to z-app-generated, because macOS Contacts supports only one and will pick the first one alphabetically
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-05-07 16:48:32 +02:00
Joas Schilling af1dd9f152
Bump app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-05-07 10:29:04 +02:00
Morris Jobke ecbc009e2f
Translate the maintenance mode message in webdav
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-05-06 18:11:54 +02:00
Roeland Jago Douma b7b7b2872c
Fix owner on publicownerwrapper
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-01 10:50:26 +02:00
Morris Jobke 0f9b88c5a9
Merge pull request #20718 from nextcloud/fix/public_share_owner_activity_mess
Add a wrapper to fall back to the share owner on public shares
2020-04-30 13:46:13 +02:00
Roeland Jago Douma b8b53a2d9a
Merge pull request #19436 from nextcloud/bugfix/noid/dav-quota-calculation
Do not include mountpoints when calculating quota usage on WebDAV
2020-04-30 09:13:19 +02:00
Roeland Jago Douma a1f3293c06
Merge pull request #19039 from nextcloud/dav-activity-provide-links-to-calendar
Provide links to calendar in event creation/update activities
2020-04-30 09:10:56 +02:00
Roeland Jago Douma bc66bdc072
Add a wrapper to fall back to the share owner on public shares
Else it might happen that we setup a storage that has no real owner and
activities do boom etc (looking at you groupfolders and external
storages!).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-30 08:57:01 +02:00
Roeland Jago Douma 2df57b270c
Merge pull request #20720 from nextcloud/bugfix/noid/temporary-fix-contacts-search
Temporary fix contacts search
2020-04-30 08:52:50 +02:00
Nextcloud bot 523a8ba5c3
[tx-robot] updated from transifex 2020-04-30 02:17:11 +00:00
Joas Schilling f662d3663b
Temporary fix contacts search
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-29 14:48:41 +02:00
Christoph Wurst cb057829f7
Update license headers for 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
Nextcloud bot ef566a1f40
[tx-robot] updated from transifex 2020-04-28 02:16:22 +00:00
Morris Jobke 3c5c4caa4d
Merge pull request #20632 from nextcloud/bugfix/20624
Only catch anonymous OPTIONS for Office
2020-04-27 10:38:32 +02:00
Thomas Citharel deb2ea9cea
Provide links to calendar in event creation/update activities
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-04-26 11:11:50 +02:00
Nextcloud bot 39f6f1ba34
[tx-robot] updated from transifex 2020-04-25 02:16:01 +00:00
Julius Härtl 902d12555e
Do not include mountpoints when calculating quota usage on WebDAV
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-24 18:15:43 +02:00
Roeland Jago Douma 768b012000
Merge pull request #20570 from nextcloud/fix/20235/use_uploadfile
Use a proper upload file so propfinds return 404
2020-04-24 16:31:38 +02:00
Julius Härtl d7161b4eee
Only catch anonymous OPTIONS for Office
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-24 14:46:07 +02:00
Julius Härtl 6709833dc7
Use paginated search for contacts
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-23 19:08:16 +02:00
Roeland Jago Douma 8c5bb22bc1
Merge pull request #20576 from nextcloud/fix/dav/oc-etag
Make sure that OC-ETag is set again
2020-04-22 22:21:22 +02:00
Daniel Kesselberg 0e925285b7
Add test that shares and tags are ignored for chunk files.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-04-21 14:00:52 +02:00
Roeland Jago Douma 8730cc6764
Use a proper upload file so propfinds return 404
Fixes #20235

By using an UploadFile we make sure that we don't need to have another
check everywhere for the path. But we just have ot check (which we have
to anyway) if it is a proper Connector/File (or directory).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-21 10:33:28 +02:00
Georg Ehrke effcd58e14
Fix usages of afterMethod -> afterMethod:*
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-21 10:19:06 +02:00
Roeland Jago Douma 4ee56689a8
Make sure that OC-ETag is set again
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-21 10:14:31 +02:00
Nextcloud bot b1a90da347
[tx-robot] updated from transifex 2020-04-20 02:16:12 +00:00
Roeland Jago Douma ed56619a20
Merge pull request #19901 from nextcloud/bugfix/noid/vcard-photo-handling
Improved vcard photo handling
2020-04-17 11:43:20 +02:00
John Molakvoæ (skjnldsv) 29541322c1
Update list of multiple properties
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-04-17 09:38:47 +02:00
Georg Ehrke fe4527a8e2
Update Contact Size after removing photo
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-15 15:49:49 +02:00
Joas Schilling 648c8df516
Don't populate the PHOTO property when it's not an image
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 15:49:39 +02:00
Joas Schilling bb754cb363
Always transform the etag and read the data
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 15:49:36 +02:00
Joas Schilling 2e9f105786
Use table variable everywhere
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 15:49:12 +02:00
Arthur Schiwon 73271aa086
DAV's exception logger should deal with any Throwable
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-15 15:28:37 +02:00
Joas Schilling 5c0637bc90
Merge pull request #20138 from nextcloud/bugfix/noid/make-remote-checking-more-generic
Make remote checking more generic
2020-04-15 12:48:49 +02:00
Roeland Jago Douma d63abebc93
Merge pull request #19351 from nextcloud/dav-upload-hash
Return hashes of uploaded content for dav uploads
2020-04-15 10:23:22 +02:00
Joas Schilling fd0c1a3bb2
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 08:06:51 +02:00
Joas Schilling 5e402f8aae
Check all remotes for local access
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-14 18:56:06 +02:00
Daniel Kesselberg 91ab811824
Verify that destination is not a directory.
Otherwise file_put_contents will fail later.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-04-14 12:52:12 +02:00
Thomas Citharel 0408c37b3d
Only delete the default calendar setting when the default calendar
itself is deleted

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-04-13 15:07:43 +02:00
Thomas Citharel ebdf66b706
Provide dav setting for user's default calendar
And add tests to handle schedule-default-calendar-URL

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-04-13 15:07:42 +02:00
Robin Appelman 57403c7020
dont set headers for cli
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-13 12:57:29 +02:00
Robin Appelman c2677682c4
Return hashes of uploaded content for dav uploads
hashes are set in "X-Hash-MD5", "X-Hash-SHA1" and "X-Hash-SHA256" headers.

these headers are set for file uploads and the MOVE request at the end of a multipart upload.

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-13 12:57:27 +02:00
Nextcloud bot 6187cea304
[tx-robot] updated from transifex 2020-04-13 02:19:45 +00:00
Nextcloud bot d32ea71c30
[tx-robot] updated from transifex 2020-04-12 03:09:11 +00:00
John Molakvoæ b5a30d5cd6
Merge pull request #20426 from nextcloud/techdebt/psr2
It is done
2020-04-11 08:21:35 +02:00
Nextcloud bot de52e1cda7
[tx-robot] updated from transifex 2020-04-11 02:18:37 +00:00
Christoph Wurst 734c62bee0
Format code according to PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:56:50 +02:00
Christoph Wurst 28f8eb5dba
Add visibility to all constants
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +02:00
Christoph Wurst 1584c9ae9c
Add visibility to all methods and position of static keyword
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:51:06 +02:00
Christoph Wurst caff1023ea
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
Christoph Wurst 14c996d982
Use elseif instead of else if
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +02:00
Christoph Wurst 008e6d7e84
Merge pull request #20391 from nextcloud/refactor/spaces-cleanup
Remove all extra whitespace PSR2 does not like
2020-04-09 20:39:37 +02:00
Christoph Wurst 64510932b8
Merge pull request #20384 from nextcloud/techdebt/lowercase-keywords
Use php keywords in lowercase
2020-04-09 16:25:14 +02:00
Christoph Wurst 3a415e4139
Remove space between switch case and colon
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:17:53 +02:00
Christoph Wurst a8a06a82d2
Remove trailing whitespaces from comments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:09:23 +02:00
Christoph Wurst 44577e4345
Remove trailing and in between spaces
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +02:00
Christoph Wurst 42625a46be
Remove spaces after method or function call
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:05:56 +02:00
Christoph Wurst 36b3bc8148
Use php keywords in lowercase
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 14:04:56 +02:00
Christoph Wurst afbd9c4e6e
Unify function spacing to PSR2 recommendation
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +02:00
Christoph Wurst 41b5e5923a
Use exactly one empty line after the namespace declaration
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
Christoph Wurst 2fbad1ed72
Fix (array) indent style to always use one tab
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 10:16:08 +02:00
Christoph Wurst 85e369cddb
Fix multiline comments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-08 22:24:54 +02:00
Roeland Jago Douma e266666380
Merge pull request #20188 from nextcloud/bug/19662/add-default-title-for-event-in-invitatios
Add default titles for titleless events in invitations
2020-04-07 11:22:17 +02:00
Roeland Jago Douma 9a4193f557
Merge pull request #19761 from nextcloud/bugfix/19658/add_missing_index_to_original_migration
Add missing index to original migration
2020-04-06 09:44:34 +02:00
Roeland Jago Douma 4a292126e5
Merge pull request #20139 from nextcloud/unify-default-value-for-restricting-user-enumeration-with-settings
Unify default value for restricting user enumeration with settings
2020-04-04 10:33:04 +02:00
Julius Härtl fba7bcfcc4
Catch NoUserException when running the upload cleanup as cronjob
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-03 23:06:26 +02:00
Nextcloud bot 4e8bbc4e34
[tx-robot] updated from transifex 2020-04-03 12:08:12 +00:00
Thomas Citharel 058ffa37ff
Add default titles for titleless events in invitations
Closes #19662

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-04-03 13:49:25 +02:00
Julius Härtl 3a88ad741d
Query Application class on publicwebdav
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-02 17:07:53 +02:00
Joas Schilling bc6a5ef5c4
Merge pull request #19890 from nextcloud/enh/comments-reference-id
Add optional comments reference_id
2020-04-02 11:34:21 +02:00
Joas Schilling 81455479bc
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-02 09:59:44 +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 2200cc8562
Merge pull request #19325 from nextcloud/dependachristoph/composer/sabre-4.0
Update Sabre (and friends) to 4.0
2020-03-30 09:34:25 +02:00
Christoph Wurst 463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports
Remove unused imports
2020-03-27 17:14:08 +01:00
Georg Ehrke 55081b7fd2
RequestTestCase: Default type for headers needs to be array
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-27 12:53:44 +01:00
Georg Ehrke 80b7ef9b41
Adjust FakeLockerPluginTest to new Sabre version
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-27 12:53:44 +01:00
Georg Ehrke 5e2c802bb7
Set custom ProdId in Birthday service, do not depend on Sabre Versio number for unit tests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-27 12:53:44 +01:00
Georg Ehrke 102a328e65
Fix usage of Sabre\HTTP\Request in unit tests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-27 12:53:44 +01:00
Georg Ehrke 52ba75f644
Sabre/DAV 4.0: beforeMethod is now beforeMethod:*
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-27 12:53:44 +01:00
Christoph Wurst b80ebc9674
Use the short array syntax, everywhere
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +01:00
Christoph Wurst 25ab122245
Merge pull request #20172 from nextcloud/techdebt/phpunit-short-return
Use the shorter phpunit syntax for mocked return values
2020-03-26 09:25:19 +01:00
Christoph Wurst 2ee65f177e
Use the shorter phpunit syntax for mocked return values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:21:27 +01:00
Christoph Wurst 74936c49ea
Remove unused imports
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:08:08 +01:00
Christoph Wurst 23eb0462e5
Use lowercase true, false and null constants
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 21:53:04 +01:00
Christoph Wurst 5a33cb0b78
Register an address book with recent contacts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 16:16:45 +01:00
blizzz ba14c41a1c
Merge pull request #20145 from nextcloud/bugfix/noid/generated-avatars-and-nophoto-cache
Fix generated avatars and nophoto cache files
2020-03-25 11:14:13 +01:00
Roeland Jago Douma 3427653676
Merge pull request #19986 from nextcloud/bugfix/19980/fix_uid_as_uri
RefreshWebcalService: randomly generate calendar-object uri
2020-03-25 08:11:49 +01:00
Nextcloud bot e4d85fa284
[tx-robot] updated from transifex 2020-03-25 02:18:27 +00:00
Joas Schilling f3a5bd6753
Fix generated avatars and nophoto cache files
Since nextcloud/server#19493 newFile() by default does not write the file anymore.
Setting an empty string as content will make it write the file immediate,
without having to call putContent() afterwards.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-24 18:23:38 +01:00
Christoph Wurst 3e338c9075
Merge pull request #18788 from nextcloud/fix/18782/translate-busy-in-caldav
Translate 'Busy' in CalDAV
2020-03-24 15:12:21 +01:00
Daniel Calviño Sánchez d4f25b01b8 Unify default value for restricting user enumeration with settings
If the value was never enabled or disabled, the settings show "Restrict
username enumeration to groups" as disabled. However, in some components
it was enabled by default, which caused an inconsistency in the
behaviour with respect to the settings, for example in the contacts
menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-03-24 14:30:59 +01:00
Nextcloud bot be4cf8992d
[tx-robot] updated from transifex 2020-03-23 02:19:02 +00:00
Thomas Citharel 42dde6d623
Add check that DateTime parameters are of correct type
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-03-22 14:24:13 +01:00
Thomas Citharel 01db6d4609
Add extra test case to exclude by timerange
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-03-22 14:24:13 +01:00
dartcafe b0fbba05f2
Added test testSearch
Signed-off-by: dartcafe <github@dartcafe.de>
2020-03-22 14:24:13 +01:00
dartcafe 65c591093e
fix OCA\DAV\CalDAV\CalDavBackend search $options
Signed-off-by: dartcafe <github@dartcafe.de>
2020-03-22 14:24:13 +01:00
Roeland Jago Douma 019ba27943
Merge pull request #20042 from nextcloud/fix/noid/styled-dav-browser-error
fix dav browser error page not styled
2020-03-22 14:23:17 +01:00
Arthur Schiwon 82f8a167a6
use core templates for displaying dav errors in the browser
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-03-20 22:39:22 +01:00
Julius Härtl 47271e56ee Fix tests due to config adjustments
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-20 10:46:13 +01:00
Julius Härtl ae4dc3467c Return empty system addressbook since we cannot easily limit it to groups
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-20 10:43:56 +01:00
Julius Härtl 0fa897fcfc Limit enumeration in principal search
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-20 10:43:56 +01:00
Arthur Schiwon b285e19dc8
fix dav browser error page not styled
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-03-19 23:44:14 +01:00
Christoph Wurst 150f39ed50
Update autoloaders for composer v1.10.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-19 09:48:49 +01:00
Nextcloud bot 4a21ce27ff
[tx-robot] updated from transifex 2020-03-19 02:20:00 +00:00
Robin Appelman e44c276aab
rebuild autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Robin Appelman 861c897e93
fix tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Robin Appelman 15a21ee19a
remove the detour trough node and work with path directly
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Robin Appelman 451c8761a7
use INode instead of Node for custom properties
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Robin Appelman 7819a904d7
handle long property paths to hasing paths >250 chars
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Robin Appelman 95cd44c41e
remove unused code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Robin Appelman e178718e74
test custom properties backend against real database
test behaviour not implementation

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Robin Appelman ce398cf7bd
merge the two almost identical custom property backends
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-18 13:41:04 +01:00
Nextcloud bot daa6b41535
[tx-robot] updated from transifex 2020-03-18 02:21:06 +00:00
Nextcloud bot 82d4bdd770
[tx-robot] updated from transifex 2020-03-17 02:18:42 +00:00
Georg Ehrke bd1f98cba3
RefreshWebcalService: randomly generate calendar-object uri
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-03-16 15:36:13 +01:00
Roeland Jago Douma 0d613cd2f0
Merge pull request #19704 from Nils160988/master
Fix hostname in Apple configuration profile
2020-03-09 21:02:53 +01:00
Roeland Jago Douma b6245be302
Merge pull request #19746 from nextcloud/locked-exception-forward-existing
pass the existing locks info when making locked exception with absolu…
2020-03-09 19:31:45 +01:00
Christoph Wurst 827c0980d8
Prevent creation of reserved address book name
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-09 13:36:39 +01:00
Christoph Wurst ec245d5fec
Add address book plugins
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-09 13:12:18 +01:00
Nextcloud bot a036ca6018
[tx-robot] updated from transifex 2020-03-06 02:18:23 +00:00