aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20658 from ↵Roeland Jago Douma2020-04-292-32/+33
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/node-sass-4.14.0 Bump node-sass from 4.13.1 to 4.14.0
| * Bump node-sass from 4.13.1 to 4.14.0dependabot-preview[bot]2020-04-262-32/+33
| | | | | | | | | | | | | | | | Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.1 to 4.14.0. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.13.1...v4.14.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | [tx-robot] updated from transifexNextcloud bot2020-04-296-0/+62
| |
* | Merge pull request #20636 from ↵Morris Jobke2020-04-282-1/+171
|\ \ | | | | | | | | | | | | nextcloud/tests/noid/tests-for-update-notifications-controller Add tests for update notification controller for non-default updater …
| * | Add tests for update notification controller for non-default updater server URLMorris Jobke2020-04-282-1/+171
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #20676 from clementhk/ldap-groupblizzz2020-04-281-3/+3
|\ \ \ | | | | | | | | Don't remove last user in ldap group when limit is -1
| * | | Don't remove last user in ldap group when limit is -1Clement Wong2020-04-271-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
* | | | Merge pull request #20673 from nextcloud/enh/tweaks-app-data-scanRoeland Jago Douma2020-04-281-12/+20
|\ \ \ \ | | | | | | | | | | Set exit code if something went wrong.
| * | | | Set exit code if something went wrong.Daniel Kesselberg2020-04-261-12/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #20661 from ↵Roeland Jago Douma2020-04-282-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-loader-3.5.3 Bump css-loader from 3.5.2 to 3.5.3
| * | | | | Bump css-loader from 3.5.2 to 3.5.3dependabot-preview[bot]2020-04-262-11/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.2 to 3.5.3. - [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.5.2...v3.5.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-04-2818-14/+30
| | | | |
* | | | | Merge pull request #20650 from tekhnee/patch-1Morris Jobke2020-04-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Adhere to EMailTemplate interface in constructor call.
| * | | | | Adhere to EMailTemplate interface in constructor call.Tekhnee2020-04-251-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Email creation appears to have been refactored lately but it looks like custom template-based emails were left out. Signed-off-by: Tekhnee <info@tekhnee.org>
* | | | | Merge pull request #20558 from ↵Morris Jobke2020-04-2710-14/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-click-outside-1.1.0 Bump vue-click-outside from 1.0.7 to 1.1.0
| * | | | | Bump vue-click-outside from 1.0.7 to 1.1.0dependabot-preview[bot]2020-04-2410-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-click-outside](https://github.com/vue-bulma/click-outside) from 1.0.7 to 1.1.0. - [Release notes](https://github.com/vue-bulma/click-outside/releases) - [Commits](https://github.com/vue-bulma/click-outside/commits/v1.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | Merge pull request #19929 from nextcloud/bugfix/user-delete-avatarMorris Jobke2020-04-272-0/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Delete avatar if a user is deleted
| * | | | | | Delete avatar if a user is deletedJulius Härtl2020-04-242-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #19793 from nextcloud/bugfix/noid/link-to-federated-reshareMorris Jobke2020-04-276-33/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix resharing of federated shares that were created out of links
| * | | | | | | Adjust integration tests to new permissionsJulius Härtl2020-04-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | Remove unneeded test since links have resharing permissions by defaultJulius Härtl2020-04-211-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | Link shares have reshare permission if outgoing federated shares are enabledJulius Härtl2020-04-213-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | Set proper share type when converting link shares to federated sharesJulius Härtl2020-04-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | Merge pull request #19514 from sndrr/already-enabled-appsMorris Jobke2020-04-272-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Already enabled apps
| * | | | | | | | Display notice for already enabled appsSander Ruitenbeek2020-04-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sander Ruitenbeek <s.ruitenbeek@getgoing.nl> Signed-off-by: Sander Ruitenbeek <s.ruitenbeek@getgoing.nl>
| * | | | | | | | Updated test to check for already enabled appsSander Ruitenbeek2020-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sander Ruitenbeek <s.ruitenbeek@getgoing.nl>
* | | | | | | | | Merge pull request #19084 from nextcloud/bug/13556/wrong-paths-for-svgMorris Jobke2020-04-275-9/+98
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make it possible to resolve svg's outside \OC::$SERVERROOT
| * | | | | | | | | Add test to ensure that symlinked apps_paths are not resolvedDaniel Kesselberg2020-04-241-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | | | | Make it possible to resolve svg for apps_paths outside the document rootDaniel Kesselberg2020-04-244-9/+69
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous implementation assumes the app path is always a child \OC::$SERVERROOT. That's not always true. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | Merge pull request #20632 from nextcloud/bugfix/20624Morris Jobke2020-04-272-4/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Only catch anonymous OPTIONS for Office
| * | | | | | | | | Only catch anonymous OPTIONS for OfficeJulius Härtl2020-04-242-4/+22
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | | Merge pull request #20678 from nextcloud/fix/missing-argument-JSConfigHelperJohn Molakvoæ2020-04-271-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix missing argument in JSConfigHelperJohn Molakvoæ (skjnldsv)2020-04-271-2/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | / / [tx-robot] updated from transifexNextcloud bot2020-04-2718-8/+256
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-04-266-2/+10
| |_|_|_|/ / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-04-2526-10/+40
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #19002 from zertrin/patch-1blizzz2020-04-241-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix security header setting in .htaccess by adding 'onsuccess unset'
| * | | | | | Fix security header setting in .htaccess by adding 'onsuccess unset'zertrin2020-03-051-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The headers might already be set by the system administrator at the http server level (apache or nginx) for some or all virtualhosts. Using "always set" in the .htaccess of Nextcloud leads to the situation where the headers might be set twice (once in the default 'onsuccess' table and once in the 'always' table)! Which leads to warnings in the admin area. Adding "onsuccess unset" solves the problem, and forces the header in the 'onsucess' table to be unset, and the header in the 'always' table to be set. NOTE: with this change, Nextcloud overrides whatever the system administrator might have already set See github issues #16893 #16476 #16938 #18017 and discussion in PR #19002 Signed-off-by: zertrin <zertrin@gmail.com>
* | | | | | | Merge pull request #20587 from nextcloud/enh/allow_default_expiration_dateRoeland Jago Douma2020-04-242-2/+13
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Allow specifying a default expiration date
| * | | | | | Allow specifying a default expiration dateRoeland Jago Douma2020-04-242-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This overrides the max expiration date. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #20570 from nextcloud/fix/20235/use_uploadfileRoeland Jago Douma2020-04-246-3/+129
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use a proper upload file so propfinds return 404
| * | | | | | | Add test that shares and tags are ignored for chunk files.Daniel Kesselberg2020-04-212-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | | Use a proper upload file so propfinds return 404Roeland Jago Douma2020-04-214-2/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20235 By using an UploadFile we make sure that we don't need to have another check everywhere for the path. But we just have ot check (which we have to anyway) if it is a proper Connector/File (or directory). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #20559 from ↵Christoph Wurst2020-04-242-19/+38
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/mochapack-1.1.15 Bump mochapack from 1.1.13 to 1.1.15
| * | | | | | | Bump mochapack from 1.1.13 to 1.1.15dependabot-preview[bot]2020-04-192-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [mochapack](https://github.com/sysgears/mochapack) from 1.1.13 to 1.1.15. - [Release notes](https://github.com/sysgears/mochapack/releases) - [Commits](https://github.com/sysgears/mochapack/compare/v1.1.13...v1.1.15) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | Merge pull request #17623 from j3l11234/masterRoeland Jago Douma2020-04-241-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Add support for download share on old android browser
| * | | | | | | Add support for download share on old android browserj3l112342019-10-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: j3l11234 <297259024@qq.com>
* | | | | | | | Merge pull request #20627 from ↵Morris Jobke2020-04-245-195/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/cleanup/noid/remove-obsolete-repair-steps Remove obsolete repair steps for logo and updater channel
| * | | | | | | | Remove obsolete repair steps for logo and updater channelMorris Jobke2020-04-245-195/+0
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #20298 from nextcloud/enh/noid/auto-logoutblizzz2020-04-2416-117/+219
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow to configure auto logout after browser inactivity