aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17684 from mlatief/support-no-proxyRoeland Jago Douma2020-03-223-18/+189
|\ | | | | Add support for GuzzleHTTP 'no' proxy
| * Add support for GuzzleHTTP 'no' proxyMohammed Abdellatif2020-02-293-18/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom config allows to setup a proxy URI that is passed to GuzzleHTTP client as request options. Guzzle has the option to receive an array of proxies for each URI scheme as well as 'no' key value pair to provide a list of host names that should not be proxied to. Guzzle would automatically populate these options with HTTPS_PROXY and NO_PROXY environment variables. However, when providing a 'proxy' request option, default values will be overriden and it is required to explicitly provide the 'no' value if needed. More info: http://docs.guzzlephp.org/en/stable/request-options.html#proxy This commit will add support for a new config 'proxyexclude', which takes a list of host names to be excluded. It will also provide 'proxy' request option as an array instead of a string to Guzzle, and populate 'http' and 'https' URI schemes with proxy URI, and 'no' with 'proxyexclude' list. Also, if no 'proxy' is configured, it will leave out 'proxy' request option, so it won't override Guzzle default values. Sample config file includes a hint on how to explicitly sync 'proxyexclude' with NO_PROXY, and a note about default values. Signed-off-by: Mohammed Abdellatif <m.latief@gmail.com>
* | Merge pull request #20075 from ↵John Molakvoæ2020-03-223-8/+3
|\ \ | | | | | | | | | | | | nextcloud/fix/20059/remove-unnecessary-translation Remove unnecessary translation in systemtags
| * | Remove unnecessary translation in systemtagsGary Kim2020-03-223-8/+3
| | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | Merge pull request #20042 from nextcloud/fix/noid/styled-dav-browser-errorRoeland Jago Douma2020-03-222-36/+12
|\ \ \ | |/ / |/| | fix dav browser error page not styled
| * | use core templates for displaying dav errors in the browserArthur Schiwon2020-03-202-36/+9
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | fix dav browser error page not styledArthur Schiwon2020-03-192-3/+6
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #20076 from nextcloud/dependabot/npm_and_yarn/variousRoeland Jago Douma2020-03-2254-15790/+644
|\ \ \ | | | | | | | | Bump @nextcloud/l10n, @nextcloud/event-bus, @nextcloud/dialogs, @nextcloud/auth, @nextcloud/vue
| * | | Bump marked from 0.7.0 to 0.8.1John Molakvoæ (skjnldsv)2020-03-2154-16088/+800
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Bump @nextcloud/l10n, @nextcloud/event-bus, @nextcloud/dialogs, ↵John Molakvoæ (skjnldsv)2020-03-212-259/+401
| | | | | | | | | | | | | | | | | | | | | | | | @nextcloud/auth, @nextcloud/vue Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #19930 from nextcloud/enh/19804/wfe-disable-user-flowsRoeland Jago Douma2020-03-226-5/+25
|\ \ \ \ | | | | | | | | | | Add app config to disable user flows
| * | | | Add app config to disable user flowsJulius Härtl2020-03-216-5/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-03-22130-928/+978
| |/ / / |/| | |
* | | | Merge pull request #20064 from ↵John Molakvoæ2020-03-212-17/+45
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/file-loader-6.0.0 Bump file-loader from 5.1.0 to 6.0.0
| * | | Bump file-loader from 5.1.0 to 6.0.0dependabot-preview[bot]2020-03-202-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 5.1.0 to 6.0.0. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/compare/v5.1.0...v6.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #20069 from ↵Roeland Jago Douma2020-03-212-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-loader-15.9.1 Bump vue-loader from 15.9.0 to 15.9.1
| * | | | Bump vue-loader from 15.9.0 to 15.9.1dependabot-preview[bot]2020-03-202-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.0 to 15.9.1. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/compare/v15.9.0...v15.9.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #20058 from nextcloud/rakekniven-patch-1Roeland Jago Douma2020-03-211-0/+1
|\ \ \ \ | | | | | | | | | | l10n: Ignore compressed js
| * | | | l10n: Ignore compressed jsrakekniven2020-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reported at Transifex. Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
* | | | | Merge pull request #20070 from nextcloud/dependabot/npm_and_yarn/mocha-7.1.1Roeland Jago Douma2020-03-212-7/+50
|\ \ \ \ \ | | | | | | | | | | | | Bump mocha from 7.1.0 to 7.1.1
| * | | | | Bump mocha from 7.1.0 to 7.1.1dependabot-preview[bot]2020-03-202-7/+50
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [mocha](https://github.com/mochajs/mocha) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v7.1.0...v7.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | Merge pull request #20062 from ↵Roeland Jago Douma2020-03-2122-38/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud/initial-state-1.1.1 Bump @nextcloud/initial-state from 1.1.0 to 1.1.1
| * | | | | Bump @nextcloud/initial-state from 1.1.0 to 1.1.1dependabot-preview[bot]2020-03-2122-38/+38
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@nextcloud/initial-state](https://github.com/nextcloud/nextcloud-initial-state) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/nextcloud/nextcloud-initial-state/releases) - [Changelog](https://github.com/nextcloud/nextcloud-initial-state/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextcloud/nextcloud-initial-state/compare/v1.1.0...v1.1.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 bot2020-03-2162-114/+116
|/ / / /
* | | | Merge pull request #20057 from ↵Roeland Jago Douma2020-03-204-24/+90
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/adjust-acceptance-tests-to-incoming-shares-being-accepted-by-default Adjust acceptance tests to incoming shares being accepted by default
| * | | Add acceptance test for accepting an incoming shareDaniel Calviño Sánchez2020-03-202-0/+71
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix timeout cappingDaniel Calviño Sánchez2020-03-201-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Revert (partially) "Accept incoming shares in acceptance tests"Daniel Calviño Sánchez2020-03-202-23/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f402e234480cd9d18c6c90ef011968eb7abcd5dc. Since eb4c42d3d1fda02895d35a360bceb08379f328c2 now shares are accepted by default, so no notification is shown to accept them. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #20049 from ↵Roeland Jago Douma2020-03-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/force-compatible-dependency-versions-in-acceptance-tests Force compatible dependency versions in acceptance tests
| * | | Force compatible dependency versions in acceptance testsDaniel Calviño Sánchez2020-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | behat/mink 1.8 and behat/mink-selenium2-driver 1.4 introduced behaviour changes that broke the acceptance tests. Until the tests are updated to work with the newer versions the last known versions are forced. Note that some acceptance tests still fail after enforcing the compatible versions, although that is caused by changes in the Nextcloud server itself. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #19569 from ↵Roeland Jago Douma2020-03-2017-78/+515
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/enh/noid/restrict-user-enumeration-to-groups Restrict sharing user enumeration to groups
| * | | Fix tests due to config adjustmentsJulius Härtl2020-03-202-36/+44
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Return empty system addressbook since we cannot easily limit it to groupsJulius Härtl2020-03-201-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add tests for ContactsStore filteringJulius Härtl2020-03-201-4/+99
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add tests for user group enumeration limitJulius Härtl2020-03-201-16/+128
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Limit enumeration in principal searchJulius Härtl2020-03-202-1/+150
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Expose enumeration config though share managerJulius Härtl2020-03-202-0/+25
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Limit enumeration in contacts storeJulius Härtl2020-03-201-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Limit user search in Collaborators pluginsJulius Härtl2020-03-203-5/+50
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Remove unused properties in ShareesAPIControllerJulius Härtl2020-03-202-14/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add setting to restrict user enumeration to groupsJulius Härtl2020-03-203-0/+13
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #20039 from nextcloud/fix/19549/fix-uuid-attr-detectionblizzz2020-03-201-4/+0
|\ \ \ \ | |/ / / |/| | | fixes auto-detecting UUID attributes
| * | | fixes auto-detecting UUID attributesArthur Schiwon2020-03-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the continue (and later the early return) avoided proper looping over the attribute candidates. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #20043 from nextcloud/fix/welcome-no-ircRoeland Jago Douma2020-03-201-2/+0
|\ \ \ \ | | | | | | | | | | Most of us don't use IRC anymore
| * | | | We don't use IRC anymoreChristoph Wurst2020-03-201-2/+0
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #19971 from joeried/visual-feedback-for-2fa-code-creationRoeland Jago Douma2020-03-203-4/+5
|\ \ \ \ | | | | | | | | | | Add visual feedback while creating 2fa backup codes
| * | | | Move spinner behind text to match design guidelinesJohannes Riedel2020-03-193-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Riedel <joeried@users.noreply.github.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | Add visual feedback while creating 2fa backup codesJohannes Riedel2020-03-191-1/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Johannes Riedel <joeried@users.noreply.github.com>
* | | | Merge pull request #20032 from ↵Roeland Jago Douma2020-03-201-8/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/19878/allow-video-player-on-hide-download Allow the video player on the hide download
| * | | | Allow the video player on the hide downloadJoas Schilling2020-03-191-8/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>