summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* set a storage availability delay on auth issues to avoid lock outArthur Schiwon2019-08-224-114/+126
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* catch auth issues also when php-smbclient is in useArthur Schiwon2019-08-221-0/+8
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #16785 from nextcloud/version/17.0.0/beta2v17.0.0beta2Roeland Jago Douma2019-08-221-2/+2
|\ | | | | 17.0.0 beta 2
| * 17.0.0 beta 2Roeland Jago Douma2019-08-211-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-08-2236-18/+178
|/
* Merge pull request #16798 from jmattt/gridview-fixRoeland Jago Douma2019-08-211-0/+5
|\ | | | | Fix scrolling after switching to grid view
| * Fix grid viewJonathan Matthews2019-08-191-0/+5
| | | | | | Signed-off-by: Jonathan Matthews <jgit@pixelnet.work>
* | Merge pull request #16820 from nextcloud/bugfix/noid/access-handling-of-projectsRoeland Jago Douma2019-08-216-4/+78
|\ \ | | | | | | Change access handling of projects
| * | Add a repair step to clear the projects access cacheJoas Schilling2019-08-216-1/+72
| | | | | | | | | | | | 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
* | | | Merge pull request #16822 from ↵blizzz2019-08-211-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/fat-75/database-error-on-occ-scan-with-autotaggging Only trigger the events with tags that where actually assigned
| * | | | 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 #16782 from nextcloud/fix/16729/stop-if-encrypted-token-nullblizzz2019-08-212-2/+22
|\ \ \ \ | |/ / / |/| | | Stop if there is no encrypted token
| * | | Add test case for existing user with token nullDaniel Kesselberg2019-08-181-0/+16
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Return the disabled user mock instead of the existingDaniel Kesselberg2019-08-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Stop if there is no encrypted tokenDaniel Kesselberg2019-08-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix Argument 1 passed to OC\Security\Crypto::decrypt() must be of the type string, null given Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | 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>
* | | | Merge pull request #16808 from ↵Roeland Jago Douma2019-08-201-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/bugfix/16626/undefined-response-if-server-is-no-nextcloud-anymore Undefined variable response when server is no nextcloud anymore
| * | | 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>
* | | | [tx-robot] updated from transifexNextcloud bot2019-08-2024-124/+218
| | | |
* | | | Merge pull request #16796 from nextcloud/enh/phpstan/codecheckerRoeland Jago Douma2019-08-191-1/+1
|\ \ \ \ | |_|_|/ |/| | | Codechecker: removed unused use
| * | | Codechecker: removed unused useRoeland Jago Douma2019-08-191-1/+1
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #16788 from nextcloud/enh/no_response_constructorRoeland Jago Douma2019-08-191-10/+8
|\ \ \ | | | | | | | | Do not enforce the parent constructor of response to be called
| * | | Do not enforce the parent constructor of response to be calledRoeland Jago Douma2019-08-191-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no policy set we just take the default empty ones. That way no obscure errors get thrown if the constructor is not called. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16775 from nextcloud/fix/5548Roeland Jago Douma2019-08-191-2/+3
|\ \ \ \ | |_|/ / |/| | | Make the warning about wrong permissions more clear.
| * | | Make the warning about wrong permissions more clear.Daniel Kesselberg2019-08-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | It's basically the same as for console.php now. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #16781 from nextcloud/bug/fix-password-resetRoeland Jago Douma2019-08-194-3/+4
|\ \ \ \ | |_|/ / |/| | | Send new password instead of empty string
| * | | Update bundlesJulius Härtl2019-08-192-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Force proper action for login formJulius Härtl2019-08-191-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Send new password instead of empty stringDaniel Kesselberg2019-08-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #16779 from ↵Roeland Jago Douma2019-08-194-8/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-2.1.1 Bump css-vars-ponyfill from 2.0.2 to 2.1.1
| * | | Bump css-vars-ponyfill from 2.0.2 to 2.1.1dependabot-preview[bot]2019-08-184-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 2.0.2 to 2.1.1. - [Release notes](https://github.com/jhildenbiddle/css-vars-ponyfill/releases) - [Changelog](https://github.com/jhildenbiddle/css-vars-ponyfill/blob/master/CHANGELOG.md) - [Commits](https://github.com/jhildenbiddle/css-vars-ponyfill/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #16766 from nextcloud/fix/frame-src/no-nonceRoeland Jago Douma2019-08-191-3/+0
|\ \ \ \ | | | | | | | | | | frame-src doesn't respect the nonce attribute
| * | | | frame-src doesn't respect the nonce attributeRoeland Jago Douma2019-08-161-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #16784 from nextcloud/bugfix/noid/fix_foreach_valarm_errorRoeland Jago Douma2019-08-192-0/+40
|\ \ \ \ \ | | | | | | | | | | | | fix foreach error for reminder generator
| * | | | | fix foreach error for reminder generatorGeorg Ehrke2019-08-182-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-08-1922-6/+214
|/ / / / /
* | | | | Merge pull request #16756 from ↵Roeland Jago Douma2019-08-181-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/allow-context-subclasses-in-acceptance-tests-to-access-parent-actor Allow Context subclasses in acceptance tests to access parent actor
| * | | | Allow Context subclasses in acceptance tests to access parent actorDaniel Calviño Sánchez2019-08-161-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although uncommon, in some cases a Context may need to be extended (for example, to override a step defined in the server with a specific behaviour in the acceptance tests of an app); in those cases the subclass should be able to access the actor attribute defined in the Context it is extending. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #16778 from nextcloud/dependabot/npm_and_yarn/webpack-4.39.2Roeland Jago Douma2019-08-1841-74/+74
|\ \ \ \ | |_|_|/ |/| | | Bump webpack from 4.39.1 to 4.39.2
| * | | Bump webpack from 4.39.1 to 4.39.2dependabot-preview[bot]2019-08-1841-74/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.39.1 to 4.39.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.39.1...v4.39.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-08-1844-96/+776
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2019-08-1754-20/+300
|/ /