summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removalThomas Müller2016-03-241-0/+4
|\
| * Lock the mountpoint while removingJoas Schilling2016-03-241-0/+4
* | Merge pull request #23154 from owncloud/avatar-save-failureThomas Müller2016-03-243-6/+24
|\ \
| * | dont die when we cant save the resized avatar, log insteadRobin Appelman2016-03-113-6/+24
* | | add missing varJörn Friedrich Dreyer2016-03-241-0/+4
* | | Merge pull request #23542 from owncloud/catch-empty-app-path-oh-we-really-sho...Thomas Müller2016-03-241-3/+6
|\ \ \ | |_|/ |/| |
| * | getAppPath can return falseLukas Reschke2016-03-241-3/+6
* | | Check if request is sent from official ownCloud clientLukas Reschke2016-03-241-0/+3
|/ /
* | Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translationsThomas Müller2016-03-231-6/+4
|\ \
| * | Fix the translations of the User menuJoas Schilling2016-03-231-6/+4
* | | Merge pull request #22506 from owncloud/node-get-from-cacheThomas Müller2016-03-232-26/+23
|\ \ \
| * | | properly use fileinfo objectsRobin Appelman2016-03-211-16/+12
| * | | improve reuse in getUserFolderRobin Appelman2016-03-211-6/+6
| * | | pass the fileinfo to the node if availableRobin Appelman2016-03-211-2/+2
| * | | Query the cache when checking if a node existsRobin Appelman2016-03-211-2/+3
* | | | Merge pull request #23142 from owncloud/request_propertiesThomas Müller2016-03-231-1/+8
|\ \ \ \
| * | | | Fix warning in request.phpRoeland Jago Douma2016-03-231-1/+8
* | | | | Merge pull request #22895 from owncloud/cleanup_default_share_providerThomas Müller2016-03-231-48/+3
|\ \ \ \ \
| * | | | | Remove dead functionRoeland Jago Douma2016-03-231-24/+0
| * | | | | Remove support for old shares in the default share providerRoeland Jago Douma2016-03-231-24/+3
| |/ / / /
* | | | | Merge pull request #23362 from owncloud/fix-l10n-for-themesThomas Müller2016-03-232-15/+39
|\ \ \ \ \
| * | | | | Inject server root - allows proper testing and separation of concernsMorris Jobke2016-03-182-10/+17
| * | | | | Read available l10n files also from theme folderMorris Jobke2016-03-171-7/+24
* | | | | | Merge pull request #23463 from owncloud/lets-consistently-use-no-refererThomas Müller2016-03-232-5/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Consistently use rel=noreferrerLukas Reschke2016-03-202-5/+5
| |/ / / /
* | | | | Merge pull request #23474 from owncloud/RealRancor-exclude_lost_and_foundThomas Müller2016-03-231-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'exclude_lost_and_found' of https://github.com/RealRancor/core i...Lukas Reschke2016-03-221-1/+2
| |\ \ \ \
| | * | | | Exclude lost+found dir in integrity checkRealRancor2016-03-191-1/+2
| | |/ / /
* | | | | Merge pull request #23398 from owncloud/block_group_sharingThomas Müller2016-03-221-0/+12
|\ \ \ \ \
| * | | | | Block group sharing in API and in share managerRoeland Jago Douma2016-03-221-0/+5
| * | | | | Add config to sharemanagerRoeland Jago Douma2016-03-221-0/+7
* | | | | | Only use the user session if ownCloud is already installedLukas Reschke2016-03-221-1/+5
|/ / / / /
* | | | | Merge pull request #23437 from owncloud/save-query-when-the-list-is-emptyThomas Müller2016-03-221-0/+2
|\ \ \ \ \
| * | | | | Save the query when we get tags for no objectsJoas Schilling2016-03-221-0/+2
| |/ / / /
* | | | | Merge pull request #23461 from owncloud/activity-491-autoloading-issue-withou...Thomas Müller2016-03-221-2/+2
|\ \ \ \ \
| * | | | | Fix "AutoloadNotAllowedException" when files_sharing is disabledJoas Schilling2016-03-221-2/+2
* | | | | | Merge pull request #23411 from owncloud/new_sharing_to_composerThomas Müller2016-03-227-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move (new) sharing over to composer autoloaderRoeland Jago Douma2016-03-207-0/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #23448 from owncloud/issue-22993-soften-exception-on-enabl...Thomas Müller2016-03-222-3/+23
|\ \ \ \ \
| * | | | | Do not abort with an exception when a default app can not be enabledJoas Schilling2016-03-212-3/+23
| | |_|/ / | |/| | |
* | | | | Merge pull request #23443 from owncloud/some-more-logging-informationThomas Müller2016-03-221-8/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Log more information by defaultLukas Reschke2016-03-211-8/+15
| |/ / /
* | | | Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issueThomas Müller2016-03-211-1/+1
|\ \ \ \
| * | | | Fix doc issue of cache wrapperJoas Schilling2016-03-211-1/+1
| |/ / /
* / / / Do not fire pre/post hooks twice on chunk uploadVincent Petry2016-03-211-43/+5
|/ / /
* | | Merge pull request #23349 from owncloud/hardeningsThomas Müller2016-03-212-29/+4
|\ \ \
| * | | Remove unused codeLukas Reschke2016-03-171-29/+0
| * | | Escape App IDLukas Reschke2016-03-171-0/+4
| |/ /
* / / Write .htaccess update only if not already writtenLukas Reschke2016-03-171-20/+20
|/ /
* | Update oci.phpManish Bisht2016-03-162-6/+8