summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
...
* Use the actual password to update the tokensRoeland Jago Douma2019-09-181-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Add uid to delete temp token queryDaniel Kesselberg2019-09-181-1/+2
| | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* set a storage availability delay on auth issues to avoid lock outArthur Schiwon2019-09-092-109/+102
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Return the proper jailed path when requesting the root pathJulius Härtl2019-09-041-1/+1
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #16972 from nextcloud/enh/default_client_timeoutRoeland Jago Douma2019-09-041-0/+1
|\ | | | | Set a default request timeout
| * Set a default request timeoutRoeland Jago Douma2019-09-021-0/+1
| | | | | | | | | | | | | | | | This to avoid endless running processes. A default timeout of 30 seconds should cover the 99% case. If a job need specific longer time it should set that. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fix sanity checks #16963Samuel CHEMLA2019-09-011-5/+3
|/ | | | Signed-off-by: Samuel CHEMLA <chemla.samuel@gmail.com>
* Handle throwables in the http dispatcherJulius Härtl2019-08-291-0/+4
| | | | | | Co-authored-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #16913 from nextcloud/fix/declare_membersRoeland Jago Douma2019-08-292-18/+6
|\ | | | | SessionMiddleware: declare session property
| * SessionMiddleware: declare session propertyRoeland Jago Douma2019-08-282-18/+6
| | | | | | | | | | | | | | * Remove request since we don't useit * Update tests as well Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Make sure they keys are uniqueRoeland Jago Douma2019-08-281-1/+0
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #16723 from nextcloud/fix/sharing/unshare-messageJoas Schilling2019-08-262-2/+9
|\ | | | | Add expiration event for shares
| * Add expiration event for sharesJohn Molakvoæ (skjnldsv)2019-08-212-2/+9
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #16795 from nextcloud/enh/phpstan/limiterJohn Molakvoæ2019-08-262-18/+4
|\ \ | | | | | | Fix report of phpstan in Limiter
| * | Fix report of phpstan in LimiterRoeland Jago Douma2019-08-192-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | * unneeded arguments to constructor * added return types * let automatic DI do its work Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #16845 from nextcloud/bugfix/noid/public-constantsblizzz2019-08-231-0/+29
|\ \ \ | | | | | | | | Make the sharing constants publicly available
| * | | Make the sharing constants publicly availableJoas Schilling2019-08-231-0/+29
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Always check via http and https whether htaccess is workingJoas Schilling2019-08-231-1/+13
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #16820 from nextcloud/bugfix/noid/access-handling-of-projectsRoeland Jago Douma2019-08-213-3/+75
|\ \ \ | | | | | | | | Change access handling of projects
| * | | Add a repair step to clear the projects access cacheJoas Schilling2019-08-213-0/+69
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Change the logic so projects are only shown when you can access all resourcesJoas Schilling2019-08-211-3/+6
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #16813 from ↵blizzz2019-08-211-0/+2
|\ \ \ | | | | | | | | | | | | | | | | compagnon/fix/noid/AutoloadNotAllowedException-theming-off autoloader.php could raise Not AllowedException
| * | | autoloader.php could raise Not AllowedExceptionGuillaume COMPAGNON2019-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when theming is off Signed-off-by: Guillaume Compagnon <gcompagnon@outlook.com> modified: lib/private/TemplateLayout.php
* | | | Only trigger the events with tags that where actually assignedJoas Schilling2019-08-211-1/+7
| |/ / |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #16811 from ↵Roeland Jago Douma2019-08-201-1/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/16771/correctly-remove-apps-without-any-releases Correctly remove apps without any releases
| * | | Correctly remove apps without any releasesJoas Schilling2019-08-201-1/+2
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #16812 from nextcloud/bugfix/noid/previewv1-returntypeRoeland Jago Douma2019-08-201-2/+2
|\ \ \ | | | | | | | | Explicit cast for ProviderV1Adapter
| * | | Explicit cast for ProviderV1AdapterJulius Härtl2019-08-201-2/+2
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* / / Undefined variable response when server is no nextcloud anymoreJoas Schilling2019-08-201-1/+1
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #16793 from nextcloud/bugfix/noid/filter-more-configsJoas Schilling2019-08-201-0/+13
|\ \ | | | | | | Filter more configs
| * | Filter more configsJoas Schilling2019-08-191-0/+13
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / Codechecker: removed unused useRoeland Jago Douma2019-08-191-1/+1
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Make the auto-disabled list more broadJoas Schilling2019-08-153-14/+20
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix tracking of auto disabled apps in UpdaterGeorg Ehrke2019-08-151-1/+10
| | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* Merge pull request #15946 from martink-p/bugxfix/9792/encrypted-external-webdavRoeland Jago Douma2019-08-151-2/+27
|\ | | | | Update Encryption.php
| * Update Encryption.phpmartink-p2019-06-171-7/+9
| | | | | | | | Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
| * Update Encryption.phpmartink-p2019-06-171-1/+7
| | | | | | | | Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
| * Apply suggestions from code reviewmartink-p2019-06-171-5/+5
| | | | | | | | | | Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
| * Update Encryption.phpmartink-p2019-06-171-2/+19
| | | | | | | | Signed-off-by: martink-p <47943787+martink-p@users.noreply.github.com>
* | Merge pull request #16572 from nextcloud/fix/15613/bring-back-psql9-compatRoeland Jago Douma2019-08-142-3/+24
|\ \ | | | | | | instead of upsert query, fallback to default on PSQL <= 9.4
| * | instead of upsert, fallback to default query on PgSQL <= 9.4Arthur Schiwon2019-08-142-3/+24
| | | | | | | | | | | | | | | | | | because there is no upsert yet Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #16725 from nextcloud/bugfix/noid/syslog-diblizzz2019-08-142-2/+3
|\ \ \ | |/ / |/| | Fix loading of the syslog logging class
| * | Make sure SystemConfig class can be injected and syslog_tag is fetched properlyJulius Härtl2019-08-132-2/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Get the proper UIDRoeland Jago Douma2019-08-132-1/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some user backends (like the database backend) allow us to obtain a user case insensitive. However the UID itself is case sensitive. Example: * create a user User1 * login as User1 - This results the data/User1 folder to be created etc * now have some code somewhere that obtains the userFolder (from IRootFolder) but pas in 'uSER1' as uid - The code will check if that is a valid user. And in this case it is since User1 and uSER1 both map to the same user - However the the UID in the user object is used for the folder a new folder fill be create data/uSER1 With this PR this is avoided now. Since we obtain the real UID casing in the backend before creating the user object. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16721 from nextcloud/fix/16644Roeland Jago Douma2019-08-111-4/+4
|\ \ | | | | | | Correctly handle emtpy string in proxyuserpwd config
| * | Correctly handle emtpy string in proxyuserpwd configScott Shambarger2019-08-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As documented, the default value for config value proxyuserpwd is ''. However, that value results in the error: "cURL error 5: Unsupported proxy syntax in '@'". This patch handles the values of '' and null (the default in the code) the same for config values proxyuserpwd and proxy. Signed-off-by: Scott Shambarger <devel@shambarger.net>
* | | Merge pull request #16179 from J0WI/mv-frameoptionsRoeland Jago Douma2019-08-111-5/+5
|\ \ \ | | | | | | | | Add X-Frame-Options header to .htaccess
| * | | Remove duplicated spacesJ0WI2019-08-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com>
| * | | Sort headersJ0WI2019-08-111-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com>
| * | | Add X-Frame-Options header to .htaccessJ0WI2019-08-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com>