wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27540 commits 157 branches 562 tags 714 MiB
Commit graph

10175 commits

Author SHA1 Message Date
Thomas Müller
79524ce163 Merge pull request #19605 from owncloud/add-get-http-protocol 
Add \OCP\IRequest::getHttpProtocol
 2015-10-06 15:23:00 +02:00
Lukas Reschke
80a232da6a Add \OCP\IRequest::getHttpProtocol 
Only allow valid HTTP protocols.

Ref https://github.com/owncloud/core/pull/19537#discussion_r41252333 + https://github.com/owncloud/security-tracker/issues/119
 2015-10-06 14:18:46 +02:00
Thomas Müller
48ef5b6b3b OC_Log not longer exists 2015-10-06 14:18:22 +02:00
Thomas Müller
319e61f0ea Merge pull request #19407 from owncloud/lock-zip-content 
Lock zip content
 2015-10-06 11:47:43 +02:00
Thomas Müller
0385a62363 Merge pull request #19597 from owncloud/update-license-headers 
update licence headers via script
 2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Thomas Müller
da640adf68 Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotingroup 
Remove invalid share items from result when missing group membership
 2015-10-06 09:24:22 +02:00
Thomas Müller
26b92c406c Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sharing-subfile 
Make sure the share we found is for the same item
 2015-10-06 09:23:44 +02:00
Jenkins for ownCloud
3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Robin Appelman
b1ce53f890 use a normal rename when moving from the same storage in the encryption wrapper 2015-10-05 20:55:57 +02:00
Thomas Müller
be46cd6737 Refactor single file download into it's own method 2015-10-05 17:47:15 +02:00
Thomas Müller
57f841da2c Recursively lock folder contents 2015-10-05 17:31:37 +02:00
Vincent Petry
1c7244c120 Remove invalid share items from result when missing group membership 
Group shares usually have subshare entries for every user. In some
situations it can happen that the user was removed from the group but
the subshare entries still exist.

This fix makes sure that such subshare entries are not returned any more
as the user isn't in the group any more.
 2015-10-05 17:21:34 +02:00
Thomas Müller
3bf818450a release locks in case of exception 2015-10-05 16:53:57 +02:00
Thomas Müller
def8e0c12a log the exception during zip creation 2015-10-05 16:53:57 +02:00
Thomas Müller
b5dce05cb6 Lock files which are zipped 2015-10-05 16:53:57 +02:00
Thomas Müller
149792abe6 Clean PHPDoc 2015-10-05 16:53:57 +02:00
Bjoern Schiessle
bf82015254 add some output to explain the pre-conditions for decrypt-all 2015-10-05 12:41:05 +02:00
Joas Schilling
3bbb65998f Make sure all variables are defined 2015-10-05 12:03:36 +02:00
Joas Schilling
8de0773214 Make sure the share we found is for the same item 2015-10-05 11:55:37 +02:00
Thomas Müller
56c35da8d5 Merge pull request #19416 from owncloud/node-hook-connector 
pass view hooks trough to the node hooks
 2015-10-05 10:25:04 +02:00
Jenkins for ownCloud
2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Thomas Müller
99d7352ef9 Merge pull request #19545 from owncloud/fix-16908 
Add remark that $run is not supported anymore
 2015-10-03 10:17:36 +02:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Lukas Reschke
f6e055b2fd Add remark that $run is not supported anymore 
Fixes https://github.com/owncloud/core/issues/16908
 2015-10-02 23:19:26 +02:00
Thomas Müller
ff89824135 Merge pull request #19272 from owncloud/mimetypes-enhanced 
Introduce a few new mimetypes for code, fix recursive mimetype aliases
 2015-10-02 17:50:34 +02:00
Robin Appelman
8bdffb5ed3 Merge pull request #19525 from owncloud/share-preventmovemountpointintosharedfolder 
Prevent moving mount point into already shared folder (outgoing)
 2015-10-02 16:50:38 +02:00
Vincent Petry
64ca00925b Prevent moving mount point into already shared folder (outgoing) 
It is already not allowed to share a folder containing mount points /
incoming shares.

This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
 2015-10-02 16:14:42 +02:00
Roeland Jago Douma
c80dd82fe4 Added mimetype repair step 
* Version number increased
 2015-10-02 16:06:56 +02:00
Robin McCorkell
aeb20675dd Allow recursive mimetype aliases 
application/xml -> text/html -> text/code
 2015-10-02 15:28:23 +02:00
Robin Appelman
af01c04360 Merge pull request #19533 from owncloud/free-space-inf 
Work around INF=0 on some shared hosts
 2015-10-02 15:04:28 +02:00
Robin Appelman
a1d0d23b6a Work around INF=0 on some shared hosts 2015-10-02 14:16:13 +02:00
Morris Jobke
6b53f7c40e [l10n] remove unused static methods 2015-10-02 12:51:45 +02:00
Thomas Müller
8944cb539e Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude 
save excluded groups in json format
 2015-10-02 12:14:36 +02:00
Joas Schilling
7707bbe648 Allow identifying whether the current item is the filtered one 2015-10-02 09:53:39 +02:00
Jörn Friedrich Dreyer
3098fd0d30 Merge pull request #19505 from owncloud/returnfloatforquota 
always return float, update doc
 2015-10-02 08:57:04 +02:00
Jörn Friedrich Dreyer
b18307aafb Merge pull request #19480 from owncloud/fix-l10n 
Fix l10n on master
 2015-10-02 08:56:33 +02:00
Jenkins for ownCloud
3b4592718a [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
Thomas Müller
b6591084a1 Merge pull request #19463 from owncloud/fix_18132 
encryption: versions should always use the keys of the original file, no need to …
 2015-10-01 16:56:28 +02:00
Thomas Müller
b2dd5cb616 save excluded groups in json format - fixes #10983 2015-10-01 15:37:55 +02:00
Jörn Friedrich Dreyer
1d617c4bf6 always return float, update doc 2015-10-01 13:45:49 +02:00
Robin Appelman
1c3e28a73b Add tests 2015-10-01 13:17:22 +02:00
Robin Appelman
dc49e76747 stricter check if thumbnail is cached 2015-10-01 13:14:47 +02:00
Robin Appelman
884e2fcd6e to much copy paste 2015-10-01 13:14:47 +02:00
Robin Appelman
9925ff33f1 use cache data we already have to check if a thumbnail of specific size is cached 2015-10-01 13:14:47 +02:00
Robin Appelman
52d4495793 use the fileinfo to check if we have a valid file 2015-10-01 13:14:47 +02:00
Robin Appelman
f4d180ee5c allow passing the fileinfo to the preview manager 2015-10-01 13:14:47 +02:00
Bjoern Schiessle
e7232a848b versions should always use the keys of the original file, no need to create new one 2015-10-01 10:10:19 +02:00
Morris Jobke
cc0812332c add more precise version to also repair git master instances 2015-10-01 08:27:12 +02:00