aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use assertEqualsCanonicalizing instead of deprecated assertEquals parameterMorris Jobke2020-07-232-4/+4
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Remove deprecated test of internal attributes via assertAttributeEqualsMorris Jobke2020-07-232-16/+10
| | | | | | | | See https://github.com/sebastianbergmann/phpunit/issues/3339#issuecomment-428843322 It is seen as bad practice to test internal stuff of objects instead of the actual input and output of mathod calls. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Use assertStringContainsString instead of assertContains on stringsMorris Jobke2020-07-238-27/+26
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #21973 from ↵Morris Jobke2020-07-231-0/+5
|\ | | | | | | | | nextcloud/techdebt/noid/fix-risky-2fa-backup-code-test Fix risky test in twofactor_backupcodes
| * Fix risky test in twofactor_backupcodesMorris Jobke2020-07-231-0/+5
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #21970 from ↵Georg Ehrke2020-07-2326-47/+229
|\ \ | | | | | | | | | | | | nextcloud/dependageorg/npm_and_yarn/nextcloud/vue-2.3.0 Bump @nextcloud/vue from 2.2.1 to 2.3.0
| * | Bump @nextcloud/vue from 2.2.1 to 2.3.0Georg Ehrke2020-07-2326-47/+229
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #21966 from nextcloud/enh/userbackend/custom_logoutMorris Jobke2020-07-234-0/+53
|\ \ \ | |/ / |/| | Allow user backends to specify a custom logout url
| * | Allow user backends to specify a custom logout urlRoeland Jago Douma2020-07-234-0/+53
| |/ | | | | | | | | | | * Allows SSO backends to do a global logout Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21963 from ↵Roeland Jago Douma2020-07-233-3/+3
|\ \ | | | | | | | | | | | | nextcloud/fix/sharing/respect_default_share_permissions Respect default share permissions
| * | Respect default share permissionsRoeland Jago Douma2020-07-233-3/+3
| |/ | | | | | | | | | | Else we'll always create new shares with the max permissions. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21957 from nextcloud/techdebt/noid/bootstrap-testingJulius Härtl2020-07-232-35/+15
|\ \ | |/ |/| Use IBootstrap for the testing app
| * Use IBootstrap for the testing appMorris Jobke2020-07-222-35/+15
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2020-07-2320-14/+56
| |
* | Merge pull request #21946 from nextcloud/fix/webauthn/windows_helloRoeland Jago Douma2020-07-223-3/+7
|\ \ | | | | | | Do not double encode the userid in webauthn login
| * | Do not double encode the userid in webauthn loginRoeland Jago Douma2020-07-223-3/+7
| |/ | | | | | | | | | | | | | | * Else login fails with webauthn devices that send the userid - Like windows hello Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Merge pull request #21949 from nextcloud/smb-3.2.6Roeland Jago Douma2020-07-227-30/+31
|\ \ | | | | | | update icewind/smb to 3.2.6
| * | update icewind/smb to 3.2.6Robin Appelman2020-07-227-30/+31
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #21950 from nextcloud/bugfix/noid/wipe-translationRoeland Jago Douma2020-07-223-5/+5
|\ \ \ | | | | | | | | Properly fetch translation for remote wipe confirmation dialog
| * | | Compile assetsnpmbuildbot[bot]2020-07-222-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | Properly fetch translation for remote wipe confirmation dialogJulius Härtl2020-07-221-2/+2
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #21870 from ↵Morris Jobke2020-07-2217-216/+236
|\ \ \ | |/ / |/| | | | | | | | nextcloud/fix/bootstrap-context-container-interfaces Make the bootstrap context return ContainerInterface instances
| * | Use the proper IAppContainer and IServerContainer type hints to know which ↵Morris Jobke2020-07-219-70/+62
| | | | | | | | | | | | | | | | | | code runs with which container Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Adjust apps' code to use the ContainerInterfaceChristoph Wurst2020-07-2114-190/+217
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Make the bootstrap context return ContainerInterface instancesChristoph Wurst2020-07-214-15/+16
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #21948 from nextcloud/bugfix/noid/accesibilityocaJohn Molakvoæ2020-07-221-0/+1
|\ \ \ | | | | | | | | Load accessibilityoca script
| * | | Load accessibilityoca scriptJulius Härtl2020-07-221-0/+1
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #21867 from ↵John Molakvoæ2020-07-2263-181/+227
|\ \ \ | |/ / |/| | | | | nextcloud/dependageorg/npm_and_yarn/nextcloud/vue-2.2.1
| * | Hide share link menu before copying the share link in acceptance testsDaniel Calviño Sánchez2020-07-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The (old) Firefox version used in the acceptance tests does not properly render the share link menu. As the menu is taller than it should sometimes it covers the copy link button, so it is not possible to click it without hiding the share link menu. Moreover, in those cases the share menu button is also covered by the share menu, so the menu needs to be closed by pressing the "Esc" key. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Recompile JS assetsGeorg Ehrke2020-07-2250-59/+59
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Fix breaking changes of nc/vue updateGeorg Ehrke2020-07-229-88/+90
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Bump @nextcloud/vue from 1.5.0 to 2.2.1Georg Ehrke2020-07-223-34/+67
|/ / | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #21905 from ↵Roeland Jago Douma2020-07-222-186/+69
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/core-7.10.5 Bump @babel/core from 7.10.4 to 7.10.5
| * | Bump @babel/core from 7.10.4 to 7.10.5dependabot-preview[bot]2020-07-222-186/+69
|/ / | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.4 to 7.10.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-core) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #21904 from ↵Roeland Jago Douma2020-07-2264-136/+378
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud/axios-1.3.3 Bump @nextcloud/axios from 1.3.2 to 1.3.3
| * | Bump @nextcloud/axios from 1.3.2 to 1.3.3dependabot-preview[bot]2020-07-2064-136/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@nextcloud/axios](https://github.com/nextcloud/nextcloud-axios) from 1.3.2 to 1.3.3. - [Release notes](https://github.com/nextcloud/nextcloud-axios/releases) - [Changelog](https://github.com/nextcloud/nextcloud-axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextcloud/nextcloud-axios/compare/v1.3.2...v1.3.3) 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-07-2218-14/+118
| | |
* | | Merge pull request #21658 from nextcloud/trashbin-configurable-sizeMorris Jobke2020-07-216-1/+162
|\ \ \ | |_|/ |/| | allow admin to configure the max trashbin size
| * | allow admin to configure the max trashbin sizeRobin Appelman2020-07-076-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | this allows an admin to configure the max trashbin size instead of always relying on the users quota. The trashbin size can be configured using the `occ trash:size` command and can be set both globally and per-user Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #21941 from nextcloud/design/font-ubuntu-cantarellkesselb2020-07-211-1/+1
|\ \ \ | | | | | | | | Move Cantarell before Ubuntu in font stack to fix GNOME + Ubuntu setups
| * | | Move Cantarell before Ubuntu in font stack to fix GNOME + Ubuntu setupsJan C. Borchardt2020-07-211-1/+1
|/ / / | | | | | | | | | Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
* | | Merge pull request #21934 from ↵Morris Jobke2020-07-211-30/+30
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/tests/noid/disable-fragile-comments-tests Disable fragile comments tests
| * | | Disable fragile comments testsMorris Jobke2020-07-211-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those tests are actual problems in our code. See https://github.com/nextcloud/server/pull/20462#issuecomment-613380650 for a summary by @danxuliu Basically they are introduced by #18929 but are only revealed by #18764. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #21929 from nextcloud/bugfix/noid/encryption-transfer-userMorris Jobke2020-07-211-0/+3
|\ \ \ \ | |/ / / |/| | | Encryption is ready if master key is enabled
| * | | Encryption is ready if master key is enabledJulius Härtl2020-07-211-0/+3
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2020-07-2110-6/+756
| | |
* | | Merge pull request #21864 from nextcloud/techdebt/files-versions-psr-containerMorris Jobke2020-07-211-11/+12
|\ \ \ | | | | | | | | Migrate files versions to the PSR container
| * | | Migrate files versions to the PSR containerChristoph Wurst2020-07-161-11/+12
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #21865 from nextcloud/techdebt/settings-psr-containerMorris Jobke2020-07-211-12/+21
|\ \ \ \ | |_|/ / |/| | | Migrate settigns to the PSR container
| * | | Migrate settigns to the PSR containerChristoph Wurst2020-07-161-12/+21
| |/ / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>