Commit Graph

51751 Commits

Author SHA1 Message Date
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 4fcba8a597
Merge remote-tracking branch 'origin/master' into fix/5456/respect_avatar_privacy 2019-11-13 20:30:43 +01:00
Roeland Jago Douma e1b31d2f4e
Merge pull request #17893 from RussellAult/patch-1
Fix $redirectUri sometimes has two '?'
2019-11-13 20:29:05 +01:00
Christoph Wurst 31b336ecbe
Revert "Remove unneeded more-white icon" 2019-11-13 18:37:23 +01:00
rakekniven 80b40ff490
l10n: Triple dot to ellipsis
Reported at Transifex.

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2019-11-13 18:26:30 +01:00
John Molakvoæ 634812ca1e
Use function to open a sidebar file (#17750)
Use function to open a sidebar file
2019-11-13 18:19:17 +01:00
blizzz 51d3f98bfb
Merge pull request #17832 from nextcloud/fix/noid/wfe-event-proxying
relax dependency on GenericEvent, instead stay compatible with old events
2019-11-13 16:42:05 +01:00
Roeland Jago Douma 570bb40643
Merge pull request #17924 from nextcloud/enh/15664/check_quota_before_transfer
Check quota before transfer ownership
2019-11-13 15:05:19 +01:00
Robin Appelman 2e97e8bf84
re-acquired expired shared locks on large file uploads
during large file uploads, the shared lock that we get at the begining can expire
leading to locked errors later on, instead of erroring, try to re-get the lock

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 14:54:22 +01:00
John Molakvoæ (skjnldsv) 16e0887ec6
Use function to open a sidebar file
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-11-13 14:34:44 +01:00
Arthur Schiwon 2efe8aad38
relax dependency on GenericEvent, instead stay compatible with old events
* also fixes tagging events

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-13 14:23:39 +01:00
RussellAult 19791b2460
Check getRedirectUri() for queries
Resolves Issue #17885

Check getRedirectUri() for queries, and add a '&' instead of a '?' to $redirectUri if it already has them; otherwise, $redirectUri might end up with two '?'.

Signed-off-by: RussellAult <russellault@users.noreply.github.com>
2019-11-13 14:05:03 +01:00
Roeland Jago Douma d9204f61ea
Merge pull request #17898 from nextcloud/ci/7.2
Move more CI to php7.2 as minimum
2019-11-13 13:34:42 +01:00
Roeland Jago Douma d8db8b1be5
Merge pull request #17873 from nextcloud/fix/17846/make-timeout-opt
Make timeout a optional parameter
2019-11-13 12:55:53 +01:00
Robin Appelman f2724992fc
cast ctime and utime
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:56 +01:00
Robin Appelman 4c97181128
filter out empty filecache extension values
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:52 +01:00
Roeland Jago Douma b36f08be43
Update autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-13 12:39:49 +01:00
Robin Appelman 066faaec05
fix folder delete
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:46 +01:00
Robin Appelman 43fa746ad9
dont create empty filecache extended rows
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:43 +01:00
Robin Appelman 2165f10aaf
hookup creation and upload time into dav
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:39 +01:00
Robin Appelman 136c4ef925
dont expose metadata etag for now
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:36 +01:00
Robin Appelman 1b6e647b63
expose filecache extension data in FileInfo
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:32 +01:00
Robin Appelman 842da3f183
store filecache extension fields
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:44 +01:00
Robin Appelman d3b6dbc0bc
move more cache logic to querybuilder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:41 +01:00
Robin Appelman ac209cea52
add count() as shortcut for count('*') in FunctionBuilder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:32 +01:00
Robin Appelman 0e9feeb090
return from QueryBuilder instead of IQueryBuilder
this make the type hints work properly with querybuilder subclasses

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:27 +01:00
Roeland Jago Douma fc4c107788
Check quota before transfer ownership
Fixes #15664

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-13 11:22:19 +01:00
Roeland Jago Douma eee21c89d9
Merge pull request #17917 from nextcloud/bugfix/noid/editorconfig
Fix editorconfig - we always used 4 space tabs
2019-11-13 10:11:38 +01:00
Roeland Jago Douma 6f1bac3216
php7.2 minimum for 18
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-13 09:29:57 +01:00
Nextcloud bot bf6fce483e
[tx-robot] updated from transifex 2019-11-13 02:16:08 +00:00
Joas Schilling 15f00f0126
Mark "Talk" active on /call/token URLs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 21:39:20 +01:00
Joas Schilling 8bd33d6dcf
Remove special php setting as it is the default
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:48:17 +01:00
Joas Schilling fe73b950b8
Fix editorconfig - we always used 4 space tabs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:47:06 +01:00
Joas Schilling d3b62893af
Make sure the super share also has a valid type
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:47 +01:00
Joas Schilling 6d9afca14f
Fix "Invalid parameter number: mixed named and positional parameters"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:47 +01:00
Joas Schilling 0fe4b717dc
Correctly use the displayname of the sharer in the notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:47 +01:00
Joas Schilling e79ab7d0c5
The share manager knows which provider can accept shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:47 +01:00
Joas Schilling 19e1892d50
Use constants for the magic strings
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:45 +01:00
Joas Schilling 43517cfac6
Accept existing shares on update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:00 +01:00
Joas Schilling 60da25681e
Only restrict loading of group and user shares for now
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:00 +01:00
Joas Schilling 8986910a7d
Add notifications for users that are added to the group
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:00 +01:00
Joas Schilling 520042bbd0
Allow to accept group shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:36:58 +01:00
Joas Schilling c79a56481b
Notifications for group shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:33:53 +01:00
Joas Schilling e96c9e0e4a
Add the notifier and the API endpoint for user shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:33:50 +01:00
Joas Schilling dcdbea54e6
Respect the accepted flag for group and user shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:13:38 +01:00
Roeland Jago Douma 6f8c7885b6
Merge pull request #17909 from nextcloud/enh/change_label
Change official => featured
2019-11-12 14:36:47 +01:00
Roeland Jago Douma de21442623
Merge pull request #17905 from nextcloud/bug/17447/update-searchdav
Bump icewind/searchdav
2019-11-12 14:33:25 +01:00
Roeland Jago Douma 11bcf50791
Change official => featured
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-12 13:44:01 +01:00
Roeland Jago Douma 774eeeb844
Merge pull request #17881 from nextcloud/dependabot/npm_and_yarn/babel/core-7.7.2
Bump @babel/core from 7.6.4 to 7.7.2
2019-11-12 08:47:18 +01:00
Daniel Kesselberg 4a972e7b74
Bump icewind/searchdav
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-12 08:15:38 +01:00