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

10207 commits

Author SHA1 Message Date
Thomas Müller
bd21e5925c Clean code 2015-10-09 13:46:59 +02:00
Thomas Müller
38143d670b Catch exceptions during app upgrade - fixes #16240 2015-10-09 13:44:30 +02:00
Robin Appelman
a42dd117e2 Merge pull request #19654 from owncloud/db-locking-no-scan-transaction 
Dont use a transaction in the scanner while using db based locking
 2015-10-09 12:38:54 +02:00
Morris Jobke
bf579a153f fix IE8 user agent detection 2015-10-09 11:19:06 +02:00
Vincent Petry
c7aef6c368 Fix uploading avatar and root certs in IE8 2015-10-09 11:19:05 +02:00
Jenkins for ownCloud
5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Thomas Müller
020bb33150 Merge pull request #19034 from owncloud/http-request-warning 
Prevent warning decoding content
 2015-10-08 21:51:47 +02:00
Thomas Müller
3130438fcc Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstores 
make mkdir recursive, add phpdoc to api
 2015-10-08 21:28:53 +02:00
Thomas Müller
1227786930 Merge pull request #19650 from owncloud/disable-appstore-for-ee 
Disable app store for EE by default
 2015-10-08 16:00:41 +02:00
Robin Appelman
7ff5a6ccf4 Dont use a transaction in the scanner while using db based locking 2015-10-08 15:29:04 +02:00
Jörn Friedrich Dreyer
89a63ec74b make mkdir recursive, add phpdoc to api 2015-10-08 14:54:21 +02:00
Lukas Reschke
9866037d0c Disable app store for EE by default 
This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc.

Administrators can still enable the app store by setting `appstoreenabled` to true in the config file.
 2015-10-08 14:52:52 +02:00
Thomas Müller
fd5636cda7 Merge pull request #19644 from owncloud/issue-19617-catch-exception-when-cleaning-locks 
Catch "missing table" exception when cleaning up locks
 2015-10-08 13:39:34 +02:00
Thomas Müller
2fda4e38e2 Merge pull request #19546 from owncloud/fix-search-for-node-api 
Fix search operations for the Node API
 2015-10-08 13:17:26 +02:00
Thomas Müller
8d2c8cf2a2 Merge pull request #19607 from owncloud/use-url 
Use `/` if installed in main folder
 2015-10-08 13:01:41 +02:00
Thomas Müller
95c8d7598b Merge pull request #19609 from owncloud/check_dav_move_permissions 
[webdav] Check if source can be deleted before move
 2015-10-08 13:01:20 +02:00
Joas Schilling
336a127426 Catch "missing table" exception when cleaning up locks 2015-10-08 11:37:51 +02:00
Joas Schilling
e6d9869cf7 Only use zip64 when we have 64 bit php 2015-10-08 09:13:08 +02:00
Jenkins for ownCloud
c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Thomas Müller
70ba594f45 Merge pull request #19537 from owncloud/fix-white-page-of-death 
Fixes last causes for WSOD
 2015-10-07 14:55:11 +02:00
Thomas Müller
9f25745649 Fix single file download - fixes #19614 2015-10-07 13:15:58 +02:00
Roeland Jago Douma
1ee56c702d [WEBDAV] check if delete of source is allowed on move 
Fixes #5251

If we perform a move we need to make sure first that the source can be
deleted. Else the dest might be cleared but the move will fail later.

* Added unit tests

Eventually we need more and better checking here.
 2015-10-07 11:58:16 +02:00
Joas Schilling
937fb70757 Do not trigger the update exception when we already show an error 2015-10-07 08:07:52 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Robin Appelman
59cf817308 Merge pull request #19511 from owncloud/etag-share-permissions-update 
Mark shares as dirty when changing permissions
 2015-10-06 18:09:12 +02:00
Robin Appelman
c2d76d2010 fix internal path when searching in storage root 2015-10-06 15:54:17 +02:00
Olivier Paroz
3173ed29df The minimum size for internalRootLength is 1 2015-10-06 15:54:17 +02:00
Morris Jobke
285e73ac72 validate HTTP protocol in case of an exception 2015-10-06 15:25:31 +02:00
Lukas Reschke
6a4f22c61f Use / if installed in main folder 
Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour.

Fixes https://github.com/owncloud/core/issues/19196
 2015-10-06 15:24:19 +02:00
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
Robin Appelman
0817024e6f Mark shares as dirty when changing permissions 2015-10-06 11:38:41 +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
b05422544d Fixes last causes for WSOD 
* print plain text if rendering of exception/error page is not possible
 2015-10-06 10:20:53 +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