wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
49430 commits 157 branches 562 tags 714 MiB
Commit graph

49430 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
158ca6f03c
Merge pull request #16444 from nextcloud/backport/16440/stable16 
[stable16] Fix File#putContents(string) on ObjectStorage
 2019-07-18 08:08:54 +02:00
Nextcloud bot
a6bf6a61e8
[tx-robot] updated from transifex 2019-07-18 02:15:01 +00:00
Marcel Klehr
21822512dc Fix File#putContents(string) on ObjectStorage 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
 2019-07-17 20:39:24 +00:00
Morris Jobke
7e954ebca0
Merge pull request #16437 from nextcloud/backport/16151/stable16 
[stable16] Update operationprogressbar.js
 2019-07-17 17:33:42 +02:00
James Lao
ee2c5d1e16 Update operationprogressbar.js 
To fix issue #16137

Signed-off-by: james.lao@gmail.com <james.lao@gmail.com>
 2019-07-17 10:48:50 +00:00
Roeland Jago Douma
eaf4147f71
Merge pull request #16432 from nextcloud/backport/16424/stable16 
[stable16] Do not keep searching for recent
 2019-07-17 09:20:40 +02:00
Roeland Jago Douma
8e6ac9d678 Do not keep searching for recent 
If userA has a lot of recent files. But only shares 1 file with userB
(that has no files at all). We could keep searching until we run out of
recent files for userA.

Now assume the inactive userB has 20 incomming shares like that from
different users. getRecent then basically keeps consuming huge amounts
of resources and with each iteration the load on the DB increases
(because of the offset).

This makes sure we do not get more than 3 times the limit we search for
or more than 5 queries.

This means we might miss some recent entries but we should fix that
separatly. This is just to make sure the load on the DB stays sane.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-17 05:47:57 +00:00
Nextcloud bot
26971af51d
[tx-robot] updated from transifex 2019-07-17 02:15:40 +00:00
Morris Jobke
c440b64d26
Merge pull request #16425 from nextcloud/backport/16423/stable16 
[stable16] Only prevent disabling encrytion via the API
 2019-07-16 21:09:34 +02:00
Joas Schilling
69ed33b4d6 Only prevent disabling encrytion via the API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-16 17:43:52 +00:00
Morris Jobke
ef25d464a4
Merge pull request #16414 from nextcloud/backport/15606/stable16 
[stable16] Add catch for RuntimeException
 2019-07-16 13:34:08 +02:00
Morris Jobke
f7a6f4527e Log RuntimeException in CleanupCardDAVPhotoCache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-16 06:06:01 +00:00
Daniel Kesselberg
c208ea49d4 Add catch for RuntimeException 
getDirectoryListing can throw a NotFoundException or a RuntimeException.
The repair step should be skipped if the cache directory is missing so
a catch for both exceptions is required.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-16 06:06:01 +00:00
Nextcloud bot
988df2d2e9
[tx-robot] updated from transifex 2019-07-16 02:14:56 +00:00
Morris Jobke
e945e3bf6f
Merge pull request #16405 from nextcloud/backport/16400/stable16 
[stable16] addsubtag should push to array
 2019-07-15 10:19:17 +02:00
Maxence Lange
89f3df067f addsubtag should push to array 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-07-15 06:45:58 +00:00
Nextcloud bot
ae67ece59c
[tx-robot] updated from transifex 2019-07-15 02:14:38 +00:00
Nextcloud bot
659d684a7e
[tx-robot] updated from transifex 2019-07-14 02:15:14 +00:00
Nextcloud bot
45e0398379
[tx-robot] updated from transifex 2019-07-13 02:14:26 +00:00
Nextcloud bot
96875d4a20
[tx-robot] updated from transifex 2019-07-12 02:15:09 +00:00
Morris Jobke
c3f8077831
Merge pull request #16352 from nextcloud/dependabot/npm_and_yarn/stable16/lodash-4.17.13 
[Security] Bump lodash from 4.17.11 to 4.17.13
 2019-07-11 12:53:14 +02:00
dependabot-preview[bot]
e603c734eb
Merge pull request #16341 from nextcloud/dependabot/npm_and_yarn/stable16/lodash.merge-4.6.2 2019-07-11 09:21:02 +00:00
dependabot-preview[bot]
1b20a7daf3 [Security] Bump lodash from 4.17.11 to 4.17.13 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-07-11 06:49:23 +00:00
dependabot-preview[bot]
19cf6277ad
[Security] Bump lodash.merge from 4.6.1 to 4.6.2 
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 06:48:46 +00:00
Roeland Jago Douma
006e2b4dda
Merge pull request #16338 from nextcloud/dependabot/npm_and_yarn/stable16/lodash.mergewith-4.6.2 
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2
 2019-07-11 08:47:21 +02:00
Nextcloud bot
ef903785ac
[tx-robot] updated from transifex 2019-07-11 02:14:38 +00:00
dependabot-preview[bot]
640898928e
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 22:24:46 +00:00
Roeland Jago Douma
9a54a0cb02
Merge pull request #16330 from nextcloud/backport/16323/stable16 
[stable16] Use HTTP1.1 to read S3 objects
 2019-07-10 21:09:15 +02:00
Roeland Jago Douma
73e1fef0a3
Merge pull request #16325 from nextcloud/backport/16308/stable16 
[stable16] Prevent undefined offset 0 in findByUserIdOrMail
 2019-07-10 15:27:12 +02:00
Roeland Jago Douma
b62b835f6c Use HTTP1.1 to read S3 objects 
Some of the READs otherwise use HTTP/1.0 which is not always supported
by all backends. HTTP/1.1 is there since 1999 way longer than S3 so safe
to assume it is always there IMO.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-10 13:20:38 +00:00
Daniel Kesselberg
c885ef3991 Return first value from $users 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-10 10:18:03 +00:00
Nextcloud bot
9c2074fb53
[tx-robot] updated from transifex 2019-07-10 02:14:09 +00:00
Morris Jobke
ecf60b59ef
Merge pull request #16254 from nextcloud/backport/16208/stable16 
[stable16] Always set the display name for user shares
 2019-07-09 14:44:01 +02:00
Morris Jobke
185087e9bc
Merge pull request #16303 from nextcloud/version/noid/16.0.3 
16.0.3
 2019-07-09 13:50:40 +02:00
Morris Jobke
bc29891423
16.0.3 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-09 09:53:08 +02:00
Roeland Jago Douma
7224caaf93
Merge pull request #16297 from nextcloud/backport/16288/stable16 
[stable16] Try to delete the cypress folder of the viewer app
 2019-07-09 08:52:06 +02:00
Nextcloud bot
533fc0f454
[tx-robot] updated from transifex 2019-07-09 02:13:56 +00:00
Roeland Jago Douma
6e319dd4db
Merge pull request #16249 from nextcloud/backport/16170/stable16 
[stable16] fix permissions for drag-n-drop uploads
 2019-07-08 20:44:23 +02:00
Morris Jobke
ac3cc7829f Try to delete the cypress folder of the viewer app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-08 17:19:34 +00:00
John Molakvoæ
3ffd5b0a14
[stable16] Properly load permissions in showActions (#16282) 
[stable16] Properly load permissions in showActions
 2019-07-08 09:38:45 +02:00
Nextcloud bot
99b5b337eb
[tx-robot] updated from transifex 2019-07-08 02:13:53 +00:00
Julius Härtl
57688ce673 Properly load permissions in showActions 
When setViewerMode(false) is called, the permissions should be fetched from the available dirInfo

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-07-07 18:21:05 +00:00
Nextcloud bot
7524f18305
[tx-robot] updated from transifex 2019-07-07 02:14:21 +00:00
John Molakvoæ
4cebe07bb7
[stable16] dont use part files for dav writes when the target… (#16223) 
[stable16] dont use part files for dav writes when the target folder doesn't have create permissions
 2019-07-06 08:48:58 +02:00
Nextcloud bot
7028cfffe8
[tx-robot] updated from transifex 2019-07-06 02:13:51 +00:00
Julius Härtl
662fd359f5 Always set the display name for user shares 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-07-05 12:53:45 +00:00
Roeland Jago Douma
aaea7c9146
Merge pull request #16244 from nextcloud/backport/16241/stable16 
[stable16] Fix redirect after rescanFailedIntegrityCheck to "Overview" page
 2019-07-05 14:42:55 +02:00
Robin Appelman
1a16ede0b2 fix permissions for drag-n-drop uploads 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-07-05 10:23:47 +00:00
Sven Strickroth
cabccd160b Fix redirect after rescanFailedIntegrityCheck to "Overview" page 
The link of the rescanFailedIntegrityCheck link is on the sub page "Overview". After clicking the link, the user is, however, redirected to the "Basic settings" page.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2019-07-05 08:22:56 +00:00
Nextcloud bot
047fda6a81
[tx-robot] updated from transifex 2019-07-05 02:14:17 +00:00