summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #23240 from owncloud/backport-23222Thomas Müller2016-03-151-3/+5
|\ \ \ \ \ \ \
| * | | | | | | backport of #23222 (#23225)Phiber20002016-03-141-3/+5
| | |_|_|_|/ / | |/| | | | |
* / | | | | | Generate a valid URL for link notificationRoeland Jago Douma2016-03-151-2/+11
|/ / / / / /
* | | | | | Merge pull request #22943 from owncloud/backport-22800-stable9Thomas Müller2016-03-141-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-081-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #23065 from owncloud/stable9-add-rewrite-rules-after-setupThomas Müller2016-03-141-2/+3
|\ \ \ \ \
| * | | | | Improved rewrite ruleLukas Reschke2016-03-101-1/+1
| * | | | | Add base rewrite rule only when RewriteBase is definedLukas Reschke2016-03-091-2/+3
| | |_|_|/ | |/| | |
* | | | | Shorter cache key for URL entriesJoas Schilling2016-03-141-1/+1
| |_|/ / |/| | |
* | | | Explicitly check for portLukas Reschke2016-03-111-0/+6
* | | | Merge pull request #22912 from owncloud/stable9-diskfreespace-filesworkaroundThomas Müller2016-03-101-1/+9
|\ \ \ \
| * | | | Fix call to disk_free_space when a file is providedVincent Petry2016-03-091-1/+9
| |/ / /
* | | | Merge pull request #23071 from owncloud/backport-23032-no-response-on-cliThomas Müller2016-03-101-1/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Do not set response status in CLI in case of errorVincent Petry2016-03-101-1/+3
* | | | Merge pull request #23016 from owncloud/stable9_backport_23008Thomas Müller2016-03-101-10/+51
|\ \ \ \ | |/ / / |/| | |
| * | | Select queries in the default share provider should query for file/folderRoeland Jago Douma2016-03-091-10/+51
| |/ /
* / / Add XMLReader as requirementLukas Reschke2016-03-091-1/+2
|/ /
* | Merge pull request #22908 from owncloud/backport-22904-group-manager-wrong-re...Thomas Müller2016-03-091-1/+1
|\ \
| * | Make sure that the return value is an arrayJoas Schilling2016-03-071-1/+1
| |/
* | Merge pull request #22919 from owncloud/backport-double-url-encodingThomas Müller2016-03-091-4/+0
|\ \
| * | Remove double URL encodingLukas Reschke2016-03-071-4/+0
| |/
* / Fix share mounting recursionVincent Petry2016-03-082-3/+8
|/
* Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-041-15/+11
* Merge pull request #22832 from owncloud/external-unavailable-recheck9Thomas Müller2016-03-041-5/+12
|\
| * allow availability recheck for external storagesRobin Appelman2016-03-031-5/+12
* | ucwords does not support delimiter on 5.4Joas Schilling2016-03-041-1/+1
* | Merge pull request #22822 from owncloud/stable9-exclude-assetsThomas Müller2016-03-041-2/+3
|\ \
| * | Exclude the assets folder from integrity checkLukas Reschke2016-03-031-2/+3
* | | Revert "No longer evaluate appinfo/version"Vincent Petry2016-03-034-6/+19
| |/ |/|
* | Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-031-9/+28
|/
* Merge pull request #22757 from owncloud/apply-licenseC. Montero Luque2016-03-01121-93/+140
|\
| * Remove Scrutinizer Auto FixerLukas Reschke2016-03-0148-48/+0
| * Map MaciLukas Reschke2016-03-012-1/+2
| * Update author informationLukas Reschke2016-03-01119-65/+159
* | Exclude custom data directory from integrity checkerLukas Reschke2016-03-011-2/+8
|/
* Merge pull request #22681 from owncloud/add-autodiscovery-for-ocsThomas Müller2016-03-013-12/+23
|\
| * Add autodiscovery support to server-to-server sharingLukas Reschke2016-02-263-12/+23
* | Merge pull request #17451 from owncloud/apps-disablebrokenappafterenableThomas Müller2016-03-011-2/+18
|\ \
| * | Disable app that bricks the server after enablingVincent Petry2016-02-291-2/+18
* | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotasetThomas Müller2016-03-011-4/+7
|\ \ \
| * | | Return -3 for unlimited quotaVincent Petry2016-02-291-4/+7
* | | | Merge pull request #22677 from owncloud/allow-to-overwrite-single-l10n-string...Thomas Müller2016-03-011-2/+19
|\ \ \ \
| * | | | Allow to overwrite a single language string via the theme folderJoas Schilling2016-02-261-2/+19
| | |_|/ | |/| |
* | | | Merge pull request #22733 from owncloud/size-propagation-new-fileThomas Müller2016-03-011-1/+5
|\ \ \ \
| * | | | fix size propagation for new filesRobin Appelman2016-02-291-1/+5
| | |/ / | |/| |
* | | | Merge pull request #22736 from owncloud/propagation-ignore-encryptionThomas Müller2016-03-012-0/+68
|\ \ \ \
| * | | | ignore encryption keys for propagationRobin Appelman2016-02-292-0/+68
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-012-2/+2
* | | | Merge pull request #22707 from owncloud/use-our-public-apiThomas Müller2016-03-017-28/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*Joas Schilling2016-02-297-28/+32