summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12868 from nextcloud/backport/12857/stable15Morris Jobke2018-12-061-1/+1
|\ | | | | [stable15] Emit write update only once on touch
| * Emit write update only once on touchRoeland Jago Douma2018-12-051-1/+1
| | | | | | | | | | | | | | | | When a touch is done (i.e. when creating a new file in the node API) The hooks contain 'write' and 'touch' (and the operation is touch as well). This would cause a double write update. Which doesn't make sense. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12867 from nextcloud/backport/12854/stable15Morris Jobke2018-12-062-10/+23
|\ \ | | | | | | [stable15] Log and continue on Dav reader failure (repair uid)
| * | Log and continue on Dav reader failureJohn Molakvoæ (skjnldsv)2018-12-052-10/+23
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #12861 from nextcloud/backport/12855/stable15Morris Jobke2018-12-051-2/+2
|\ \ | |/ |/| [stable15] Only execute query in propagateChange once
| * Only execute query in propagateChange onceRoeland Jago Douma2018-12-051-2/+2
| | | | | | | | | | | | | | The second execute statement should be inside the if block. Else it gets executed twice which makes no sense. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Validate all rich objects not only the used onesJoas Schilling2018-12-051-2/+8
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Do not update child all child shares on group share updateRoeland Jago Douma2018-12-041-0/+1
| | | | | | | Else we overwrite the whole share for link shares. Basically breaking them. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* PHP module is named mbstringMorris Jobke2018-12-041-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #12692 from nextcloud/storage-no-encryption-interface-15Morris Jobke2018-11-291-3/+1
|\ | | | | [15] Add interface to allow storages from opting out of encryption
| * Add interface to allow storages from opting out of encryptionRobin Appelman2018-11-271-3/+1
| | | | | | | | | | | | As opposed to hard-coding a list of excluded storages Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #12736 from nextcloud/backport/12424/stable15Roeland Jago Douma2018-11-292-1/+11
|\ \ | | | | | | [stable15] Add pipe mode for sendmail
| * | Add sendmailmode to guiDaniel Kesselberg2018-11-291-0/+1
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Apply patch from @cwiedmann but drop -oi option for pipeCarsten Wiedmann2018-11-291-1/+10
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Set Referrer-Policy also in addSecurityHeaders()Peter Kraume2018-11-291-0/+1
|/ / | | | | | | | | Fix: #12689 Signed-off-by: Peter Kraume <peter.kraume@gmx.de>
* / Fix folder path containing leading slash when getting mount root by idRobin Appelman2018-11-281-1/+1
|/ | | | | | | | This fixes collabora on public link shared groupfolders Fixes https://github.com/nextcloud/groupfolders/issues/225 Signed-off-by: Robin Appelman <robin@icewind.nl>
* Allow empty strings in getAbsoluteURLJoas Schilling2018-11-201-2/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #12543 from nextcloud/fix/12498/bearer_tokens_are_apptokensMorris Jobke2018-11-201-0/+4
|\ | | | | Bearer tokens are app token
| * Bearer tokens are app tokenRoeland Jago Douma2018-11-201-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes #12498 This means that we set that it is a proper app token once it is validated. This will allow the 2FA middleware to just run the same check. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12494 from nextcloud/cache-notfound-idMorris Jobke2018-11-201-0/+2
|\ \ | | | | | | return the correct value when trying to get a non existing item from cache by id
| * | return the correct value when trying to get a non existing item from cache by idRobin Appelman2018-11-161-0/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #12500 from nextcloud/swift-object-not-foundMorris Jobke2018-11-202-6/+24
|\ \ \ | |_|/ |/| | forward object not found error in swift as dav 404
| * | Add PHPDoc for thrown exceptionMorris Jobke2018-11-191-0/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | forward object not found error in switch as dav 404Robin Appelman2018-11-192-6/+23
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / Fix loading of .woff2 files in .htaccessJulius Härtl2018-11-181-1/+1
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Fix string doc type casingChristoph Wurst2018-11-153-3/+3
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #12455 from nextcloud/twofactor-backup-settingsRoeland Jago Douma2018-11-141-1/+1
|\ | | | | Don't register twofactor_backup settings as "regular" settings
| * Log invalid settings classRobin Appelman2018-11-141-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Throw exception if decryption failsRoeland Jago Douma2018-11-141-4/+10
|/ | | | | | For #11868 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Fix SetVcardDatabaseUID when using postgresqlRobin Appelman2018-11-131-1/+5
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #12418 from ↵Morris Jobke2018-11-121-6/+0
|\ | | | | | | | | nextcloud/bugfix/noid/do-not-show-integrity-warning-always Remove outdated integrity warning on each page
| * Remove outdated integrity warning on each pageMorris Jobke2018-11-121-6/+0
| | | | | | | | | | | | | | * integrity warning is shown during update and in the admin setup checks * there is also the plan to retire this old way of notification Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #12419 from ↵Morris Jobke2018-11-121-4/+10
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/group-creation-replace-insertIfNotExist Fix UniqueConstraintViolationException while insert into oc_groups
| * | Fix UniqueConstraintViolationException while insert into oc_groupsMorris Jobke2018-11-121-4/+10
| |/ | | | | | | | | | | | | * fixes race condition in insert * fixes potentiaol deadlock Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-foundMorris Jobke2018-11-121-2/+2
|\ \ | | | | | | Ignore icons if the file could not be found
| * | Do not fail if the icon file doesn't existsJulius Härtl2018-11-121-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #11942 from nextcloud/techdebt/noid/use-count-functionMorris Jobke2018-11-128-18/+16
|\ \ \ | |/ / |/| | Use the defined func()->count() instead of manual counting
| * | Use the defined func()->count() instead of manual countingJoas Schilling2018-11-088-18/+16
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #12413 from ↵Morris Jobke2018-11-121-1/+12
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/9305/oc_file_locks-unique-constraint Fix UniqueConstraintViolationException while insert into oc_file_locks
| * | | Fix UniqueConstraintViolationException while insert into oc_file_locksMorris Jobke2018-11-121-1/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * fixes #9305 by not being prone to the race condition in insertIfNotExists * fixes #6899 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block * followup to #12371 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / | Fix UniqueConstraintViolationException while insert into oc_filecacheMorris Jobke2018-11-121-7/+18
|/ / | | | | | | | | | | | | | | * fixes #6160 by not being prone to the race condition in insertIfNotExists * fixes #12228 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #12371 from ↵Morris Jobke2018-11-123-5/+34
|\ \ | | | | | | | | | | | | nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist Catch UniqueConstraintViolationException inside insertIfNotExist
| * | Add deprecation message ofr insertIfNotExistMorris Jobke2018-11-093-0/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Catch UniqueConstraintViolationException inside insertIfNotExistMorris Jobke2018-11-093-5/+31
| |/ | | | | | | | | | | | | | | This is the most common case for the usage of this method. See also https://github.com/nextcloud/server/issues/12369 and the linked tickets. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / Make sure to always load the latest icons-vars.css fileJulius Härtl2018-11-121-3/+15
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #12313 from nextcloud/generated-avatar-major-cleanupRoeland Jago Douma2018-11-086-24/+120
|\ | | | | Clear avatar cache with frontend repair
| * Clear avatar cache with frontend repairJohn Molakvoæ (skjnldsv)2018-11-086-24/+120
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Match mentions when the username is wrapped in quotesJoas Schilling2018-11-071-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #12284 from nextcloud/fix/1020/search_shared_externalMorris Jobke2018-11-061-1/+1
|\ \ | |/ |/| Properly search the root of a shared external storage
| * Properly search the root of a shared external storageRoeland Jago Douma2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixes #1020 When an external storage is shared with you in full the root is '' (empty). This adds an extra check for an empty jail basically. Because if the jail is on the empty string. It matches all paths. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>