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

8225 commits

Author SHA1 Message Date
Bernhard Posselt
3fa6e0f4dc Merge pull request #13718 from owncloud/use-proper-namespace 
Use proper namespace
 2015-01-27 17:39:35 +01:00
Lukas Reschke
bedf358b40 Use proper namespace 
IAppManager lives in OCP\App and not in OCP.

Fixes https://github.com/owncloud/core/issues/13710
 2015-01-27 17:34:25 +01:00
Vincent Petry
acec40fe5a Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix 
Call final unlink in trash wrapper's storage
 2015-01-27 17:05:38 +01:00
Vincent Petry
12867b9c78 Fix return type of addStorageWrapper in PHPDoc 2015-01-27 16:41:43 +01:00
Morris Jobke
4d90fd933f Merge pull request #13699 from owncloud/check-if-file-exists 
Use `file_exists` to verify that config file exists
 2015-01-27 14:16:40 +01:00
Lukas Reschke
9771ead7dd Merge pull request #13701 from owncloud/disable-appcode-checker 
disable the app code checker - some previous shipped apps cannot be inst...
 2015-01-27 11:53:03 +01:00
Thomas Müller
956de27e94 Merge pull request #13676 from owncloud/fix-node-iface 
Fix node interface
 2015-01-27 09:34:59 +01:00
Thomas Müller
9a75304b02 disable the app code checker - some previous shipped apps cannot be installed from the appstore now 👊 2015-01-27 09:27:38 +01:00
Thomas Müller
f248ee013b Merge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-error 
Make error more descriptive
 2015-01-27 09:15:57 +01:00
Jenkins for ownCloud
c8f58054b0 [tx-robot] updated from transifex 2015-01-27 01:54:34 -05:00
Lukas Reschke
17f2cfbb9c Use file_exists to verify that config file exists 
There might be the case that `fopen($file, 'r')` returns false and thus ownCloud might believe that the config file is empty and thus potentially leading to an overwrite of the config file.

This changeset introduces `file_exists` again which was used in ownCloud 5 where no such problems where reported and should not be affected by such problems.

Ref https://github.com/owncloud/core/issues/12785#issuecomment-71548720
 2015-01-27 00:50:14 +01:00
Lukas Reschke
d8559dc78f Make error more descriptive 
Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767
 2015-01-26 23:00:15 +01:00
Bjoern Schiessle
5ba19ba7fc certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages 2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a certificate manager only needs the user-id, no need to pass on the complete user object 2015-01-26 16:58:52 +01:00
Bernhard Posselt
b8769802df fix node interface 2015-01-26 15:58:41 +01:00
Thomas Müller
5da4071c45 Merge pull request #13621 from owncloud/system-config-multiset 
Add a method to set/unset multiple config values with one write
 2015-01-26 13:36:22 +01:00
Thomas Müller
9ad9d7bfbb naming fixes while reviewing 2015-01-26 12:59:25 +01:00
Jenkins for ownCloud
810d5a6a67 [tx-robot] updated from transifex 2015-01-26 01:54:29 -05:00
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud
b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Clark Tomlinson
f8b1fde2c0 Merge pull request #13626 from owncloud/check-for-hhvm 
Don't check for `always_populate_raw_post_data` on HHVM
 2015-01-23 10:28:47 -05:00
Robin Appelman
87a1b2bdc4 Preserve mtime when doing cross storage move 2015-01-23 15:11:27 +01:00
Vincent Petry
8fa3e7a6bf Do not retrieve shares through group if user has no group 2015-01-23 15:11:06 +01:00
Joas Schilling
039397bd31 Use setConfigs() instead of calling setConfig() multiple times 2015-01-23 14:52:21 +01:00
Lukas Reschke
30a5758a95 Don't check for always_populate_raw_post_data on HHVM 
HHVM seems to have problems with this at the moment (even setting those values in the php.ini of HHVM doesn't have helped much) and thus the unit test execution failed.

So it's better if we disable this check for now for HHVM.
 2015-01-23 13:54:34 +01:00
Robin Appelman
960ff4f136 Apply wrappers to existing mounts before registering it 2015-01-23 13:48:35 +01:00
Vincent Petry
5fb8a4715d removeStorageWrapper to unregister a storage wrapper 2015-01-23 12:20:54 +01:00
Joas Schilling
c61e9f3912 Add a method to set/unset multiple config values in one call 
This reduces the number of file writes we do for config.php and therefor
hopefully helps lowering the chances for empty config.php files
 2015-01-23 11:00:53 +01:00
Morris Jobke
7e4afa3f25 Merge pull request #13593 from owncloud/add-check-for-raw-post-data 
Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
 2015-01-22 23:59:52 +01:00
Morris Jobke
254a1fa12a Merge pull request #13314 from owncloud/login-hook-logout 
Return false if the login is canceled in a hook
 2015-01-22 23:34:19 +01:00
Thomas Müller
5776bfec05 Merge pull request #13449 from owncloud/image_preview_limit 
add config-option for an image's maximum filesize when generating previews
 2015-01-22 23:02:38 +01:00
Georg Ehrke
3af8bde949 add config-option for an image's maximum filesize when generating previews 2015-01-22 20:21:37 +01:00
Georg Ehrke
6b33481652 remove insane debug-log from OC_Image 2015-01-22 20:17:25 +01:00
Thomas Müller
8f06bf7bc6 Merge pull request #13598 from owncloud/fix-undefined-offset 
Fix undefined offset 1 for wrong user mail address
 2015-01-22 17:16:23 +01:00
Vincent Petry
6fb553e92c Do not call wrapStorage if storate with same name added twice 2015-01-22 16:24:24 +01:00
Morris Jobke
3d42ecea37 Fix undefined offset 1 for wrong user mail address 
* fixes Undefined offset: 1 at lib/private/mail.php#143
 2015-01-22 16:23:50 +01:00
Thomas Müller
f4a9164660 Merge pull request #13600 from owncloud/server-warning 
Get rid of log warning when using servercontainer
 2015-01-22 16:03:54 +01:00
Bernhard Posselt
9df297324f get rid of log warning when using servercontainer 2015-01-22 15:33:09 +01:00
Morris Jobke
55c28608c9 translate error messages 2015-01-22 14:52:47 +01:00
Robin Appelman
8eda661761 Throw an exception when login is canceled by an app 2015-01-22 14:13:17 +01:00
Robin Appelman
8a9acc5083 Allow custom error messages for the login page 2015-01-22 14:13:02 +01:00
Lukas Reschke
bb80cf4eca Add check for HTTP_RAW_POST_DATA setting for >= 5.6 
PHP 5.6 otherwise throws notices for perfectly valid code which results in broken endpoints.

Fixes https://github.com/owncloud/core/issues/13592
 2015-01-22 13:50:38 +01:00
Morris Jobke
b5b491d1bb Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroup 
Fix reshare permission change to not impair other deletion code
 2015-01-22 10:40:29 +01:00
Vincent Petry
9f137ac259 Fix reshare permission change to not impair other deletion code 
A recent change that prevents reshare permission changes to delete group
share children had the side-effect of also preventing group share
children deletion when it needed to be done.

This fix adds an extra flag to isolate the "reshare permission change"
deletion case and keep the other ones as they were before, not only to
fix the regression but also fix other potential regressions in code that
uses this method.

Also updated the comment because now Helper::delete() is no longer
limited to reshares but also applies to group share children.
 2015-01-22 10:12:47 +01:00
Thomas Müller
c13bf8d820 Merge pull request #13552 from owncloud/request-uri-double-slash 
Remove duplicated slashes from the requested url
 2015-01-21 21:56:09 +01:00
Joas Schilling
d4657aa592 Set the debugoutput channel to error_log instead of echoing it 2015-01-21 15:32:31 +01:00
Robin Appelman
04075eba6b Remove duplicated slashes from the requested url 2015-01-21 15:04:18 +01:00
Jenkins for ownCloud
b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Thomas Müller
84bb4cc2e9 Merge pull request #13499 from owncloud/issue/13451-redis-json-encode 
Issue/13451 redis json encode
 2015-01-20 14:53:33 +01:00
Joas Schilling
e25998df0f Json_(en|de)code values on redis to be able to cache arrays 2015-01-20 10:51:27 +01:00