summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Properly query filesJohn Molakvoæ (skjnldsv)2019-12-046-11/+12
| * | | | | | | Use own getIconUrl methodJohn Molakvoæ (skjnldsv)2019-12-043-5/+36
| * | | | | | | Fix files app LoadSidebar eventJohn Molakvoæ (skjnldsv)2019-12-0411-14/+62
* | | | | | | | Merge pull request #17833 from nextcloud/propagator-no-negative-sizesRoeland Jago Douma2019-12-046-2/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | dont set folder size to negative values during propagationRobin Appelman2019-11-262-2/+16
| * | | | | | | | add LEAST and GREATER to db function builderRobin Appelman2019-11-264-0/+67
* | | | | | | | | Merge pull request #18161 from nextcloud/fix/noid/absocsroute-subfolderRoeland Jago Douma2019-12-041-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix generation of an url to an absolute ocs route when NC in subfolderArthur Schiwon2019-11-291-2/+3
* | | | | | | | | | Merge pull request #18220 from nextcloud/fix/theming/testsRoeland Jago Douma2019-12-041-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the theming testsRoeland Jago Douma2019-12-041-0/+6
* | | | | | | | | | | Merge pull request #17715 from nextcloud/fix/5456/respect_avatar_privacyJoas Schilling2019-12-042-17/+62
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update testsRoeland Jago Douma2019-11-132-22/+45
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fix/5456/respect_avatar_pri...Roeland Jago Douma2019-11-13886-25419/+24493
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Honor avatar visibility settingsRoeland Jago Douma2019-10-281-4/+26
* | | | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-0444-14/+186
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #17949 from nextcloud/debt/deprecated-constJoas Schilling2019-12-041-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Connection::TRANSACTION_READ_COMMITTED is deprecatedDaniel Kesselberg2019-11-141-1/+2
* | | | | | | | | | | | | Merge pull request #18209 from nextcloud/bugfix/noid/directediting-token-getuserRoeland Jago Douma2019-12-041-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add missing getUser method to direct editing IToken interfaceJulius Härtl2019-12-031-0/+6
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #18212 from nextcloud/bugfix/noid/subject-message-mixed-upRoeland Jago Douma2019-12-041-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix mixed up message and subject on notifications for file transferJoas Schilling2019-12-031-10/+14
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #18215 from nextcloud/fix/setup/password_confirmationRoeland Jago Douma2019-12-041-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Set last-password-confirmation for setupRoeland Jago Douma2019-12-031-0/+4
| |/ / / / / / / / / / /
* / / / / / / / / / / / [tx-robot] updated from transifexNextcloud bot2019-12-0460-314/+456
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #17930 from nextcloud/rakekniven-patch-1John Molakvoæ2019-12-031-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add space before ellipsisJohn Molakvoæ2019-12-031-5/+5
| * | | | | | | | | | l10n: Triple dot to ellipsisrakekniven2019-11-131-5/+5
* | | | | | | | | | | Merge pull request #18120 from nextcloud/bugfix/11087/dav_principal_backend_r...John Molakvoæ2019-12-0310-15/+128
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | respect shareapi_allow_share_dialog_user_enumeration in Principal backend for...Georg Ehrke2019-12-0310-15/+128
* | | | | | | | | | | Merge pull request #18140 from nextcloud/bugfix/17814/csp-svgRoeland Jago Douma2019-12-031-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow inline styles for theming imagesJulius Härtl2019-11-271-0/+3
* | | | | | | | | | | | Merge pull request #15952 from nextcloud/feature/noid/inherited-sharesRoeland Jago Douma2019-12-0321-178/+814
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fixing tests + avoid duplicate in getFormattedShares()Maxence Lange2019-12-032-9/+13
| * | | | | | | | | | | Inherited share UIJohn Molakvoæ (skjnldsv)2019-12-0314-120/+399
| * | | | | | | | | | | integration testsMaxence Lange2019-12-032-8/+92
| * | | | | | | | | | | Inherited SharesMaxence Lange2019-12-035-49/+318
* | | | | | | | | | | | Merge pull request #17443 from nextcloud/enh/expired_token_on_invalid_passRoeland Jago Douma2019-12-034-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Throw an invalid token exception is token is marked outdatedRoeland Jago Douma2019-12-024-0/+42
* | | | | | | | | | | | | Merge pull request #18028 from nextcloud/enhancement/user-create-eventsRoeland Jago Douma2019-12-0312-137/+308
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add typed create user eventsChristoph Wurst2019-12-0312-137/+308
* | | | | | | | | | | | | | add update all button (#17512)John Molakvoæ2019-12-0311-15/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add update all buttonGreta Doci2019-11-2611-15/+54
* | | | | | | | | | | | | | Merge pull request #18151 from nextcloud/bugfix/noid/overwrite-host-proxyRoeland Jago Douma2019-12-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Always return overwritehost if configuredJulius Härtl2019-11-281-0/+5
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-03116-448/+910
* | | | | | | | | | | | | | Merge pull request #18167 from nextcloud/simplify-versioncheckRoeland Jago Douma2019-12-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use PHP_VERSION_ID to check for the current php versionDaniel Kesselberg2019-12-021-2/+2
* | | | | | | | | | | | | | | Merge pull request #17736 from nextcloud/enh/transfer_ownershipRoeland Jago Douma2019-12-0233-36/+1417
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Also allow transfer ownership of filesChristoph Wurst2019-12-026-16/+25
| * | | | | | | | | | | | | | | Add a transfer ownership background jobRoeland Jago Douma2019-12-0232-35/+1407
|/ / / / / / / / / / / / / / /