summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Dont use the permissions mask while scanningRobin Appelman2017-04-101-0/+4
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* make JobList::next() lock freeJörn Friedrich Dreyer2017-04-071-5/+10
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4242 from nextcloud/encryption-fix-mail-share-stable11Joas Schilling2017-04-061-3/+3
|\ | | | | [stable11] take share by mail into consideration if we calculate the access list
| * take share by mail into consideration if we calculate the access listBjoern Schiessle2017-04-061-3/+3
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #4225 from nextcloud/stable11-token-save-scopeJoas Schilling2017-04-063-25/+70
|\ \ | |/ |/| [Stable11] token save scope
| * Save the scope of an auth token in the sessionRobin Appelman2017-04-053-25/+70
| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Remove verbose error messageLukas Reschke2017-04-051-2/+3
|/ | | | | | There's no need to have this included in the error message. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fix the update from NC 10 and 11 to the latest NC 11Joas Schilling2017-03-301-0/+23
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix return value of getAllowedPreviousVersions()Morris Jobke2017-03-301-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Prevent migration from ownCloud 10 to Nextcloud 11Joas Schilling2017-03-301-20/+16
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #3842 from nextcloud/no-empty-wildcard-search-11Morris Jobke2017-03-141-0/+4
|\ | | | | [11] dont allow empty wildcard search
| * dont allow empty wildcard searchRobin Appelman2017-03-141-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Fix unit tests and improve appstore logicMorris Jobke2017-03-081-5/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Add back appstoreenabled config switchSteffen Lindner2017-03-081-4/+20
| | | | | | | | Signed-off-by: Steffen Lindner <mail@steffen-lindner.de>
* | Add ETag validation to appstore requestsRoeland Jago Douma2017-03-082-6/+40
| | | | | | | | | | | | | | | | | | | | * If the ETag if present store it * If a stored ETag is present then pass it along (with the original response) to get * Add tests * Added files to classmap Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Clear appstore cache on version upgradeRoeland Jago Douma2017-03-084-17/+26
| | | | | | | | | | | | | | | | | | * Add version to cached json * Compare version * Updated calls * Updated tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #3658 from GreenArchon/stable11_issue_#3461Roeland Jago Douma2017-03-021-35/+17
|\ \ | | | | | | [stable11] Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs
| * | Refactor files' CacheEntry object creation to call cacheEntryFromData() all ↵Frédéric Fortier2017-02-241-36/+16
| | | | | | | | | | | | | | | | | | the time thus allowing proper casts to be done Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
| * | Typecast filecache 'storage' as int to return it as documented, fixes #3461Frédéric Fortier2017-02-241-0/+2
| |/ | | | | | | Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
* / Fix string comparison and return docsJoas Schilling2017-03-011-2/+2
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* return unknown free space from nullstorageRobin Appelman2017-02-161-1/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #3440 from nextcloud/backport-oc-26963v11.0.2RC1Lukas Reschke2017-02-131-8/+8
|\ | | | | [stable11] Make sure invalid images don't flood the log file
| * Check if color exists in palette before using itVictor Dubiniuk2017-02-101-3/+3
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Make sure invalid images don't flood the log fileJoas Schilling2017-02-101-5/+5
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3431 from nextcloud/backport-3430-fix-ios-client-detectionLukas Reschke2017-02-101-1/+1
|\ \ | | | | | | [stable11] Fix detection of the new iOS app
| * | Fix detection of the new iOS appJoas Schilling2017-02-101-1/+1
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3426 from nextcloud/stable11-set-vendor-during-installLukas Reschke2017-02-101-0/+15
|\ \ | |/ |/| [stable11] Set vendor during install
| * Set vendor during installMorris Jobke2017-02-091-0/+15
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Don't log the password on confirmPassword when LDAP throws an exceptionJoas Schilling2017-02-091-1/+2
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix testsJoas Schilling2017-02-071-1/+0
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Filter out sensitive appconfig valuesJoas Schilling2017-02-072-9/+48
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldapJoas Schilling2017-01-231-0/+1
|\ | | | | [stable11] Use login name to fix password confirm with ldap users
| * Make sure the loginname is set when logging in via cookieJoas Schilling2017-01-051-0/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Fix testsJoas Schilling2017-01-171-8/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Remove the magic parsing of the descriptionJoas Schilling2017-01-171-24/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Change the row-format before changing the collationJoas Schilling2017-01-131-0/+12
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Better fallback for unknown log typesJoas Schilling2017-01-101-9/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Add testsJoas Schilling2017-01-101-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Handle log_type "nextcloud" more gracefullyJoas Schilling2017-01-102-8/+24
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2980 from ↵v11.0.1RC1Morris Jobke2017-01-102-0/+23
|\ \ | | | | | | | | | | | | nextcloud/backport-2930-kill-group-restriction-when-not-applicable [stable11] Remove group restrictions when those are not allowed anymore
| * | Remove group restrictions when those are not allowed anymoreJoas Schilling2017-01-092-0/+23
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / dont write a certificate bundle if the shipped ca bundle is emptyRobin Appelman2017-01-092-5/+19
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Only log as info when we can not create a new DB userJoas Schilling2016-12-191-1/+1
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #2703 from nextcloud/enoch85-patch-2Roeland Jago Douma2016-12-161-1/+1
|\ | | | | [11] Do not connect to database before creating it
| * Do not connect to database before creating itJoas Schilling2016-12-151-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Safari CSPv3 support is sub-parLukas Reschke2016-12-141-2/+0
|/ | | | | | | | With 10.0.1 CSPv3 is broken in Safari if it doesn't run from a local IP. Awesome. => Let's remove this for Safari and keep chrome and Firefox in the whitelist. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mountsv11.0.0Lukas Reschke2016-12-132-0/+80
|\ | | | | Add a repair step to fix broken mounts
| * Add a repair step to fix broken mountsJoas Schilling2016-12-132-0/+80
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2637 from nextcloud/mount-cache-storageidLukas Reschke2016-12-133-6/+9
|\ \ | |/ |/| also compare storage ids when checking for changed mounts
| * always use numeric storage id in cacheentryRobin Appelman2016-12-133-6/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>