aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove saved credentails if the user no longer has any storage configured ↵Robin Appelman2020-07-303-4/+82
| | | | | | using them Signed-off-by: Robin Appelman <robin@icewind.nl>
* Only save login credentials in database once there is an external storage ↵Robin Appelman2020-07-301-23/+29
| | | | | | that needs it Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #22015 from ↵Morris Jobke2020-07-305-2/+56
|\ | | | | | | | | nextcloud/bugfix/noid/correctly-remove-user-shares-on-removing-group-members Correctly remove usergroup shares on removing group members
| * Correctly remove usergroup shares on removing group membersJoas Schilling2020-07-305-2/+56
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #22034 from nextcloud/bugfix/noid/parse-url-returns-nullJoas Schilling2020-07-291-1/+1
|\ | | | | parse_url returns null in case a parameter is not found
| * parse_url returns null in case a parameter is not foundJoas Schilling2020-07-291-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #21542 from nextcloud/activity-notificationsMorris Jobke2020-07-2910-6/+220
|\ \ | | | | | | basic settings system for activity notifications
| * | implement old settings interfaceRobin Appelman2020-07-242-4/+26
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | build autoloaderRobin Appelman2020-07-215-3/+11
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | improve default notification fallbackRobin Appelman2020-07-211-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | basic settings system for activity notificationsRobin Appelman2020-07-218-7/+191
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #22017 from nextcloud/techdebt/noid/fix-psr4-namespaceMorris Jobke2020-07-294-4/+4
|\ \ \ | | | | | | | | Fix PSR-4 compatible namespace
| * | | Fix PSR-4 compatible namespaceJoas Schilling2020-07-274-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #22038 from ↵Joas Schilling2020-07-291-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/bugfix/noid/dont-strict-type-uid-to-string When no user is logged in null is used
| * | | When no user is logged in null is usedJoas Schilling2020-07-291-2/+2
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-07-2930-54/+94
| | |
* | | Merge pull request #22027 from ↵Joas Schilling2020-07-282-5/+17
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-overwrite-service-for-apps Fix overwriteService() for apps
| * | | Fix overwriteService() for appsJoas Schilling2020-07-282-5/+17
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / [tx-robot] updated from transifexNextcloud bot2020-07-2810-4/+22
|/ /
* | [tx-robot] updated from transifexNextcloud bot2020-07-276-10/+24
| |
* | [tx-robot] updated from transifexNextcloud bot2020-07-256-10/+12
| |
* | 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>