summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Add support for keys in the info.xmlLukas Reschke2014-10-091-1/+9
* strict comparisonJörn Friedrich Dreyer2014-10-081-2/+2
* fix amazon s3 issuesJörn Friedrich Dreyer2014-10-081-1/+1
* fix for issue #10880michag862014-10-071-1/+1
* Revert "fix for issue #10880"Vincent Petry2014-10-071-1/+1
* fix for issue #10880michag862014-10-071-1/+1
* Add CssImportFilter. More elegant fix for documents#348Victor Dubiniuk2014-10-061-1/+10
* Merge pull request #11390 from Nemesiz/masterMorris Jobke2014-10-061-1/+1
|\
| * Preview large TXT files fixNmz2014-10-021-1/+1
* | New generic class for Imagemagick conversionsOlivier Paroz2014-10-045-99/+124
|/
* Merge pull request #11356 from owncloud/redirect-only-to-the-same-domainLukas Reschke2014-10-011-2/+4
|\
| * Redirect only to absolute URLLukas Reschke2014-09-291-2/+4
* | Merge pull request #11303 from owncloud/addFilelockToConfigLukas Reschke2014-10-012-83/+89
|\ \
| * | Add flock to configLukas Reschke2014-09-302-83/+89
* | | Merge pull request #11365 from owncloud/fix-phpdocMorris Jobke2014-09-301-4/+4
|\ \ \
| * | | Fix PHPDocLukas Reschke2014-09-301-4/+4
| |/ /
* / / Remove invalid PHPDocLukas Reschke2014-09-301-3/+3
|/ /
* | Merge pull request #10107 from owncloud/sharing_group_sharesLukas Reschke2014-09-293-362/+396
|\ \
| * | some small fixed, suggested by scrutinizerBjoern Schiessle2014-09-293-6/+5
| * | on unshare only unshare childrens if there is no other parent availableBjoern Schiessle2014-09-262-15/+63
| * | only create a new share entry, if the user needs a different target name than...Bjoern Schiessle2014-09-261-1/+1
| * | for group shares we don't need a extra db entry of groupTarget equals itemTargetBjoern Schiessle2014-09-261-3/+3
| * | for group shares only the parent has the up-to-date permission. Make sure tha...Bjoern Schiessle2014-09-261-1/+12
| * | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all c...Bjoern Schiessle2014-09-251-29/+5
| * | always select permissions, used in getItems()Bjoern Schiessle2014-09-251-2/+3
| * | some small fixesBjoern Schiessle2014-09-251-6/+1
| * | only add a new row if it isn't a unique share, otherwise update the existing rowBjoern Schiessle2014-09-241-1/+1
| * | fix add user to group to work with grouped sharesBjoern Schiessle2014-09-241-10/+18
| * | generateTarget() will always find a unique targetBjoern Schiessle2014-09-242-96/+80
| * | unit tests for grouping of shares pointing to the same sourceBjoern Schiessle2014-09-221-1/+1
| * | group shares and combine permissionsBjoern Schiessle2014-09-221-237/+249
* | | Remove dead codeLukas Reschke2014-09-292-18/+0
| |/ |/|
* | Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-m...Lukas Reschke2014-09-261-3/+21
|\ \
| * | catch and log exception in OC_Helper::cleanTmp()Thomas Müller2014-09-261-3/+21
* | | Merge pull request #11285 from owncloud/dav-permissions-createThomas Müller2014-09-262-1/+10
|\ \ \ | |/ / |/| |
| * | Fix dav permissions for folders without create permissionsRobin Appelman2014-09-251-1/+1
| * | Expose creatable permissions trough fileinfoRobin Appelman2014-09-251-0/+9
* | | Merge pull request #11282 from owncloud/scanner-memory-stable7Robin Appelman2014-09-251-7/+12
|\ \ \
| * | | Don't keep the full info of all children in memoryRobin Appelman2014-09-241-7/+12
* | | | Merge pull request #10934 from owncloud/datadir-write-setupVincent Petry2014-09-252-26/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | Check for writable datadir during setupRobin Appelman2014-09-181-3/+13
| * | | Don't complain about non-writable datadirs before we're installedRobin Appelman2014-09-181-17/+19
| * | | Inject config into checkserver and cleanup testsRobin Appelman2014-09-181-8/+10
* | | | Clarify possible preview providers for type OfficeLukas Reschke2014-09-241-2/+6
| |/ / |/| |
* | | Merge pull request #11229 from kofemann/for-upstreamLukas Reschke2014-09-241-9/+8
|\ \ \
| * | | user/backed: use pow of two for backed action constantsTigran Mkrtchyan2014-09-231-9/+8
* | | | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduserLukas Reschke2014-09-234-34/+30
|\ \ \ \
| * | | | fix error message templateMorris Jobke2014-09-171-0/+1
| * | | | Do not show exception to the end-userLukas Reschke2014-09-174-34/+30
* | | | | Merge pull request #7051 from owncloud/postsetupajaxcheckVincent Petry2014-09-231-47/+0
|\ \ \ \ \