summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Exclude custom data directory from integrity checkerLukas Reschke2016-03-011-2/+8
| | | | | | | | | | | | We should not scan any custom data directory in the integrity checker as well. Otherwise this would lead to a massive increased update time that may likely exceed the timeout. To test this: 1. Install ownCloud 8.2.2, set as data dir another folder than `data` such as `data-asdf`. Make sure that folder lives in the web root as well. 2. Update that instance to 9.0.0 beta2 => Errors are shown in the code integrity check 3. Apply this patch and trigger the rescan in the admin settings => No errors are shown anymore (can also do a new update with that patch applied) Fixes https://github.com/owncloud/core/issues/22698
* Merge pull request #22681 from owncloud/add-autodiscovery-for-ocsThomas Müller2016-03-013-12/+23
|\ | | | | Add autodiscovery support to server-to-server sharing implementation
| * Add autodiscovery support to server-to-server sharingLukas Reschke2016-02-263-12/+23
| | | | | | | | Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
* | Merge pull request #17451 from owncloud/apps-disablebrokenappafterenableThomas Müller2016-03-011-2/+18
|\ \ | | | | | | Disable app that bricks the server after enabling
| * | Disable app that bricks the server after enablingVincent Petry2016-02-291-2/+18
| | | | | | | | | | | | | | | | | | If an app is getting enabled in the web UI, an ajax call is now made to make sure the server still works. If it doesn't, it sends an emergency app disabling call to disable the breaking app.
* | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotasetThomas Müller2016-03-011-4/+7
|\ \ \ | | | | | | | | Don't return quota when none set
| * | | Return -3 for unlimited quotaVincent Petry2016-02-291-4/+7
| | | | | | | | | | | | | | | | | | | | Returns -3 for unlimited quota in Webdav response. Also adjusted personal page to show unlimited quota when set.
* | | | Merge pull request #22677 from ↵Thomas Müller2016-03-011-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/allow-to-overwrite-single-l10n-string-via-theme Allow to overwrite a single language string via the theme folder
| * | | | 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 files
| * | | | 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 propagation
| * | | | 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_*
| * | | 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 check
| * | | Relax rootfolder checkRoeland Jago Douma2016-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | * Updated unit tests * Added intergration test
* | | | 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 enabled
| * | | | Expiration date can only be enforced if default is enabledRoeland Jago Douma2016-02-261-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | If the default expiration date is not enebaled it can not be enforced. * Added unit tests
* / / / [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 users root folder
| * | | Do not allow sharing of the root folderRoeland Jago Douma2016-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing of the users root folder should not be allowed as it is very weird UX. Also many of our clients have no proper way of displaying this. Added unit test Also added intergration tests to make sure we won't allow it in the future.
* | | | Merge pull request #22646 from owncloud/fix_22642Thomas Müller2016-02-261-16/+16
|\ \ \ \ | | | | | | | | | | Set default expiration date if none given on share creation
| * | | | Set default expiration date if none given on share creationRoeland Jago Douma2016-02-251-16/+16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | When we create a share for the first time we should set the default expiration date. If none is given. Fixes #22642
* | | | Merge pull request #22650 from owncloud/fix_hookThomas Müller2016-02-261-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix verifyExpirationDate passwordSet argument
| * | | Fix verifyExpirationDate passwordSet argumentRoeland Jago Douma2016-02-251-1/+1
| |/ / | | | | | | | | | | | | | | | Password set should be false if the password is null. Also updated the unit tests to tests this now.
* | | Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508Thomas Müller2016-02-252-4/+4
|\ \ \ | |_|/ |/| | Before installing new shipped apps we need to load authentication apps
| * | 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 - ↵Thomas Müller2016-02-231-1/+1
| | | | | | | | | | | | fixes #22508
* | | Merge pull request #21854 from owncloud/fix-share-hook-group-addThomas Müller2016-02-251-0/+17
|\ \ \ | | | | | | | | Fix addUserToGroup hook of the share code
| * | | Fix addUserToGroup hook of the share codeMorris Jobke2016-01-221-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | * sets up the filesystem of the user that is added to a group to properly accept shares * fixes #18499
* | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-251-1/+5
|\ \ \ \ | | | | | | | | | | Fix HTTPS support on external storages
| * | | | Add proxy support to external storageLukas Reschke2016-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | Otherwise debugging issues is a PITA
* | | | | Merge pull request #22579 from owncloud/fix_broken_unencrypted_sizeThomas Müller2016-02-251-3/+129
|\ \ \ \ \ | |_|_|_|/ |/| | | | Heal unencrypted file sizes at download time (second approach)
| * | | | recalculate unencrypted size if we assume that the size stored in the db is ↵Bjoern Schiessle2016-02-231-3/+129
| | | | | | | | | | | | | | | | | | | | not correct
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2524-6/+194
| |/ / / |/| | |
* | | | Merge pull request #22573 from owncloud/issue-22568-allow-string-object-idsThomas Müller2016-02-241-2/+2
|\ \ \ \ | | | | | | | | | | Make sure we can store strings as per the interface
| * | | | Make sure we can store strings as per the interfaceJoas Schilling2016-02-221-2/+2
| | | | |
* | | | | Merge pull request #22565 from owncloud/avoid-scanning-root-storageThomas Müller2016-02-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Avoids scanning the root storage
| * | | | | Avoids scanning the root storageMorris Jobke2016-02-221-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check will skip the background scan for the root storage because there is nothing in the root storage that isn't already in another (mostly user-) storage. Fixes #22501
* | | | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entriesThomas Müller2016-02-232-6/+21
|\ \ \ \ \ | | | | | | | | | | | | Allow defining a limit and offset for getObjectIdsForTags
| * | | | | Allow defining a limit and offset for getObjectIdsForTagsJoas Schilling2016-02-232-6/+21
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-236-0/+92
|\ \ \ \ \ | |/ / / / |/| | | | Case insensitive contact search
| * | | | Make sure we don't quote column names twiceJoas Schilling2016-02-233-3/+3
| | | | |
| * | | | Add ILIKE support to querybuilderThomas Müller2016-02-226-0/+92
| |/ / /
* | | | Merge pull request #22581 from owncloud/fix_interfaceThomas Müller2016-02-221-3/+15
|\ \ \ \ | |/ / / |/| | | since 9.0 we have a additional parameter $position used for integrity…
| * | | since 9.0 we have a additional parameter $position used for integrity checksBjoern Schiessle2016-02-221-3/+15
| |/ /