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

11212 commits

Author SHA1 Message Date
Thomas Müller
4537eaac41 Add ILIKE support to querybuilder 2016-02-22 19:46:37 +01:00
Thomas Müller
a70421ff2f Merge pull request #22552 from owncloud/fix-avconv-preview-parameters 
Move `-an` after the input arg because it is an output option
 2016-02-22 14:14:35 +01:00
Roeland Jago Douma
fe08b5e9d9 We should check for exceptions when trying to get the avatar 
Fixes #22550

* Updated phpdoc of avatatmanager
* Add unit test
 2016-02-22 10:14:14 +01:00
Joas Schilling
2865ccfdc4 Move -an after the input arg because it is an output option 2016-02-22 09:40:46 +01:00
Thomas Müller
f8677628d4 Merge pull request #22503 from owncloud/issue_22500 
When (re-)sharing an incomming federated share set the corrent owner
 2016-02-19 16:07:43 +01:00
Thomas Müller
fb38625741 Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename 
Check delete permission before attemping copy+delete
 2016-02-19 16:06:55 +01:00
Thomas Müller
b5281b61ed Merge pull request #22410 from owncloud/fix_22119 
Do not copy skeleton on avatar access
 2016-02-19 16:06:40 +01:00
Thomas Müller
2fd0e9b768 Merge pull request #22521 from owncloud/mssql-is-not-support-since-ages 
Remove old adapter - mssql is not supported
 2016-02-19 13:35:32 +01:00
Thomas Müller
5820666254 Merge pull request #22218 from owncloud/occ-no-extra-messages 
Add global --no-warnings option to occ…
 2016-02-19 13:32:52 +01:00
Joas Schilling
c20c836a46 Remove old adapter - mssql is not supported 2016-02-19 13:16:43 +01:00
Vincent Petry
a9e0cfad8b Check delete permission before attemping copy+delete 
Some move operations when cross-storage will be replaced by copy and
delete. Before attempting this, first check whether the source storage
has delete permissions.

This also prevents renaming system-wide external storages.
 2016-02-19 12:59:10 +01:00
Roeland Jago Douma
2dcf887cce When (re-)sharing an incomming federated share set the corrent owner 
Incomming federated shares are a special kind. We mount them as normal
webdav shares but we do supply owner info with the federated cloud id of
the share owner.

Since we do not yet have the new resharing behaviour on federated shares
we need to set the correct owner. Which will allow sharing and proper
mounting for other users.

fixes #22500
 2016-02-19 12:43:03 +01:00
Roeland Jago Douma
f837c08465 Fix even more 2016-02-19 09:43:20 +01:00
Joas Schilling
8756a22c60 Fix more things 2016-02-19 09:43:11 +01:00
Thomas Müller
8e36678873 Fix PHPDoc 2016-02-19 09:43:11 +01:00
Scrutinizer Auto-Fixer
0d0151a3e1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-02-19 09:43:11 +01:00
Victor Dubiniuk
972e0c62b3 Add global --no-warning option to occ in order not to pollute output with warnings 2016-02-19 00:33:48 +03:00
Thomas Müller
48f6ae0b2d Merge pull request #22493 from owncloud/issue_22467 
getRootFolder should not setup the FS for any user
 2016-02-18 16:46:00 +01:00
Thomas Müller
2a9b0aaaa1 Merge pull request #22482 from owncloud/getowner-cache 
cache result for getowner
 2016-02-18 16:45:40 +01:00
Thomas Müller
6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile 
Fix quota check for single shared files
 2016-02-18 14:25:32 +01:00
Roeland Jago Douma
b539bb15e1 Make scrutinizer happy 2016-02-18 14:25:18 +01:00
Roeland Jago Douma
7abb8693a1 getRootFolder should not setup the FS for any user 
Fixes #22467

This can go wrong when an app (take the ldap app) DIs something that
needs the rootFolder. This break if we use cookie auth since then we
know the user at that point and thus try to setup the fs for that user.

However if there are then incomming shares from an ldap user they will
fails since the user manager can't find them yet.

Now getRootFolder does not setup the fs for any user.
 2016-02-18 13:55:54 +01:00
v1r0x
534071f4b2 set correct http status code 
Was intended to respond with a 303 (See other) status code instead of 307 (Temporary Redirect).
 2016-02-18 11:56:09 +01:00
Thomas Müller
73d46afc3c Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle 
Add index names so Doctrine does not use a too long random string
 2016-02-18 11:18:32 +01:00
Joas Schilling
6374472e2e No more static 2016-02-18 10:12:23 +01:00
Robin Appelman
f309bc960d cache result for getowner 2016-02-17 19:14:46 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global 
Adding global error handler for ajax calls which run into redirection…
 2016-02-17 14:49:04 +01:00
Vincent Petry
8f96ef147f Don't apply quota in stream wrapper for part files 
When overwriting shared files as recipient, the part file is written on
the uploader's storage before overwriting the target file.

If the uploader has no quota left, they should still be able to
overwrite that file with Webdav. To make this work, they need to be able
to write the part file to their own storage first.
 2016-02-17 11:52:49 +01:00
Thomas Müller
9e415a956a Merge pull request #22451 from owncloud/use-proper-user-folder 
Handles null as return code and uses proper UserFolder in trashbin
 2016-02-17 10:58:31 +01:00
Jenkins for ownCloud
fe29feae9a [tx-robot] updated from transifex 2016-02-17 01:56:11 -05:00
Morris Jobke
de58364eb8 Handles null as return code and uses proper UserFolder in trashbin 2016-02-16 18:45:25 +01:00
Thomas Müller
c6fef52939 Merge pull request #22416 from owncloud/fix_22402 
Return proper error string if sharing for this user is disabled
 2016-02-16 13:37:22 +01:00
Thomas Müller
d5226c88ac Merge pull request #22338 from owncloud/fix_22247 
Allow more characters in filenames
 2016-02-16 13:37:07 +01:00
Roeland Jago Douma
ed6843e87b Return proper error string if sharing for this user is disabled 
Fixes #22402
 2016-02-16 10:22:49 +01:00
Lukas Reschke
b99c6f1f67 Send 401 header for OC_JSON::checkLoggedIn() 2016-02-16 09:48:40 +01:00
Joas Schilling
b14e8fa427 Make sure our index names fit in oracle 2016-02-16 09:28:29 +01:00
Roeland Jago Douma
47d28155a8 Do not copy skeleton on avatar access 
Fixes #22119

Just try to get the folder of the user. If it is not there a
NotFoundException will be thrown. Which will be handled by the avatar
endpoint.
 2016-02-16 09:18:38 +01:00
Thomas Müller
60d22f834f Merge pull request #22407 from fancycode/untrusted_domain 
Pass checked host as "domain" variable to "untrustedDomain" template.
 2016-02-16 08:29:02 +01:00
Jenkins for ownCloud
3dd1961f92 [tx-robot] updated from transifex 2016-02-16 01:55:39 -05:00
Joachim Bauch
0173063923 Pass checked host as "domain" variable to "untrustedDomain" template. 
Currently the "SERVER_NAME" is passed to the template, which in some cases doesn't match the host returned by "getInsecureServerHost" (or is empty).
 2016-02-15 17:02:14 +01:00
Thomas Müller
3ab328350a Merge pull request #22376 from owncloud/fix-return-code-getAppPath 
Properly handle return code of OC_App::getAppPath
 2016-02-15 16:58:37 +01:00
Lukas Reschke
dfc3536d2b Catch auth coming from JS in OCS 2016-02-15 15:38:37 +01:00
Thomas Müller
7b858d7c4a Merge pull request #22381 from owncloud/remove-not-needed-variable 
Remove not needed variable
 2016-02-15 12:02:03 +01:00
Jenkins for ownCloud
be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Thomas Müller
db79799eb8 Merge pull request #22380 from owncloud/make-scrutinizer-happy 
Fix typo in PHPDoc
 2016-02-15 07:01:41 +01:00
Morris Jobke
6cd3fa2ed7 Remove not needed variable 2016-02-14 21:44:53 +01:00
Morris Jobke
da06447c3b Fix typo in PHPDoc 2016-02-14 21:34:40 +01:00
Morris Jobke
083240482a Remove unreachable code in priavte/api.php 2016-02-14 21:12:29 +01:00
Morris Jobke
ef49f6ef5d Properly handle return code of OC_App::getAppPath 
* fixes #20128
* getAppPath could return false, but it was not handled everywhere
 2016-02-14 20:57:09 +01:00
Morris Jobke
e60e0fe22c Fix BMP support 
* fixes #16461
 2016-02-14 09:30:27 +01:00