summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #18696 from nextcloud/fix/18380/auto_accept_on_mail_openRoeland Jago Douma2020-01-065-2/+92
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Accept shares when you open mail
| * | | | | Accept shares when you open mailRoeland Jago Douma2020-01-065-2/+92
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18380 When you open a direct share to yourself. We should autoaccept the share. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | fix overlapping (#18473)John Molakvoæ2020-01-061-3/+2
|\ \ \ \ \ | | | | | | | | | | | | fix overlapping
| * | | | | fix overlappingGretaD2019-12-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com>
* | | | | | Merge pull request #18672 from ↵Roeland Jago Douma2020-01-063-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/17799/if_disabled_dont_show_link_shares Don't show link shares in sidebar if disabled
| * | | | | | Don't show link shares in sidebar if disabledRoeland Jago Douma2020-01-063-3/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17799 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #18675 from ↵Roeland Jago Douma2020-01-064-67/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/17774/no_email_suggestions_when_linkshare_disabled Do not show e-mail suggestions if link shares are disabled
| * | | | | | Do not show e-mail suggestions if link shares are disabledRoeland Jago Douma2020-01-064-67/+83
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #17774 This removes the e-mail suggestions from the share input if link shares are disabled. As e-mail shares use just link shares. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #18687 from nextcloud/td/phpunit8/loggerTestRoeland Jago Douma2020-01-061-21/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix the LoggerTests for phpunit
| * | | | | | Fix the LoggerTests for phpunitRoeland Jago Douma2020-01-061-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less deprecation warnings. YAY. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | [#18645] Have custom login images cover the whole page (#18660)John Molakvoæ2020-01-061-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [#18645] Have custom login images cover the whole page
| * | | | | | [#18645] Have custom login images cover the whole pageMarius David Wieschollek2020-01-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius David Wieschollek <git.public@mdns.eu>
* | | | | | | Merge pull request #18674 from nextcloud/enh/no_global_GETRoeland Jago Douma2020-01-062-6/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not use $_GET
| * | | | | | | Do not use $_GETRoeland Jago Douma2020-01-052-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The appframework is more than capable of handling this properly. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-01-0632-52/+86
| | | | | | | |
* | | | | | | | Merge pull request #18669 from ↵Roeland Jago Douma2020-01-0542-51/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-loader-3.4.1 Bump css-loader from 3.4.0 to 3.4.1
| * | | | | | | Bump css-loader from 3.4.0 to 3.4.1dependabot-preview[bot]2020-01-0542-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #18641 from HarHarLinks/patch-1Roeland Jago Douma2020-01-052-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix typo in occ
| * | | | | | | Fix CIKim Brose2020-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kim Brose <kim.brose@rwth-aachen.de>
| * | | | | | | Fix typo in occKim Brose2020-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kim Brose <kim.brose@rwth-aachen.de>
* | | | | | | | Merge pull request #18668 from nextcloud/dependabot/npm_and_yarn/p-limit-2.2.2Roeland Jago Douma2020-01-052-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump p-limit from 2.2.1 to 2.2.2
| * | | | | | | | Bump p-limit from 2.2.1 to 2.2.2dependabot-preview[bot]2020-01-052-4/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [p-limit](https://github.com/sindresorhus/p-limit) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/sindresorhus/p-limit/releases) - [Commits](https://github.com/sindresorhus/p-limit/compare/v2.2.1...v2.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | Merge pull request #18667 from ↵Roeland Jago Douma2020-01-052-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/eslint-config-nextcloud-0.1.1 Bump eslint-config-nextcloud from 0.1.0 to 0.1.1
| * | | | | | | | Bump eslint-config-nextcloud from 0.1.0 to 0.1.1dependabot-preview[bot]2020-01-052-4/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [eslint-config-nextcloud](https://github.com/nextcloud/eslint-config-nextcloud) from 0.1.0 to 0.1.1. - [Release notes](https://github.com/nextcloud/eslint-config-nextcloud/releases) - [Commits](https://github.com/nextcloud/eslint-config-nextcloud/compare/v0.1.0...v0.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | Merge pull request #18665 from ↵Roeland Jago Douma2020-01-054-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/toastify-js-1.6.2 Bump toastify-js from 1.6.1 to 1.6.2
| * | | | | | | | Bump toastify-js from 1.6.1 to 1.6.2dependabot-preview[bot]2020-01-054-7/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [toastify-js](https://github.com/apvarun/toastify-js) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/apvarun/toastify-js/releases) - [Changelog](https://github.com/apvarun/toastify-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/apvarun/toastify-js/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / / / / / [tx-robot] updated from transifexNextcloud bot2020-01-0534-34/+122
|/ / / / / / /
* | | | / / / [tx-robot] updated from transifexNextcloud bot2020-01-0426-54/+58
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #18642 from nextcloud/design/settings-sectionRoeland Jago Douma2020-01-031-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Settings: More spacing for development notice
| * | | | | Settings: More spacing for development noticeJan-Christoph Borchardt2020-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-01-034-2/+8
| | | | | |
* | | | | | Merge pull request #18578 from nextcloud/version/18/rc1v18.0.0RC1Roeland Jago Douma2020-01-022-4/+38
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | 18 RC 1
| * | | | | Bump ca-bundleRoeland Jago Douma2020-01-021-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | 18 RC 1Roeland Jago Douma2020-01-021-2/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #18583 from ↵Roeland Jago Douma2020-01-022-6/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enh/18579/chrome-regex-brave-vivaldi-opera Modify regex to match some other chromium browsers
| * | | | | Modify regex to match some other chromium browsersDaniel Kesselberg2019-12-272-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #18612 from nextcloud/bugfix/flow-styleRoeland Jago Douma2020-01-028-55/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | Workflow validity checks
| * | | | | | Bump bundlesJulius Härtl2020-01-022-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Only ask for password when updating admin rulesJulius Härtl2020-01-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Load polyfill in workflow engineJulius Härtl2020-01-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Refactor validity propagationJulius Härtl2020-01-023-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Remove style loading of non-existing fileJulius Härtl2020-01-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | confirm resharing rights if viewer is current owner (#18630)John Molakvoæ2020-01-021-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | confirm resharing rights if viewer is current owner
| * | | | | | | confirm resharing rights if viewer is current ownerMaxence Lange2020-01-021-0/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | | | Merge pull request #18598 from ↵Roeland Jago Douma2020-01-0212-37/+37
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud/logger-1.0.0 Bump @nextcloud/logger from 0.1.0 to 1.0.0
| * | | | | | Bump @nextcloud/logger from 0.1.0 to 1.0.0dependabot-preview[bot]2020-01-0212-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@nextcloud/logger](https://github.com/nextcloud/nextcloud-logger) from 0.1.0 to 1.0.0. - [Release notes](https://github.com/nextcloud/nextcloud-logger/releases) - [Commits](https://github.com/nextcloud/nextcloud-logger/compare/v0.1.0...v1.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Fix style of the sharing setting checkbox (#18628)John Molakvoæ2020-01-023-7/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix style of the sharing setting checkbox
| * | | | | | | Fix style of the sharing setting checkboxJulius Härtl2020-01-023-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | Move scroll container to inner element (#18615)John Molakvoæ2020-01-021-5/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Move scroll container to inner element
| * | | | | | | Move scroll container to inner elementJulius Härtl2019-12-311-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>