summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #23507 from owncloud/fix-23496-masterThomas Müller2016-03-231-2/+4
|\ \
| * | fixes #23496Thomas Müller2016-03-231-2/+4
* | | Merge pull request #23509 from owncloud/bump_polyfillThomas Müller2016-03-231-0/+0
|\ \ \
| * | | [3rdparty] Bump symfony/polyfill packagesRoeland Jago Douma2016-03-231-0/+0
|/ / /
* | | Merge pull request #22506 from owncloud/node-get-from-cacheThomas Müller2016-03-236-66/+131
|\ \ \
| * | | properly use fileinfo objectsRobin Appelman2016-03-212-34/+75
| * | | set watch policy in testRobin Appelman2016-03-212-9/+39
| * | | improve reuse in getUserFolderRobin Appelman2016-03-211-6/+6
| * | | pass the fileinfo to the node if availableRobin Appelman2016-03-213-17/+10
| * | | Query the cache when checking if a node existsRobin Appelman2016-03-211-2/+3
* | | | Merge pull request #23434 from owncloud/symfony-event-dispatcherThomas Müller2016-03-231-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump symfony/event-dispatcherRoeland Jago Douma2016-03-231-0/+0
* | | | | Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2Thomas Müller2016-03-233-14/+29
|\ \ \ \ \
| * | | | | Fix display of vcard and calendar object details page in browser pluginThomas Müller2016-03-233-14/+29
* | | | | | 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-232-147/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove dead functionRoeland Jago Douma2016-03-231-24/+0
| * | | | | | Remove support for old shares in the default share providerRoeland Jago Douma2016-03-232-123/+16
| |/ / / / /
* | | | | | Merge pull request #23362 from owncloud/fix-l10n-for-themesThomas Müller2016-03-236-19/+67
|\ \ \ \ \ \
| * | | | | | Inject server root - allows proper testing and separation of concernsMorris Jobke2016-03-185-24/+30
| * | | | | | Read available l10n files also from theme folderMorris Jobke2016-03-173-7/+49
* | | | | | | Merge pull request #23463 from owncloud/lets-consistently-use-no-refererThomas Müller2016-03-2314-55/+55
|\ \ \ \ \ \ \
| * | | | | | | Consistently use rel=noreferrerLukas Reschke2016-03-2014-55/+55
* | | | | | | | Merge pull request #23495 from owncloud/disable-paste-zoneThomas Müller2016-03-233-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Disable pastezone for jquery.fileuploadLukas Reschke2016-03-223-0/+3
* | | | | | | | 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
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2394-172/+34
* | | | | | | | Merge pull request #23485 from owncloud/composer_allow_ocpThomas Müller2016-03-223-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Move IServerContainter to PSR-4Roeland Jago Douma2016-03-221-0/+0
| * | | | | | | | Allos OCP classes to be PSR-4 as wellRoeland Jago Douma2016-03-222-1/+5
* | | | | | | | | Merge pull request #23398 from owncloud/block_group_sharingThomas Müller2016-03-2216-42/+218
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix js strings if group sharing is disabledRoeland Jago Douma2016-03-223-6/+20
| * | | | | | | | | Add intergration testsRoeland Jago Douma2016-03-222-0/+17
| * | | | | | | | | Respect disabled group sharing in sharee endpointRoeland Jago Douma2016-03-223-35/+69
| * | | | | | | | | Block group sharing in API and in share managerRoeland Jago Douma2016-03-224-1/+88
| * | | | | | | | | Add config to sharemanagerRoeland Jago Douma2016-03-222-0/+14
| * | | | | | | | | Add `allow sharing with groups` checkbox to admin pageRoeland Jago Douma2016-03-223-0/+10
* | | | | | | | | | Merge pull request #22679 from owncloud/fix_22668Thomas Müller2016-03-222-1/+91
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | When the Share API is disabled do not return sharesRoeland Jago Douma2016-03-222-1/+91
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23488 from owncloud/only-use-usersession-if-installedThomas Müller2016-03-221-1/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Only use the user session if ownCloud is already installedLukas Reschke2016-03-221-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23484 from owncloud/if-class-is-already-loaded-dont-load-...Thomas Müller2016-03-221-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Dont double load classLukas Reschke2016-03-221-0/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #23437 from owncloud/save-query-when-the-list-is-emptyThomas Müller2016-03-222-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Save the query when we get tags for no objectsJoas Schilling2016-03-222-1/+12
| |/ / / / / /