summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #22643 from nextcloud/bugfix/noid/fix-installing-on-oracleMorris Jobke2020-09-071-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix installing on Oracle
| * | | | | | | Warn about adding NotNull columns with nullable defaultJoas Schilling2020-09-071-0/+5
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #22644 from nextcloud/fix/license-headers-20-2Morris Jobke2020-09-0710-1/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Update license headers for Nextcloud 20 (again)
| * | | | | | Update license headers for Nextcloud 20 (again)Christoph Wurst2020-09-0710-1/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are still lots of outdated headers, so time for another round of updates. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #22548 from nextcloud/bugfix/noid/improved_status_cleanupRoeland Jago Douma2020-09-071-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Improved status cleanup
| * | | | | Always use IUserStatus constsGeorg Ehrke2020-09-071-0/+6
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #22589 from ↵blizzz2020-09-071-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/bugfix/noid/allow-additional-personal-settings-via-normal-registration Allow additional personal settings via normal registration
| * | | | Allow additional personal settings via normal registrationJoas Schilling2020-09-041-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-09-072-34/+52
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2020-09-062-0/+8
| | | | |
* | | | | Merge pull request #22597 from ↵Roeland Jago Douma2020-09-041-10/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/techdebt/noid/allow-to-di-the-settings-manager Add missing alias for OCP\Settings\IManager and deprecate the old one
| * | | | | Add missing alias for OCP\Settings\IManager and deprecate the old oneJoas Schilling2020-09-041-10/+3
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #17456 from ↵John Molakvoæ2020-09-042-11/+32
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | brad2014/feature/brad2014/12391-improve-imip-mail-message-take-2
| * | | | Minor cleanup: php-cs-fixer, tests, interface consistencyBrad Rubenstein2020-09-022-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMipPlugin.php Removed blank lines to make php-cs-fixer happy. Minor cleanup: bugs found by Psalm static checker IEMailTemplate: The public interface to addBodyListItem also needs to include the new plainIndent parameter. IMipPlugin: Fixes an undefined variable for events that do not have DTEND. Also use explicit string conversion for parameters and properties in several places. The new email template adds an additional blank line before "button" links in plain text, so the tests were fixed to include that additional blank line. Signed-off-by: Brad Rubenstein <brad@wbr.tech>
| * | | | iMIP email improvements (take 2)brad20142020-08-201-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR is a replacement for PR #17195. It is intended to be simpler to review and approve, with fewer changes, some disabled by default. It addresses issues #12391 and #13555, with the following changes: - The plainText of iMIP emails has been upgraded as described in issue #12391. The HTML design style has not been changed. - Some of the HTML and plainText content has been rearranged (simplified header language, moving the event title to from text body to the first item in the bullet list, spelling corrections, moving the description to the end of the list), per issue #12391. - The interface for EMailTemplate has been extended: addBodyListItem now takes an optional `plainIndent` parameter. Existing callers see no change. Where new calls set the new parameter >0, the list item label (metaInfo) is put in column 1, and the value is indented into column 2 (properly accounting for multiple lines, if any). - An optional dav config setting has been added, `invitation_list_attendees`. It defaults to 'no', leaving emails unchanged. If set by the site admin to 'yes', then iMIP emails include, for the organizer and each attendee, their name, email, and a ✔︎ if they have accepted the invitation. - Minor refactoring. Notes: - The labels for organizers and attendees list items are new, and require translation/localization. - Dav config settings are documented in the code, but not in the Administrator's Guide. Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
* | | | | Merge pull request #22550 from ↵Joas Schilling2020-09-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/13556/use-correct-root-when-compiling-scss Use the correct root to determinate the webroot for the resource
| * | | | | Use the correct root to determinate the webroot for the resourceJoas Schilling2020-09-021-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since all the compiled routes are based on the server webroot, we have to use this, independent from which app this belongs to. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-09-042-4/+4
| | | | |
* | | | | Fix app password updating out of boundsRoeland Jago Douma2020-09-035-0/+60
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When your password changes out of bounds your Nextcloud tokens will become invalid. There is no real way around that. However we should make sure that if you successfully log in again your passwords are all updates * Added event listener to the PostLoggedInEvent so that we can act on it - Only if it is not a token login * Make sure that we actually reset the invalid state when we update a token. Else it keeps being marked invalid and thus not used. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #22423 from nextcloud/bugfix/noid/direct-editing-encryptionRoeland Jago Douma2020-09-012-6/+37
|\ \ \ \ | | | | | | | | | | Do not expose direct editing if no master key is available
| * | | | Do not expose direct editing if no master key is availableJulius Härtl2020-09-012-6/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Only disable zip64 if the size is knownRoeland Jago Douma2020-09-011-1/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else we might run into the issue that for an external storage where the size is not known yet we do not use zip64. Which then of course fails on large zip files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #22116 from ↵Roeland Jago Douma2020-09-012-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/transfer-ownership-share-root Fix share transfer of single files and on the transfered node
| * | | | Transfer shares of the transferred root nodeJulius Härtl2020-08-312-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #16632 from nextcloud/bugfix/external-reshareRoeland Jago Douma2020-09-011-5/+1
|\ \ \ \ \ | | | | | | | | | | | | Set proper root path for single file shares originating from other storages
| * | | | | trim slashesRobin Appelman2020-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Set proper root path for single file shares originating from other storagesJulius Härtl2020-08-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #22514 from nextcloud/fix/s3/only_delete_new_failedRoeland Jago Douma2020-08-311-7/+27
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix S3 error handling
| * | | | | Only update the filecache entry once the file has been written to S3Roeland Jago Douma2020-08-311-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we already update before we have no way to revert if the upload fails. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Don't lose filecache entry on s3 overwrite errorRoeland Jago Douma2020-08-311-5/+16
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the object store errors we should not always delete the filecache entry. As this might lead to people losing access to their files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | set the mount id before calling storage wrapperRobin Appelman2020-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows the storage wrapper to use the mount id for it's own logic Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #22472 from nextcloud/fix/contacts-interaction-blob-postgresblizzz2020-08-312-1/+8
|\ \ \ \ \ | |/ / / / |/| | | | Fix writing BLOBs to postgres with recent contacts interaction
| * | | | Fix writing BLOBs to postgres with recent contacts interactionChristoph Wurst2020-08-282-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #22476 from nextcloud/setting-sections-uniqueRoeland Jago Douma2020-08-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | ignore duplicate setting sections
| * | | | | ignore duplicate setting sectionsRobin Appelman2020-08-281-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this prevents some 'Section with the same ID already registered' errors in the log also includes an improvement of the error message to make other cases easier to find Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #21288 from lmamane/masterRoeland Jago Douma2020-08-284-5/+21
|\ \ \ \ \ | |_|/ / / |/| | | | Return correct loginname in credentials
| * | | | Return correct loginname in credentials,Lionel Elie Mamane2020-08-204-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even when token is invalid or has no password. Returning the uid as loginname is wrong, and leads to problems when these differ. E.g. the getapppassword API was creating app token with the uid as loginname. In a scenario with external authentication (such as LDAP), these tokens were then invalidated next time their underlying password was checked, and systematically ceased to function. Co-authored-by: kesselb <mail@danielkesselberg.de> for: switch to consistent camelCase Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-08-282-2/+2
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-08-272-4/+4
| | | |
* | | | Merge pull request #22432 from nextcloud/enh/phpdocRoeland Jago Douma2020-08-26228-229/+0
|\ \ \ \ | | | | | | | | | | Add php docs build script
| * | | | Remove @package annotations from public namespaceJulius Härtl2020-08-26222-222/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Remove wrongly annotated package namesJulius Härtl2020-08-266-7/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #22421 from nextcloud/group-folder-quota-warningRoeland Jago Douma2020-08-261-1/+3
|\ \ \ \ \ | | | | | | | | | | | | show better quota warning for group folders and external storage
| * | | | | show better quota warning for group folders and external storageRobin Appelman2020-08-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of showing the generic 'Your storage is full' message, better explain that it's the group folder/external storage that is full Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-08-262-0/+32
|/ / / / /
* | | | | Merge pull request #22359 from nextcloud/fix/noid/flow-leaking-scopeJoas Schilling2020-08-251-0/+10
|\ \ \ \ \ | | | | | | | | | | | | fix possible leaking scope in Flow
| * | | | | fix possible leaking scope in FlowArthur Schiwon2020-08-241-0/+10
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - a configured flow can be brought into consideration, despite its event was not fired - it could either run through - or run into a RuntimeException and killing processing of valid flows Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #22393 from nextcloud/fix/license-headers-20Roeland Jago Douma2020-08-24180-136/+335
|\ \ \ \ \ | |_|/ / / |/| | | | Update the license headers for Nextcloud 20
| * | | | Update the license headers for Nextcloud 20Christoph Wurst2020-08-24180-136/+335
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #21894 from nextcloud/fix-file-quotaJoas Schilling2020-08-241-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | fix: file quota was not applied in all cases