summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16723 from nextcloud/fix/sharing/unshare-messageJoas Schilling2019-08-265-3/+38
|\ | | | | Add expiration event for shares
| * Add expiration event for sharesJohn Molakvoæ (skjnldsv)2019-08-215-3/+38
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #16795 from nextcloud/enh/phpstan/limiterJohn Molakvoæ2019-08-263-26/+4
|\ \ | | | | | | Fix report of phpstan in Limiter
| * | Fix report of phpstan in LimiterRoeland Jago Douma2019-08-193-26/+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 #16854 from ↵Roeland Jago Douma2019-08-2618-23/+29
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/sass-loader-7.3.1 Bump sass-loader from 7.2.0 to 7.3.1
| * | | Bump sass-loader from 7.2.0 to 7.3.1dependabot-preview[bot]2019-08-2518-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.2.0 to 7.3.1. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.2.0...v7.3.1) 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-2610-2/+54
| | | |
* | | | Merge pull request #16856 from ↵Roeland Jago Douma2019-08-252-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-cli-3.3.7 Bump webpack-cli from 3.3.6 to 3.3.7
| * | | | Bump webpack-cli from 3.3.6 to 3.3.7dependabot-preview[bot]2019-08-252-7/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.6 to 3.3.7. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.7/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* / / / [tx-robot] updated from transifexNextcloud bot2019-08-2510-0/+10
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-08-2450-50/+50
| | |
* | | Merge pull request #16845 from nextcloud/bugfix/noid/public-constantsblizzz2019-08-232-0/+86
|\ \ \ | | | | | | | | Make the sharing constants publicly available
| * | | Make the sharing constants publicly availableJoas Schilling2019-08-232-0/+86
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #16847 from nextcloud/bugfix/empty-itunes-idRoeland Jago Douma2019-08-233-0/+6
|\ \ \ \ | | | | | | | | | | Only add the app-itunes-app tag if the id is set
| * | | | Only add the app-itunes-app tag if the id is setJulius Härtl2019-08-233-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #16846 from ↵Roeland Jago Douma2019-08-231-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/check-https-and-http-content Always check via http and https whether htaccess is working
| * | | | | 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 #16840 from kotp/adviced_vs_advisedRoeland Jago Douma2019-08-232-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | adviced should be advised
| * | | | adviced should be advisedVictor Goff2019-08-232-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Victor Goff <keeperotphones@gmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-08-232-0/+6
|/ / / /
* | | | Merge pull request #16829 from nextcloud/bugfix/noid/projects-pick-foldersRoeland Jago Douma2019-08-2212-16/+20
|\ \ \ \ | | | | | | | | | | Let users pick folders on projects
| * | | | Properly handle failures and allow choosing folders for projectsJulius Härtl2019-08-2111-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | filepicker: Add option to also choose folders without a mimetype limitJulius Härtl2019-08-211-4/+8
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | 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>