blizzz
5a0dc1b994
Merge pull request #31 from nextcloud/downstream-160609
...
Downstream 2016-06-09
2016-06-09 20:39:20 +02:00
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
blizzz
51fd2602a7
Revert "Downstream 2016-06-08"
2016-06-09 17:41:57 +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
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
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
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
Sergio Bertolin
44f72412bf
Get a range from several chunks
2016-06-09 13:50:28 +02:00
Sergio Bertolin
8de206c7ed
Added another case about overwriting folder using old chunking
2016-06-09 13:50:28 +02:00
Sergio Bertolin
57444b045b
Added same test using old chunking
2016-06-09 13:50:28 +02:00
Sergio Bertolin
a2c7b2e4b7
userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcoded
2016-06-09 13:50:28 +02:00
Sergio Bertolin
dbaeedc234
add overwriting using chunking but failing
2016-06-09 13:50:28 +02:00
Sergio Bertolin
91082578ab
Added tests about overwriting files and folders as recipient
2016-06-09 13:50:28 +02:00
Thomas Müller
f20c617154
Allow login by email address via webdav as well - fixes #24791
2016-06-09 12:08:49 +02:00
Vincent Petry
90c1ec1c49
Merge pull request #25014 from owncloud/admin-datadircheck-fix
...
Use temporary htaccesstest.txt for data dir security check
2016-06-09 11:58:28 +02:00
Vincent Petry
826e276a79
Merge pull request #24973 from owncloud/token-password-session-token
...
When creating a session token, make sure it's the login password and …
2016-06-09 11:58:04 +02:00
Vincent Petry
aca4ea12c1
Merge pull request #24826 from owncloud/cors-client-login
...
use client login method on CORS routes
2016-06-09 10:31:14 +02:00
Vincent Petry
0e3737ffe1
Merge pull request #25028 from owncloud/scanner-user-not-setup
...
skip scanning for a user when the user is not setup yet
2016-06-09 10:29:46 +02:00
Jenkins for ownCloud
355f50bd6c
[tx-robot] updated from transifex
2016-06-09 06:16:41 +00:00
