Commit graph

13425 commits

Author SHA1 Message Date
Jenkins for ownCloud
6972f4dc50 [tx-robot] updated from transifex 2016-05-25 02:03:38 -04:00
Jenkins for ownCloud
f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Vincent Petry
d3fb5d618e Merge pull request #24748 from owncloud/login-explicitly
Log in explicitly, save login name when generating browser/device tokens
2016-05-24 17:51:49 +02:00
Vincent Petry
e8c3794308 Merge pull request #7897 from owncloud/ext-swiftcaching
Added object cache for Swift ext storage
2016-05-24 16:21:30 +02:00
Vincent Petry
f7d102ccc5 Merge pull request #24799 from owncloud/altyr-117-upstream
Update google-api-php-client to 1.1.7
2016-05-24 14:46:10 +02:00
Vincent Petry
648fc8d916 skip google map files (#24807) 2016-05-24 14:45:29 +02:00
Dmitry Popov
83aa28ed1d My fix for #24272, #23613, File not found when single file in a folder (#24800)
* Fixed group share searching for members of
multiple group. Issue #11808.

* Fixed group share searching, continued.

Avoid searching for empty group list in getItemSharedWithUser().
Broke tests in previous commit, #12030.

* Simler check for group count.

* Fix for https://github.com/owncloud/core/issues/24783 , described there

* Now it's #24272, 24783 was a duplicate. Previous change was also not very good. Now we don't create ZIP with a single file inside.
2016-05-24 14:09:05 +02:00
Robin Appelman
8a40003169 fix phpdoc 2016-05-24 13:58:08 +02:00
Vincent Petry
465cf9fe9b Merge pull request #24346 from lenz1111/fix_24331
Fix: Bugs in shared link with video #24331
2016-05-24 13:49:02 +02:00
Robin Appelman
c031eafd84 Fix cert bundle path 2016-05-24 13:44:43 +02:00
Vincent Petry
f77a11a876
Added object cache for Swift ext storage
This avoid calling the remote API for repeated calls to is_dir,
filetype, etc
2016-05-24 13:29:29 +02:00
Piotr Filiciak
df59c5d1ee bug fix 2016-05-24 12:43:43 +02:00
Piotr Filiciak
11b2e98a30 video poster 2016-05-24 12:34:37 +02:00
Vincent Petry
4635ed7748
Fix autoloading for new google SDK lib 2016-05-24 12:22:30 +02:00
Francesco Rovelli
c23bc91198
Add new files 2016-05-24 12:22:30 +02:00
Francesco Rovelli
49bec94959
enable autoload of lib in google storage 2016-05-24 12:22:30 +02:00
Francesco Rovelli
c1583f03ab
Update google-api-php-client from 1.0.6-beta to 1.1.7 2016-05-24 12:22:30 +02:00
Joas Schilling
3eba0c479f
Fix import path for 3rdparty dropbox autoloader
We moved the file by one level
2016-05-24 12:15:53 +02:00
Vincent Petry
c60ef7deb8 Merge pull request #24619 from owncloud/files_external-psr4
Move files_external to PSR-4
2016-05-24 11:54:12 +02:00
Christoph Wurst
ad10485cec
when generating browser/device token, save the login name for later password checks 2016-05-24 11:49:15 +02:00
Vincent Petry
f8bbbba306 Merge pull request #24682 from f4bsch/master
dont update search onResize
2016-05-24 11:47:47 +02:00
Joas Schilling
64538740ec
Fix missing imports 2016-05-24 08:41:22 +02:00
Joas Schilling
f14dff680d
Move remaining classes to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling
4576891f10
Move Lib\Storage to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling
b9fd7d4cc7
Move Config to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling
6ea54e73e8
Move Lib\Backend to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling
6d7a1b9bd4
Move Lib\Auth to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling
328b3c47d7
Move stuff from outside lib/ to PSR-4 2016-05-24 08:41:20 +02:00
Vincent Petry
adcf942901 Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support
Http Range requests support in downloads
2016-05-23 21:01:26 +02:00
Vincent Petry
87fa86a69a Merge pull request #24559 from owncloud/2fa
two factor auth
2016-05-23 20:50:03 +02:00
Vincent Petry
c10d8a37f7 Merge pull request #22690 from owncloud/fix-comments-href-remote.php-files
ensure comments-href returns a value also when propfind is done again…
2016-05-23 14:47:03 +02:00
Vincent Petry
bd87f67473 Merge pull request #24349 from owncloud/nfd-storagewrapper
Add wrapper for NFD encoding workaround
2016-05-23 13:45:33 +02:00
Christoph Wurst
dfb4d426c2
Add two factor auth to core 2016-05-23 11:21:10 +02:00
Vincent Petry
9264674b36 Merge pull request #24514 from owncloud/federation-psr4
Move federation app to PSR-4
2016-05-23 09:52:38 +02:00
Vincent Petry
5ba1add03c Merge pull request #24603 from owncloud/federated_reshare
flat federated re-share
2016-05-23 09:52:13 +02:00
Joas Schilling
54f8822670
Fix unit tests 2016-05-23 09:03:48 +02:00
Joas Schilling
c9fda84841
Make the root collection neutral so it does not only work for files 2016-05-23 09:03:48 +02:00
Joas Schilling
3a8e537946
Remove unused UserFolder 2016-05-23 09:03:47 +02:00
Jenkins for ownCloud
357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Jenkins for ownCloud
88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Vincent Petry
6934840083 Merge pull request #24307 from owncloud/systemtags-perminterface
Add interface methods for permission check for system tags
2016-05-21 19:06:54 +02:00
Jenkins for ownCloud
bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Björn Schießle
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self 2016-05-20 21:15:16 +02:00
Björn Schießle
bc8f659d06
add missung return value 2016-05-20 21:15:16 +02:00
Björn Schießle
06b6e2bff5
improved error messages 2016-05-20 21:15:16 +02:00
Björn Schießle
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app 2016-05-20 21:15:16 +02:00
Björn Schießle
92fa0c7dfd
fall back to old re-sharing behaviour in case the remote server doesn't support flat-reshares 2016-05-20 21:15:16 +02:00
Björn Schießle
2dc26aada7
update share permissions 2016-05-20 21:15:15 +02:00
Björn Schießle
7b25839bd5
use share initiator as fall back to access the file
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
2016-05-20 21:15:15 +02:00
Björn Schießle
81e3787f9c
close cursor after select to avoid db lock 2016-05-20 21:15:11 +02:00