aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ /
* / / Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*Joas Schilling2016-02-294-20/+23
|/ /
* | 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
* | | 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
* | 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
* | | | 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-231-5/+16
|\ \ \ \ | | | | | | | | | | Allow defining a limit and offset for getObjectIdsForTags
| * | | | Allow defining a limit and offset for getObjectIdsForTagsJoas Schilling2016-02-231-5/+16
| |/ / /
* | | | Make sure we don't quote column names twiceJoas Schilling2016-02-233-3/+3
| | | |
* | | | Add ILIKE support to querybuilderThomas Müller2016-02-225-0/+79
|/ / /
* | | Merge pull request #22552 from owncloud/fix-avconv-preview-parametersThomas Müller2016-02-221-2/+2
|\ \ \ | | | | | | | | Move `-an` after the input arg because it is an output option
| * | | Move `-an` after the input arg because it is an output optionJoas Schilling2016-02-221-2/+2
| | | |
* | | | We should check for exceptions when trying to get the avatarRoeland Jago Douma2016-02-221-0/+2
|/ / / | | | | | | | | | | | | | | | | | | Fixes #22550 * Updated phpdoc of avatatmanager * Add unit test
* | | Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-191-2/+14
|\ \ \ | | | | | | | | When (re-)sharing an incomming federated share set the corrent owner
| * | | When (re-)sharing an incomming federated share set the corrent ownerRoeland Jago Douma2016-02-191-2/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incomming federated shares are a special kind. We mount them as normal webdav shares but we do supply owner info with the federated cloud id of the share owner. Since we do not yet have the new resharing behaviour on federated shares we need to set the correct owner. Which will allow sharing and proper mounting for other users. fixes #22500
* | | Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrenameThomas Müller2016-02-192-0/+8
|\ \ \ | | | | | | | | Check delete permission before attemping copy+delete
| * | | Check delete permission before attemping copy+deleteVincent Petry2016-02-192-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | Some move operations when cross-storage will be replaced by copy and delete. Before attempting this, first check whether the source storage has delete permissions. This also prevents renaming system-wide external storages.
* | | Merge pull request #22410 from owncloud/fix_22119Thomas Müller2016-02-191-2/+20
|\ \ \ | | | | | | | | Do not copy skeleton on avatar access
| * | | Do not copy skeleton on avatar accessRoeland Jago Douma2016-02-161-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22119 Just try to get the folder of the user. If it is not there a NotFoundException will be thrown. Which will be handled by the avatar endpoint.
* | | | Merge pull request #22521 from owncloud/mssql-is-not-support-since-agesThomas Müller2016-02-191-37/+0
|\ \ \ \ | | | | | | | | | | Remove old adapter - mssql is not supported
| * | | | Remove old adapter - mssql is not supportedJoas Schilling2016-02-191-37/+0
| | | | |
* | | | | Merge pull request #22218 from owncloud/occ-no-extra-messagesThomas Müller2016-02-191-1/+21
|\ \ \ \ \ | |/ / / / |/| | | | Add global --no-warnings option to occ…
| * | | | Add global --no-warning option to occ in order not to pollute output with ↵Victor Dubiniuk2016-02-191-1/+21
| | |/ / | |/| | | | | | | | | | warnings
* | | | Fix even moreRoeland Jago Douma2016-02-191-1/+2
| | | |