summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22333 from nextcloud/backport/22236/stable19Roeland Jago Douma2020-08-215-6/+41
|\ | | | | [stable19] CalDAV: Add ability to limit sharing to owner
| * Add ability to limit sharing to ownerGeorg Ehrke2020-08-205-6/+41
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2020-08-2150-80/+172
|/
* Merge pull request #22227 from nextcloud/version/19.0.2/RC1v19.0.2RC1Morris Jobke2020-08-202-115/+96
|\ | | | | 19.0.2 RC1
| * New bundleRoeland Jago Douma2020-08-131-113/+94
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * 19.0.2 RC1Roeland Jago Douma2020-08-131-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #22309 from nextcloud/backport/22221/stable19-2Morris Jobke2020-08-201-1/+1
|\ \ | | | | | | [stable19] fixing a logged deprecation message
| * | simplified backport of #22221, fixing a deprecation log messageArthur Schiwon2020-08-191-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2020-08-206-2/+6
|/ /
* | Merge pull request #21983 from nextcloud/backport/21628/stable19Morris Jobke2020-08-195-30/+54
|\ \ | | | | | | [stable19] fix moving files from external storage to object store trashbin
| * | fix object store trashbin handlingRobin Appelman2020-07-311-3/+10
| | | | | | | | | | | | | | | | | | object stores are "special" given how they interact with the cache on their own Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | dont update mimetype when moving to trashRobin Appelman2020-07-311-1/+5
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | 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 #22302 from nextcloud/backport/22299/stable19Morris Jobke2020-08-192-2/+10
|\ \ \ | | | | | | | | [stable19] Show disabled user count in occ user:report
| * | | Show disabled user count in occ user:reportMorris Jobke2020-08-192-2/+10
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #22303 from nextcloud/bump/3rdpartyRoeland Jago Douma2020-08-191-0/+0
|\ \ \ \ | | | | | | | | | | Bump 3rdparty to last stable19 commit
| * | | | Bump 3rdparty to last stable19 commitJoas Schilling2020-08-191-0/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #22239 from nextcloud/backport/22128/stable19Joas Schilling2020-08-192-10/+19
|\ \ \ \ | | | | | | | | | | [stable19] Delete chunks if the move on an upload failed
| * | | | Return proper status when file didn't exist beforeJulius Härtl2020-08-132-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Adjust chunking test for non-existing target nodeJulius Härtl2020-08-131-3/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Delete chunks if the move on an upload failedJulius Härtl2020-08-131-6/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #22300 from nextcloud/backport/22297/stable19Roeland Jago Douma2020-08-192-1/+7
|\ \ \ \ \ | |_|/ / / |/| | | | [stable19] Allow to disable share emails
| * | | | Allow to disable share emailsJoas Schilling2020-08-192-1/+7
|/ / / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2020-08-1926-2/+56
| | | |
* | | | Merge pull request #22252 from nextcloud/update-3rdparty/stable19Roeland Jago Douma2020-08-181-0/+0
|\ \ \ \ | | | | | | | | | | [3rdparty] Doctrine: Fix unquoted stmt fragments backslash escaping
| * | | | [3rdparty] Doctrine: Fix unquoted stmt fragments backslash escapingMorris Jobke2020-08-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for https://github.com/nextcloud/server/pull/22118 - already in master because there doctrine/dbal:2.10.2 is used Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-08-1830-54/+116
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2020-08-1712-22/+38
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-08-1614-0/+14
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2020-08-15146-1252/+1268
| | | |
* | | | Merge pull request #22247 from nextcloud/backport/22243/stable19Morris Jobke2020-08-141-4/+4
|\ \ \ \ | | | | | | | | | | [stable19] Silence duplicate session warnings
| * | | | Silence duplicate session warningsRoeland Jago Douma2020-08-141-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20490 Basically restroring the old behavior. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #21975 from nextcloud/backport/21658/stable19Roeland Jago Douma2020-08-146-1/+162
|\ \ \ \ | | | | | | | | | | [stable19] allow admin to configure the max trashbin size
| * | | | allow admin to configure the max trashbin sizeRobin Appelman2020-07-236-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows an admin to configure the max trashbin size instead of always relying on the users quota. The trashbin size can be configured using the `occ trash:size` command and can be set both globally and per-user Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-08-14262-690/+906
| |/ / / |/| | |
* | | | Merge pull request #22232 from nextcloud/backport/22217/stable19Morris Jobke2020-08-131-0/+3
|\ \ \ \ | | | | | | | | | | [stable19] Add app config option to disable "Email was changed by admin" activity
| * | | | Add app config option to disable "Email was changed by admin" activityMorris Jobke2020-08-131-0/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #22131 from nextcloud/backport/22062/stable19-take2Roeland Jago Douma2020-08-133-63/+63
|\ \ \ \ | |_|_|/ |/| | | [stable19] fix display of remote users in incoming share notifications
| * | | Short php syntaxJoas Schilling2020-08-061-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix missing placeholders in translationsJoas Schilling2020-08-061-7/+11
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | effectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10nArthur Schiwon2020-08-061-13/+4
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | coding style fixesArthur Schiwon2020-08-062-37/+38
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | fix check for Cloud ID, missing return statements, wrong param useArthur Schiwon2020-08-061-9/+13
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #22121 from nextcloud/backport/22008/stable19Roeland Jago Douma2020-08-132-3/+8
|\ \ \ \ | | | | | | | | | | [stable19] Ensured large image is unloaded from memory when generating previews
| * | | | Use class that actually has the destroy() method in preview generatorMorris Jobke2020-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | fix memory leak caused by not destroying image in Preview/Generate.phpElijah Martin-Merrill2020-08-052-3/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Elijah Martin-Merrill <elijah@nyp-itsours.com>
* | | | | Merge pull request #22181 from nextcloud/backport/21775/stable19Roeland Jago Douma2020-08-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [stable19] Do not exit if available space cannot be determined on file transfer