summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21977 from onehappycat/issue_21960Morris Jobke2020-07-241-0/+3
|\
| * Ignore whitespace in sharing by mailonehappycat2020-07-231-0/+3
* | 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 br...Julius Härtl2020-07-241-40/+47
* | | Merge pull request #21818 from nextcloud/techdebt/noid/theming-bootstrapMorris Jobke2020-07-243-64/+97
|\ \ \
| * | | Use IBootstrap for the app themingMorris Jobke2020-07-243-64/+97
|/ / /
* | | Merge pull request #21987 from nextcloud/techdebt/notfoundresponse-templateMorris Jobke2020-07-242-22/+10
|\ \ \ | |/ / |/| |
| * | Move NotFoundResponse to a proper TemplateResponseJulius Härtl2020-07-242-22/+10
|/ /
* | [tx-robot] updated from transifexNextcloud bot2020-07-2410-4/+80
* | Merge pull request #21940 from nextcloud/fix/14541/fix-fragile-acceptance-tes...Morris Jobke2020-07-242-14/+14
|\ \ | |/ |/|
| * Revert "Disable fragile tests for now"Morris Jobke2020-07-212-14/+14
* | Merge pull request #21814 from nextcloud/techdebt/noid/federated_share_added-...Morris Jobke2020-07-2321-125/+309
|\ \
| * | Move federated_share_added into a typed eventMorris Jobke2020-07-2321-125/+309
* | | Merge pull request #21972 from nextcloud/techdebt/noid/cleanup-phpunit-warningsMorris Jobke2020-07-2316-80/+43
|\ \ \
| * | | Remove deprecated test of internal attributes via assertAttributeEquals in co...Morris Jobke2020-07-233-32/+0
| * | | Replace deprecated assertArraySubset with logic that does the sameMorris Jobke2020-07-231-1/+3
| * | | Use assertEqualsCanonicalizing instead of deprecated assertEquals parameterMorris Jobke2020-07-232-4/+4
| * | | Remove deprecated test of internal attributes via assertAttributeEqualsMorris Jobke2020-07-232-16/+10
| * | | Use assertStringContainsString instead of assertContains on stringsMorris Jobke2020-07-238-27/+26
* | | | Merge pull request #21628 from nextcloud/external-to-s3-trashbin-fixMorris Jobke2020-07-235-27/+40
|\ \ \ \
| * | | | fix renameFromStorage messing with folder mimetypeRobin Appelman2020-07-231-7/+10
| * | | | use exceptions for error signaling in writeStreamRobin Appelman2020-07-233-6/+19
| * | | | rollback cache rename if trashbin move failsRobin Appelman2020-07-232-7/+7
| * | | | fix moving files from external storage to object store trashbinRobin Appelman2020-07-232-11/+8
* | | | | Merge pull request #21747 from simonspa/fix_mail_logosizeMorris Jobke2020-07-235-14/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adjust tests to new e-mail layoutSimon Spannagel2020-07-234-12/+12
| * | | | Fix header logo size in notification mailsSimon Spannagel2020-07-231-2/+3
|/ / / /
* | | | Merge pull request #21973 from nextcloud/techdebt/noid/fix-risky-2fa-backup-c...Morris Jobke2020-07-231-0/+5
|\ \ \ \
| * | | | Fix risky test in twofactor_backupcodesMorris Jobke2020-07-231-0/+5
| | |/ / | |/| |
* | | | Merge pull request #21970 from nextcloud/dependageorg/npm_and_yarn/nextcloud/...Georg Ehrke2020-07-2326-47/+229
|\ \ \ \
| * | | | Bump @nextcloud/vue from 2.2.1 to 2.3.0Georg Ehrke2020-07-2326-47/+229
| | |/ / | |/| |
* | | | Merge pull request #21966 from nextcloud/enh/userbackend/custom_logoutMorris Jobke2020-07-234-0/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Allow user backends to specify a custom logout urlRoeland Jago Douma2020-07-234-0/+53
| |/ /
* | | Merge pull request #21963 from nextcloud/fix/sharing/respect_default_share_pe...Roeland Jago Douma2020-07-233-3/+3
|\ \ \
| * | | Respect default share permissionsRoeland Jago Douma2020-07-233-3/+3
| |/ /
* | | Merge pull request #21957 from nextcloud/techdebt/noid/bootstrap-testingJulius Härtl2020-07-232-35/+15
|\ \ \ | |/ / |/| |
| * | Use IBootstrap for the testing appMorris Jobke2020-07-222-35/+15
* | | [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 loginRoeland Jago Douma2020-07-223-3/+7
| |/ /
* | | Merge pull request #21949 from nextcloud/smb-3.2.6Roeland Jago Douma2020-07-227-30/+31
|\ \ \
| * | | update icewind/smb to 3.2.6Robin Appelman2020-07-227-30/+31
* | | | Merge pull request #21950 from nextcloud/bugfix/noid/wipe-translationRoeland Jago Douma2020-07-223-5/+5
|\ \ \ \
| * | | | Compile assetsnpmbuildbot[bot]2020-07-222-3/+3
| * | | | Properly fetch translation for remote wipe confirmation dialogJulius Härtl2020-07-221-2/+2
| | |/ / | |/| |
* | | | Merge pull request #21870 from nextcloud/fix/bootstrap-context-container-inte...Morris Jobke2020-07-2217-216/+236
|\ \ \ \ | |/ / / |/| | |
| * | | Use the proper IAppContainer and IServerContainer type hints to know which co...Morris Jobke2020-07-219-70/+62
| * | | Adjust apps' code to use the ContainerInterfaceChristoph Wurst2020-07-2114-190/+217
| * | | Make the bootstrap context return ContainerInterface instancesChristoph Wurst2020-07-214-15/+16
* | | | Merge pull request #21948 from nextcloud/bugfix/noid/accesibilityocaJohn Molakvoæ2020-07-221-0/+1
|\ \ \ \