Commit Graph

33172 Commits

Author SHA1 Message Date
Arthur Schiwon a636e4ff28
Downstream 2016-06-09
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
blizzz 28193732ea Merge pull request #32 from nextcloud/revert-25-downstream-160608
Revert "Downstream 2016-06-08"
2016-06-09 18:41:19 +02:00
Lukas Reschke c268ad1597
Add PHP unit test 2016-06-09 18:29:13 +02:00
Lukas Reschke 0b00a06a0d
Fix indentation 2016-06-09 18:17:04 +02:00
Lukas Reschke e878e786e0
Fix public upload for normal shares 2016-06-09 18:12:58 +02:00
Vincent Petry 059778bef0
Add unit test for LDAP multi group caching 2016-06-09 17:57:07 +02:00
Lukas Reschke 6e99b0f59d
Make uploading possible via select and cleanup CSS 2016-06-09 17:55:26 +02:00
Lukas Reschke 5fdde426eb
Add fancy layout 2016-06-09 17:55:26 +02:00
blizzz 51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Thomas Müller 232d735893
Do not leak the login name - fixes #25047 2016-06-09 16:44:31 +02:00
Vincent Petry 6ba18934e6 Merge pull request #25000 from owncloud/fix-email-login-dav
Allow login by email address via webdav as well
2016-06-09 16:28:06 +02:00
Vincent Petry ac163426ef Merge pull request #25008 from owncloud/externals_test_with_origin
Add support to know where the storage test comes from
2016-06-09 16:21:05 +02:00
Vincent Petry c13c561219 Merge pull request #25036 from owncloud/jnweiger-patch-1
Update autotest.sh
2016-06-09 16:06:58 +02:00
Vincent Petry 1399e87d57
DAV now returns file name with Content-Disposition header
Fixes issue where Chrome would append ".txt" to XML files when
downloaded in the web UI
2016-06-09 15:51:41 +02:00
Jan-Christoph Borchardt b688aac402 Merge pull request #30 from nextcloud/fix-screenshot-readme
Fix Screenshot link in README.md
2016-06-09 15:49:16 +02:00
Roeland Jago Douma 7d51fd0310
Add repair step to clean old calendar/contact shares
fixes #21889
2016-06-09 15:48:45 +02:00
Marius e7df07fb37 Fix Screenshot link in README.md 2016-06-09 15:42:26 +02:00
Marius d76ffd176d Merge pull request #29 from nextcloud/new-screenshot-readme
Change screenshot in README.md
2016-06-09 15:40:04 +02:00
Lukas Reschke 53ba111e21
Fix XSS 2016-06-09 15:15:17 +02:00
Lukas Reschke 075bf73c80
Prevent access to shareinfo if share if read-only 2016-06-09 15:15:17 +02:00
Bjoern Schiessle 66d853680c
block webdav access if share is not readable 2016-06-09 15:15:17 +02:00
Bjoern Schiessle bb54ab0db8
add hide file list option 2016-06-09 15:15:17 +02:00
Joas Schilling 4c26abe228 Fix the FIXME (#25022) 2016-06-09 15:05:02 +02:00
Morris Jobke fc3ad7d5f7 Merge pull request #25 from nextcloud/downstream-160608
Downstream 2016-06-08
2016-06-09 15:01:57 +02:00
Daniel Molkentin bb67acff91
ownCloud 9.1.0 beta 2 2016-06-09 14:00:03 +02:00
Joas Schilling 6ec2d1244c
Adjust test to work with phpunit < 5.2 2016-06-09 14:00:02 +02:00
Roeland Jago Douma b0dd0634e3
Bring back sharedstorage hooks 2016-06-09 14:00:02 +02:00
Jenkins for ownCloud 6aab7d7232
[tx-robot] updated from transifex 2016-06-09 14:00:02 +02:00
Joas Schilling 7f88645eab
Allow to cancel 2FA after login 2016-06-09 14:00:02 +02:00
Robin Appelman 49db29727c
make sure $data['mtime'] is always a timestamp 2016-06-09 14:00:02 +02:00
Vincent Petry 8c7a32ccb9
Fix GDrive upload file which name might match the one of a folder
Whenever a file is uploaded to GDrive, there is a check for that file
with and without extension, due to Google Docs files having no
extension. This logic now only kicks in whenever the detected
extensionless file is really a Google Doc file, not a folder.

This makes it possible again to upload a file "test.txt" in a folder
that also has a folder called "test"
2016-06-09 14:00:01 +02:00
Robin Appelman 7970ff2099
don't update storage mtime if we can't get the modified date 2016-06-09 14:00:01 +02:00
Robin Appelman 9b5fd515ef
Better handling of forbidden files in dav 2016-06-09 14:00:01 +02:00
Robin Appelman ea6921da3b
Ignore forbidden files while scanning 2016-06-09 14:00:01 +02:00
Robin Appelman bee918693a
dissalow symlinks in local storages that point outside the datadir 2016-06-09 14:00:01 +02:00
Joas Schilling a6134a6d2f
Improve the UX for "not found" perma links 2016-06-09 14:00:00 +02:00
Jörn Friedrich Dreyer 75870c943c
decrease initial users to load to 50
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
2016-06-09 14:00:00 +02:00
Sergio Bertolín fad91e92f0
Fixed reviews 2016-06-09 14:00:00 +02:00
Joas Schilling 4f27c2c433
Allow to decrypt user '0' files only 2016-06-09 14:00:00 +02:00
Christoph Wurst 60e15e934c
do not generate device token if 2FA is enable for user 2016-06-09 14:00:00 +02:00
Jenkins for ownCloud d72d8c1fcb
[tx-robot] updated from transifex 2016-06-09 13:59:59 +02:00
Robin Appelman e7a55c4fef
handle path not being set in shared cache (#24993) 2016-06-09 13:59:59 +02:00
Thomas Müller c4b80b86db
Fix checkMove() implementation for dav v2 - fixes #24776 (#24971) 2016-06-09 13:59:59 +02:00
davitol 3b5c169869
Comments fixed 2016-06-09 13:59:59 +02:00
davitol ad33992eb9
Fix Decrypt message via occ 2016-06-09 13:59:59 +02:00
Joas Schilling 0041d89dc2
Do not allow to store boolean configs, they behave unexpected on postgres 2016-06-09 13:59:58 +02:00
Robin Appelman 16559e4a8a
add test for deleting ghost files over dav 2016-06-09 13:59:58 +02:00
Robin Appelman 18f7cede51
Fix warnings when trying to get mtime of non existing files 2016-06-09 13:59:58 +02:00
Robin Appelman f4831f4074
return success when deleting ghost files 2016-06-09 13:59:58 +02:00
Robin Appelman 67c2c85b05
allow deleting "ghost files" trough the View and Node api 2016-06-09 13:59:58 +02:00