summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-074-10/+12
* Merge pull request #19511 from owncloud/etag-share-permissions-updateRobin Appelman2015-10-061-1/+9
|\
| * Mark shares as dirty when changing permissionsRobin Appelman2015-10-061-1/+9
* | Merge pull request #19605 from owncloud/add-get-http-protocolThomas Müller2015-10-062-0/+29
|\ \
| * | Add \OCP\IRequest::getHttpProtocolLukas Reschke2015-10-062-0/+29
* | | OC_Log not longer existsThomas Müller2015-10-061-1/+1
|/ /
* | Merge pull request #19407 from owncloud/lock-zip-contentThomas Müller2015-10-062-84/+135
|\ \ | |/ |/|
| * Refactor single file download into it's own methodThomas Müller2015-10-051-76/+71
| * Recursively lock folder contentsThomas Müller2015-10-051-6/+27
| * release locks in case of exceptionThomas Müller2015-10-051-0/+2
| * log the exception during zip creationThomas Müller2015-10-051-13/+26
| * Lock files which are zippedThomas Müller2015-10-051-6/+26
| * Clean PHPDocThomas Müller2015-10-051-6/+6
* | Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-06127-82/+167
|\ \
| * | deduplicate @xenopathicMorris Jobke2015-10-0621-21/+13
| * | update licence headers via scriptMorris Jobke2015-10-05125-79/+172
| |/
* | Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotin...Thomas Müller2015-10-061-0/+6
|\ \
| * | Remove invalid share items from result when missing group membershipVincent Petry2015-10-051-0/+6
| |/
* | Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sha...Thomas Müller2015-10-061-1/+3
|\ \
| * | Make sure all variables are definedJoas Schilling2015-10-051-0/+2
| * | Make sure the share we found is for the same itemJoas Schilling2015-10-051-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-064-4/+8
* | | use a normal rename when moving from the same storage in the encryption wrapperRobin Appelman2015-10-051-0/+3
| |/ |/|
* | add some output to explain the pre-conditions for decrypt-allBjoern Schiessle2015-10-051-0/+3
|/
* Merge pull request #19416 from owncloud/node-hook-connectorThomas Müller2015-10-052-1/+156
|\
| * pass view hooks trough to the node hooksRobin Appelman2015-09-281-1/+5
| * Add hook connector to connect view and node hooksRobin Appelman2015-09-281-0/+151
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-042-20/+278
* | Merge pull request #19545 from owncloud/fix-16908Thomas Müller2015-10-032-0/+3
|\ \
| * | Add remark that $run is not supported anymoreLukas Reschke2015-10-022-0/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-034-4/+42
|/ /
* | Merge pull request #19272 from owncloud/mimetypes-enhancedThomas Müller2015-10-022-1/+53
|\ \
| * | Added mimetype repair stepRoeland Jago Douma2015-10-021-0/+52
| * | Allow recursive mimetype aliasesRobin McCorkell2015-10-021-1/+1
* | | Merge pull request #19525 from owncloud/share-preventmovemountpointintoshared...Robin Appelman2015-10-021-8/+29
|\ \ \ | |/ / |/| |
| * | Prevent moving mount point into already shared folder (outgoing)Vincent Petry2015-10-021-8/+29
* | | Merge pull request #19533 from owncloud/free-space-infRobin Appelman2015-10-021-1/+1
|\ \ \
| * | | Work around INF=0 on some shared hostsRobin Appelman2015-10-021-1/+1
* | | | [l10n] remove unused static methodsMorris Jobke2015-10-021-36/+3
|/ / /
* | | Merge pull request #19510 from owncloud/json-grouplist-sharing-excludeThomas Müller2015-10-021-1/+6
|\ \ \
| * | | save excluded groups in json format - fixes #10983Thomas Müller2015-10-011-1/+6
* | | | Allow identifying whether the current item is the filtered oneJoas Schilling2015-10-022-0/+37
| |/ / |/| |
* | | Merge pull request #19505 from owncloud/returnfloatforquotaJörn Friedrich Dreyer2015-10-021-2/+2
|\ \ \
| * | | always return float, update docJörn Friedrich Dreyer2015-10-011-2/+2
* | | | Merge pull request #19480 from owncloud/fix-l10nJörn Friedrich Dreyer2015-10-021-14/+5
|\ \ \ \
| * | | | Fix l10n on masterMorris Jobke2015-09-301-14/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-022-0/+2
* | | | | Merge pull request #19463 from owncloud/fix_18132Thomas Müller2015-10-011-2/+24
|\ \ \ \ \
| * | | | | versions should always use the keys of the original file, no need to create n...Bjoern Schiessle2015-10-011-2/+24
* | | | | | Add testsRobin Appelman2015-10-011-1/+1