summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* fix after rebaseArthur Schiwon2014-04-231-1/+0
|
* keep the constant to not provoke PHP warningsArthur Schiwon2014-04-231-2/+1
|
* trim must not be used in empty in PHP < 5.5Arthur Schiwon2014-04-231-1/+2
|
* implement getDisplayNames in group managerArthur Schiwon2014-04-233-13/+36
|
* clean up group backendsArthur Schiwon2014-04-232-45/+0
|
* remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backendsArthur Schiwon2014-04-232-6/+3
|
* Merge pull request #8260 from owncloud/stable6-backport-8183-and-coThomas Müller2014-04-237-114/+185
|\ | | | | Backport of #8183 and #8197
| * Backport of #8197 to stable6Lukas Reschke2014-04-184-89/+156
| | | | | | | | | | | | | | | | | | | | This extends mimetypes.list.php to be a white-list of known secure mime types as well as offering secure alternatives for know potentially malicious mime types. I kept this in the OC_Helper and OC\Files\Type\Detection classes as each backend has its own way of detecting mime types. This supersedes #8184 as discussed in owncloud/security-tracker#56
| * Backport of #8183 to stable6Lukas Reschke2014-04-183-25/+29
| | | | | | | | | | | | | | Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...) The migration to base.php ensures that the headers are served to all requests passing base.php
* | merge middleware string registrationBernhard Posselt2014-04-182-5/+5
| |
* | use references for middleware to fix problems on 5.3Bernhard Posselt2014-04-181-2/+3
| |
* | merge dicontainerBernhard Posselt2014-04-181-4/+3
| |
* | default to GET request when no method is set to fix unittests, also set ↵Bernhard Posselt2014-04-181-0/+7
| | | | | | | | parsed json parameters on the post attribute
* | Correctly process request parameters other than GET or POST, dont use ↵Bernhard Posselt2014-04-182-50/+39
| | | | | | | | globals in the class but inject it
* | Backport of #7682 to stable6Lukas Reschke2014-04-181-1/+2
|/
* Verify that a file exists before we share itRobin Appelman2014-04-171-0/+10
|
* Remove limit and offset manipulation when getting users or groups, because ↵Arthur Schiwon2014-04-153-32/+0
| | | | it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint
* Merge pull request #8150 from owncloud/backport-8138-stable6Thomas Müller2014-04-111-1/+9
|\ | | | | To isolate the variable scope used inside the $file it is required in i...
| * fix code formattingThomas Müller2014-04-101-1/+2
| |
| * To isolate the variable scope used inside the $file it is required in it's ↵Thomas Müller2014-04-101-1/+8
| | | | | | | | own method - refs #8138
* | Merge pull request #8151 from owncloud/backport-8137-stable6Bernhard Posselt2014-04-101-1/+9
|\ \ | | | | | | add requirements to routing
| * | add requirements to routingBernhard Posselt2014-04-101-1/+9
| |/ | | | | | | | | Conflicts: tests/lib/appframework/routing/RoutingTest.php
* | Merge pull request #8119 from Raydiation/stable6Bernhard Posselt2014-04-101-7/+15
|\ \ | | | | | | Remove dependency on container, removing service locator antipattern
| * | Update controller.phpBernhard Posselt2014-04-101-1/+9
| | | | | | | | | Backwards compability fix for faster merge ;)
| * | Remove dependency on container, removing service locator antipatternBernhard Posselt2014-04-081-7/+7
| |/
* | Fixed Sabre Node implementation to correctly return timestamps as intVincent Petry2014-04-101-3/+6
| | | | | | | | | | | | | | | | | | | | Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined. Backport of 4f11786 from master
* | Disabled internet checking as mentioned when in proxy modeJoan2014-04-101-0/+5
|/
* Fixed chunking and insufficient storage checkVincent Petry2014-04-072-2/+50
| | | | | | | | | - fixed free space detection based on the already uploaded chunks - now deleting chunks as soon as it is read out before writing it into the part file, which reduces the space needed when assembling part files Backport of 4033eba from master
* Do not expire chunks while checking for their existenceVincent Petry2014-04-041-5/+0
| | | | | | | The expiration should be done by the gc() function on login, not while isComplete() is calling hasKey() for every chunk. Backport of ab56f694160f58f075069560953cba86cdfe5aec from master
* Add bindParam to statement wrapperRobin Appelman2014-04-041-0/+14
|
* use a non-recursive chmod on the datadirRobin Appelman2014-04-032-30/+1
|
* Improve phpdocRobin Appelman2014-04-031-1/+3
|
* Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-04-032-6/+29
|
* Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
| | | | is shown.
* remove pl_PL - fixes #7973Thomas Müller2014-03-311-5/+0
|
* Fix 'Undefined variable: message' in OCP\Util::logExceptionThomas Tanghus2014-03-251-5/+2
|
* Still return quota value when free space is unknownVincent Petry2014-03-211-1/+8
| | | | | | | | Fixed the quota storage wrapper to correctly return the quota value when the free space is not known (which usually happens when the disk_free_space function is disabled) Backport of 66bc0f0 from master
* Return unencrypted_size of folder when queriedVincent Petry2014-03-211-0/+5
| | | | | | This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled
* Propagate unencrypted_size up to the file cache rootVincent Petry2014-03-211-2/+7
|
* Return 503 when a config/data dir error existsVincent Petry2014-03-202-0/+5
| | | | Backport of b619ff6 from master
* Added .ocdata file to check for data folder validityVincent Petry2014-03-203-4/+37
| | | | | | | | | | In environments where the data folder is mount from another partition, it is important to check that the data folder we see is actually the real one. If the mount failed for some reasons, this fix will make ownCloud temporarily unavailable instead of causing unpredictable behavior. Backport of 3c46dcd from master
* Added warning for trusted_domains after CLI upgradeVincent Petry2014-03-171-1/+1
| | | | | | | If trusted_domains is not set after a CLI upgrade, show a warning in the output. Backport of 1a11682 from master
* finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-131-2/+4
|
* fixing method namesThomas Müller2014-03-121-1/+1
|
* set content-type on ocs exceptionsThomas Müller2014-03-121-3/+30
|
* fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-111-2/+7
|
* remove magic handling of recipient lists by exploding the string - this ↵Thomas Müller2014-03-111-4/+1
| | | | functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname
* Reset time of last update feed pollingVictor Dubiniuk2014-03-111-0/+2
|
* Disable XML entities when parsing XMLVincent Petry2014-03-102-4/+14
|
* fixing identThomas Müller2014-03-071-9/+9
|