summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21977 from onehappycat/issue_21960Morris Jobke2020-07-241-0/+3
|\ | | | | Ignore whitespace in sharing by mail
| * Ignore whitespace in sharing by mailonehappycat2020-07-231-0/+3
| | | | | | | | Signed-off-by: onehappycat <one.happy.cat@gmx.com>
* | Merge pull request #21988 from nextcloud/enh/theming-guestMorris Jobke2020-07-241-40/+47
|\ \ | | | | | | Combine body-login rules in theming and fix twofactor and guest styling on bright colors
| * | Combine body-login rules in theming and fix twofactor and guest styling on ↵Julius Härtl2020-07-241-40/+47
| | | | | | | | | | | | | | | | | | bright colors Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #21818 from nextcloud/techdebt/noid/theming-bootstrapMorris Jobke2020-07-243-64/+97
|\ \ \ | | | | | | | | Use IBootstrap for the app theming
| * | | Use IBootstrap for the app themingMorris Jobke2020-07-243-64/+97
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #21987 from nextcloud/techdebt/notfoundresponse-templateMorris Jobke2020-07-242-22/+10
|\ \ \ | |/ / |/| | Move NotFoundResponse to a proper TemplateResponse
| * | Move NotFoundResponse to a proper TemplateResponseJulius Härtl2020-07-242-22/+10
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2020-07-2410-4/+80
| |
* | Merge pull request #21940 from ↵Morris Jobke2020-07-242-14/+14
|\ \ | |/ |/| | | | | nextcloud/fix/14541/fix-fragile-acceptance-tests-part1 Revert "Disable fragile tests for now" partially
| * Revert "Disable fragile tests for now"Morris Jobke2020-07-212-14/+14
| | | | | | | | | | | | This reverts commit 40e04c83914e960b5aff739900d887f0e7a44d63. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #21814 from ↵Morris Jobke2020-07-2321-125/+309
|\ \ | | | | | | | | | | | | nextcloud/techdebt/noid/federated_share_added-into-typed-event Move federated_share_added into a typed event
| * | Move federated_share_added into a typed eventMorris Jobke2020-07-2321-125/+309
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #21972 from nextcloud/techdebt/noid/cleanup-phpunit-warningsMorris Jobke2020-07-2316-80/+43
|\ \ \ | | | | | | | | Fix PHPUnit deprecation warnings
| * | | Remove deprecated test of internal attributes via assertAttributeEquals in ↵Morris Jobke2020-07-233-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor tests I removed the tests completely because they just test that the constructor assigns the values to the internal properties. Nothing that should be cared about from the outside. 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>
| * | | Replace deprecated assertArraySubset with logic that does the sameMorris Jobke2020-07-231-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | 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 #21628 from nextcloud/external-to-s3-trashbin-fixMorris Jobke2020-07-235-27/+40
|\ \ \ \ | | | | | | | | | | fix moving files from external storage to object store trashbin
| * | | | fix renameFromStorage messing with folder mimetypeRobin Appelman2020-07-231-7/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | use exceptions for error signaling in writeStreamRobin Appelman2020-07-233-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this remove the ambiguity when writing zero length files Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | rollback cache rename if trashbin move failsRobin Appelman2020-07-232-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix moving files from external storage to object store trashbinRobin Appelman2020-07-232-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | having the "cache rename" after the "storage move" caused the target to get the fileid from the source file, without taking care that the object is stored under the original file id. By doing the "cache rename" first, we trigger the "update existing file" logic while moving the file to the object store and the object gets stored for the correct file id Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #21747 from simonspa/fix_mail_logosizeMorris Jobke2020-07-235-14/+15
|\ \ \ \ \ | |_|/ / / |/| | | | Fix header logo size in notification mails
| * | | | Adjust tests to new e-mail layoutSimon Spannagel2020-07-234-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Spannagel <simonspa@kth.se>
| * | | | Fix header logo size in notification mailsSimon Spannagel2020-07-231-2/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: Simon Spannagel <simonspa@kth.se>
* | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 18:53:52 +0000