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

1623 commits

Author SHA1 Message Date
Lukas Reschke
bd5440a8a3 Merge pull request #13780 from owncloud/cmreflector-inheritance 
Additional controllermethodreflector inheritance tests
 2015-02-12 18:34:07 +01:00
Vincent Petry
fbbb9fe0fd Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-post-hook 
Do not overwrite the shareType so the post hook is still correct
 2015-02-11 15:23:13 +01:00
Thomas Müller
c60dabd11b Request requires a second parameter 2015-02-09 23:06:55 +01:00
Vincent Petry
5296767393 Merge pull request #13921 from owncloud/ocs-af 
Add a controller and reponse for ocs
 2015-02-09 18:11:47 +01:00
Joas Schilling
c17b236c19 Add a test for the post_shared hook shareType 2015-02-09 13:12:34 +01:00
Lukas Reschke
770fa761b8 Respect mod_unique_id and refactor OC_Request::getRequestId 
When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs.

Testplan:

- [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`.
- [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string
- [ ] The generated Id is stable over the lifespan of one request

Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI.

Fixes https://github.com/owncloud/core/issues/13366
 2015-02-09 11:53:11 +01:00
Morris Jobke
90556cb70b Merge pull request #12283 from oparoz/sfnt-fonts 
Updated the media type of some font types
 2015-02-07 13:33:49 +01:00
Morris Jobke
485e2a282b Merge pull request #13753 from owncloud/use-403-instead-of-200 
Use 403 instead of 200 response
 2015-02-07 13:25:15 +01:00
Lukas Reschke
4d91fa4c93 Normalize before processing 2015-02-06 15:03:29 +01:00
Bernhard Posselt
9873aa3d9e fix license email 2015-02-05 14:10:16 +01:00
Bernhard Posselt
b89ddcfe41 fix license email 2015-02-05 14:09:01 +01:00
Bernhard Posselt
fdc64e370c add a controller and reponse for ocs 2015-02-05 14:02:17 +01:00
Bjoern Schiessle
21c45925fe detect root of mountpoint also if the trailing slash is missed 2015-02-04 12:47:04 +01:00
Lukas Reschke
2426bd1b9d Merge pull request #13811 from owncloud/default-to-null 
Default to `null` for lostpassword
 2015-02-02 11:41:14 +01:00
Lukas Reschke
944dc127b8 Mock l10n in the setup 2015-02-01 17:46:48 +01:00
Lukas Reschke
ba29ea178f Add unit tests for empty token 2015-02-01 17:34:03 +01:00
Lukas Reschke
0f7634eadc Switch to a factory and add unit tests 2015-01-30 17:24:42 +01:00
Lukas Reschke
7e7dd92f6b Add unit tests 2015-01-30 14:29:46 +01:00
Bernhard Posselt
81836ccc7e another test for overriding the docblock 2015-01-29 20:35:07 +01:00
Bernhard Posselt
72d2b6f723 additional inheritance tests 2015-01-29 20:33:05 +01:00
Robin Appelman
2124540d1d Dont remove a file from cache if the delete operation failed 2015-01-29 15:39:56 +01:00
Robin Appelman
05035ef4af Fix webdav put for single file webdav shares 2015-01-29 12:47:12 +01:00
Robin Appelman
ddee63fa00 Fix resolving paths for views rooted in a file 2015-01-29 12:47:11 +01:00
Lukas Reschke
b9f180e001 Use 403 instead of 200 response 
A forbidden should throw a 403 and this makes it easier for me to do some automated testing.
 2015-01-29 12:04:54 +01:00
Robin Appelman
cec43df0f0 Add unit test 2015-01-28 13:44:39 +01:00
Morris Jobke
752b94d363 Merge pull request #13717 from owncloud/storage-donotwrapnullstorage 
Prevent wrapping null storage
 2015-01-28 01:00:20 +01:00
Vincent Petry
6d8985b671 Prevent wrapping null storage 
Can happen when trying to instantiate external storages that have
incomplete config, where the constructor throws an exception (the
exception is caught in createStorage())
 2015-01-27 17:40:08 +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
Lukas Reschke
a870dbe70b Merge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not-possible 
Add value if restore of data is possible for a user
 2015-01-27 14:12:05 +01:00
Morris Jobke
9fbeaf0fd9 Add value if restore of data is possible for a user 
* reason: nice to know before password change in user management
* restore is possible:
	* encryption is disabled
	* encryption is enabled, admin and user has checked the
	  restore option
* if not possible:
	* highlight users row in red once the admin wants to change the password
	* show also a little tipsy
 2015-01-27 13:23:19 +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
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
Olivier Paroz
7fbf1a20d7 Updated the media type of some font types 
TTF and TTF have now the same media type
Official since 2013 and supported by Firefox and Chrome
https://www.iana.org/assignments/media-types/application/font-sfnt

Introducing support for Type1 fonts
 2015-01-24 01:49:13 +01: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
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
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
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
Robin Appelman
0b9f7642a6 Add unit test 2015-01-21 17:18:47 +01:00
Vincent Petry
f3d696599a Add unit test for external share JS dialog 
Moved external share JS code into a small plugin to make it testable.

Added unit test for the external share dialog logic + ajax calls.
 2015-01-21 11:26:54 +01:00
Joas Schilling
7eb8404040 Add a test case for memcaches to store an array 2015-01-20 10:51:04 +01:00
Vincent Petry
ef8d38ca27 Fix chunked query for tags + unit test 2015-01-19 17:05:44 +01:00
Thomas Müller
d2d6472e39 Merge pull request #13423 from owncloud/share-fixfindshareforuserwithmultiplegroups 
Fix getItemSharedWithUser for groups
 2015-01-19 12:34:28 +01:00
Lukas Reschke
2272bcedeb Fix filtering for users when $gid is empty 
Previously when $gid was empty the users were not filtered at all. Rendering the search function in the user management pretty useless.

Fixes itself
 2015-01-18 18:31:03 +01:00
Lukas Reschke
744cf713f7 Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description 
replace line breaks in the app description by spaces - fixes #13315
 2015-01-17 01:03:41 +01:00
Vincent Petry
40931a8b0d Fix getItemSharedWithUser for groups 
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.
 2015-01-16 18:11:13 +01:00