summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12105 from nextcloud/using-resharing-right-to-display-sharesRoeland Jago Douma2018-11-041-6/+8
|\ | | | | Shares are displayed to users with resharing rights
| * revert testsMaxence Lange2018-11-021-5/+7
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * shares are displayed to users with resharing rightsMaxence Lange2018-11-021-11/+11
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | [tx-robot] updated from transifexNextcloud bot2018-11-042-2/+2
| |
* | Merge pull request #12071 from nextcloud/addressbook-uid-check-migrationRoeland Jago Douma2018-11-024-0/+141
|\ \ | | | | | | Addressbook uid check migration
| * | move migrationJohn Molakvoæ (skjnldsv)2018-11-013-13/+17
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | TestsJohn Molakvoæ (skjnldsv)2018-11-011-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Repair registration and autoload bumpJohn Molakvoæ (skjnldsv)2018-11-014-18/+28
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Repair StepJohn Molakvoæ (skjnldsv)2018-11-011-0/+127
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11404 from flokli/sendmail-pathRoeland Jago Douma2018-11-021-1/+5
|\ \ \ | | | | | | | | Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
| * | | Fallback to default path is sendmail can't be foundRoeland Jago Douma2018-11-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the sendmail binary can't be found at all we fallback to the default path. It most likely is not there but then at least a proper error message pops up. Updated the tests to also properly pass. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmailFlorian Klink2018-11-021-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sendmail` can very well be in a path different from `/usr/sbin/sendmail`. We already search `$PATH` at `lib/private/Settings/Admin/Mail.php` to detect whether we want to offer sendmail as a mail transfer method, so let's be consistent and actually initialize `\Swift_SendmailTransport` with this path to sendmail, instead of just hardcoding `/usr/sbin/sendmail`. Signed-off-by: Florian Klink <flokli@flokli.de>
* | | Merge pull request #11875 from ↵Roeland Jago Douma2018-11-021-0/+4
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk Add support for sending the password for a link share by Nextcloud Talk
| * | | Store "sendPasswordByTalk" property of link shares in the databaseDaniel Calviño Sánchez2018-11-021-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #12200 from nextcloud/tech-debt/noid/cleanup-legacy-sharingMorris Jobke2018-11-022-21/+8
|\ \ \ \ | |_|/ / |/| | | Cleanup some unused sharing methods from the old sharing code
| * | | Cleanup some unused sharing methods from the old sharing codeMorris Jobke2018-11-022-21/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #12193 from nextcloud/interface-fulltxtsearch-issue-00002Maxence Lange2018-11-021-3/+79
|\ \ \ \ | | | | | | | | | | +infoBool / +infoInt
| * | | | init some varMaxence Lange2018-11-011-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | +infoBool / +infoIntMaxence Lange2018-11-011-0/+76
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | Merge pull request #12194 from ↵Roeland Jago Douma2018-11-021-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | nextcloud/fix-path-as-dashboard-is-already-imported fix path to DashboardManager, as the class is already imported (minor)
| * | | | fix pathMaxence Lange2018-11-011-1/+1
| |/ / / | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | Merge pull request #11053 from nextcloud/occ-app-update-commandMorris Jobke2018-11-022-0/+2
|\ \ \ \ | | | | | | | | | | occ app update command
| * | | | Add occ app:update commandMichael Gerber2018-11-012-0/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #11844 from nextcloud/multiple-link-sharesMorris Jobke2018-11-015-1/+44
|\ \ \ \ | |_|/ / |/| | | allow to create multiple link shares via share api
| * | | allow to update lables for public link sharesBjoern Schiessle2018-11-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | allow to add labels to sharesBjoern Schiessle2018-11-015-1/+43
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cronMorris Jobke2018-11-012-58/+9
|\ \ \ \ | |_|/ / |/| | | Revert "Wait for cron to finish before running upgrade command"
| * | | Revert "Wait for cron to finish before running upgrade command"Morris Jobke2018-11-012-58/+9
| | |/ | |/| | | | | | | | | | | | | This reverts commit 18e9631810ad1d3d72c2b4bbee330169808108ad. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12152 from ↵Morris Jobke2018-11-011-2/+3
|\ \ \ | |/ / |/| | | | | | | | brad2014/bugfix/12151/fix-emailtemplate-list-formatting Fix issue #12151: fix list formatting by correcting malformed html
| * | Fix bug #12151: fix list formatting by correcting malformed htmlbrad20142018-10-301-2/+3
| |/ | | | | | | Signed-off-by: Brad Rubenstein <brad@wbr.tech>
* | fix writeStream for jail wrapperRobin Appelman2018-10-312-0/+18
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | allways fall back to fopen for encryption wrapperRobin Appelman2018-10-312-1/+25
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Update autoloaderRoeland Jago Douma2018-10-312-0/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | extend storage api to allow directly writing a stream to storageRobin Appelman2018-10-315-23/+173
| | | | | | | | | | | | | | | | | | | | | | this removes the need for temporary storages with some external storage backends. The new method is added to a separate interface to maintain compatibility with storage backends implementing the storage interface directly (without inheriting common) Currently the interface is implemented for objectstorage based storages and local storage and used by webdav uploads Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #12166 from nextcloud/feature/limit_preview_sizesRoeland Jago Douma2018-10-311-7/+11
|\ \ | | | | | | Only generate previews in powers of 4 and set min
| * | Only generate previews in powers of 4 and set minRoeland Jago Douma2018-10-311-7/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we'd round up all preview request to their nearest power of two. This resulted still in a lot of possible images. Generating a lot of server load and taking up a lot of space. This moves it to previews to be powers of 4: 64, 256, 1024 and 4096 Also the first two powers are always skipped (4, 16) as it doesn't make sense to generate previews for that. We cache preview pretty agressively and I feel this is a better tradeoff. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | missing typeMaxence Lange2018-10-311-2/+2
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | wrong method calledMaxence Lange2018-10-311-1/+1
|/ | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* Merge pull request #12047 from nextcloud/interfaces-files-fulltextsearchRoeland Jago Douma2018-10-303-0/+114
|\ | | | | Public interfaces Files_FullTextSearch
| * +files_fulltextsearch in autoloaderMaxence Lange2018-10-302-0/+2
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * Merge remote-tracking branch 'origin/interfaces-files-fulltextsearch' into ↵Maxence Lange2018-10-301-0/+112
| |\ | | | | | | | | | | | | interfaces-files-fulltextsearch Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| | * implementing files_fulltextsearch within coreMaxence Lange2018-10-251-0/+112
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | Merge pull request #12140 from nextcloud/fix/expired_token_throttlerRoeland Jago Douma2018-10-308-5/+19
|\ \ \ | |/ / |/| | Expired tokens should not trigger bruteforce protection
| * | Error out early on an expired tokenRoeland Jago Douma2018-10-301-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12131 If we hit an expired token there is no need to continue checking. Since we know it is a token. We also should not register this with the bruteforce throttler as it is actually a valid token. Just expired. Instead the authentication should fail. And buisness continues as usual. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move ExpiredTokenException to the correct namespaceRoeland Jago Douma2018-10-307-4/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #12056 from nextcloud/interfaces-fulltextsearch-2Roeland Jago Douma2018-10-3020-0/+4135
|\ \ \ | |/ / |/| | Public interfaces FullTextSearch
| * | public interfaces FullTextSearchMaxence Lange2018-10-3020-0/+4135
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> -@return mixed Signed-off-by: Maxence Lange <maxence@artificial-owl.com> Merge remote-tracking branch 'origin/interfaces-fulltextsearch-2' into interfaces-fulltextsearch-2 Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidationRoeland Jago Douma2018-10-303-19/+85
|\ \ \ | | | | | | | | Sharing user consolidation
| * | | Fix injection to get the user idJulius Härtl2018-10-301-4/+7
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add uuid/name entry to Remote/MailPlugin testsJulius Härtl2018-10-301-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>