summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-056-12/+24
* Merge branch 'master' into fix-db-locking-cleanupC. Montero Luque2016-03-041-5/+12
|\
| * Merge pull request #22816 from owncloud/external-unavailable-recheckThomas Müller2016-03-041-5/+12
| |\
| | * allow availability recheck for external storagesRobin Appelman2016-03-031-5/+12
* | | Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-041-15/+11
|/ /
* | ucwords does not support delimiter on 5.4Joas Schilling2016-03-041-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-044-2/+30
* | Merge pull request #22796 from owncloud/fix-encryption-on-version-restoreThomas Müller2016-03-031-9/+28
|\ \
| * | Keep "encryptedVersion" when calling `\OC\Files\View::copy`Lukas Reschke2016-03-031-9/+28
| |/
* / Exclude the assets folder from integrity checkLukas Reschke2016-03-031-2/+3
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-032-0/+6
* 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
* | | | Fix since versionJoas Schilling2016-02-291-1/+1
|/ / /
* | | Merge pull request #22683 from owncloud/fix_22682Thomas Müller2016-02-291-1/+1
|\ \ \
| * | | Relax rootfolder checkRoeland Jago Douma2016-02-261-1/+1
* | | | Merge pull request #22673 from owncloud/fix_enforced_expire_date_settingThomas Müller2016-02-291-1/+2
|\ \ \ \
| * | | | Expiration date can only be enforced if default is enabledRoeland Jago Douma2016-02-261-1/+2
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2016-02-286-2/+10
|/ / /
* | | Merge pull request #22660 from owncloud/fix_22656Thomas Müller2016-02-261-0/+5
|\ \ \
| * | | Do not allow sharing of the root folderRoeland Jago Douma2016-02-251-0/+5
* | | | Merge pull request #22646 from owncloud/fix_22642Thomas Müller2016-02-261-16/+16
|\ \ \ \
| * | | | Set default expiration date if none given on share creationRoeland Jago Douma2016-02-251-16/+16
| | |_|/ | |/| |
* | | | Merge pull request #22650 from owncloud/fix_hookThomas Müller2016-02-261-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix verifyExpirationDate passwordSet argumentRoeland Jago Douma2016-02-251-1/+1
| |/ /
* | | Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508Thomas Müller2016-02-252-4/+4
|\ \ \ | |_|/ |/| |
| * | Fix PHPDoc of OC_App::loadApps()Thomas Müller2016-02-231-1/+1
| * | Install new shipped apps after upgrading all existing appsThomas Müller2016-02-231-4/+4
| * | Before installing new shipped apps we need to load authentication apps - fixe...Thomas Müller2016-02-231-1/+1
* | | Merge pull request #21854 from owncloud/fix-share-hook-group-addThomas Müller2016-02-251-0/+17
|\ \ \
| * | | Fix addUserToGroup hook of the share codeMorris Jobke2016-01-221-0/+17
* | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-251-1/+5
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 01:54:10 +0000