upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-12 16:39:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
46176 commits 915 branches 1207 tags 7.1 GiB
Commit graph

8950 commits

Author SHA1 Message Date
Daniel Kesselberg
3e1f327ac9 Generate id for navigation item 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:36 +00:00
Daniel Kesselberg
70edd2b633 Parse multiple navigation items 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:36 +00:00
Joas Schilling
06769735b7 Correctly determinate the owner in case of shared external storages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-19 09:29:54 +00:00
Roeland Jago Douma
5b5108fe49
Merge pull request #14196 from nextcloud/backport/14185/stable14 
[stable14] Fix recent files
 2019-02-14 21:22:05 +01:00
Roeland Jago Douma
5330739cec
Merge pull request #14086 from nextcloud/backport/14023/stable14 
[stable14] Fix: Check if `$this->params['user']` is an array
 2019-02-14 19:50:01 +01:00
Roeland Jago Douma
3bc0990749 Filter out versions and trashbin 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 10:27:44 +00:00
Roeland Jago Douma
d97adfe4b1 Loop for the recent search 
Else it might happen that less entries than requested are returned

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 10:27:44 +00:00
Roeland Jago Douma
7dbcddaa2c We need to initialize the storage else the jailed path is always null 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 10:27:44 +00:00
Roeland Jago Douma
cb0b6cedd1 Fix the thorrtler whitelist bitmask 
Before we actually didn't check each bit of the bitmask. Now we do.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-12 07:56:11 +00:00
William Pain
130c094df0 Fix: Check if $this->params['user'] is an array 
Signed-off-by: William Pain <pain.william@gmail.com>
 2019-02-07 13:33:21 +00:00
Christoph Wurst
a7c897b445 Fix typos and unused return values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 19:11:16 +00:00
Bjoern Schiessle
41de36b5d8 fix typo 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 19:11:15 +00:00
Bjoern Schiessle
849ad5a8bb log full exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 19:11:13 +00:00
Bjoern Schiessle
2dcab24f8c handle mail send error gracefully 
log the error in case a notification mail of a new share couldn't
be send to the recipient and finish the share operation successfully

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 19:11:12 +00:00
Roeland Jago Douma
931056e711
Clean pending 2FA authentication on password reset 
When a password is reste we should make sure that all users are properly
logged in. Pending states should be cleared. For example a session where
the 2FA code is not entered yet should be cleared.

The token is now removed so the session will be killed the next time
this is checked (within 5 minutes).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-30 10:43:15 +01:00
Morris Jobke
de2c5350a9 Show proper default locale 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-01-24 07:33:03 +00:00
Morris Jobke
e5af104517
Merge pull request #13741 from nextcloud/backport/13140/stable14 
[stable14] Cache tokens when using swift's v2 authentication
 2019-01-23 15:30:12 +01:00
Robin Appelman
0625d2957c cleanup shared lock if changing to exclusive lock failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 15:13:40 +00:00
Robin Appelman
a5c5a77322 Cache tokens when using swift's v2 authentication 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 14:37:13 +00:00
John Molakvoæ
4b025649c0
[stable15] Fix colorizeSvg with transformations that contain a comma (,) 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-01-17 16:02:21 +01:00
Roeland Jago Douma
50ed420440
Merge pull request #13035 from nextcloud/objectstore-write-exists-14 
[14] upload new files in objectstore to a .part path first
 2019-01-14 11:29:52 +01:00
Joas Schilling
96dab990e7 Don't log parameters on user creation in case of error/exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-10 11:37:41 +00:00
Roeland Jago Douma
df25c44a2d HttpClient getHeader can return empty string 
Fixes #11999

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-08 15:26:32 +00:00
Roeland Jago Douma
17b7a4805a Throttle with correct metadata 
Fixes #13202

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-04 21:22:19 +00:00
Roeland Jago Douma
ce2c08da6a
Merge pull request #12617 from nextcloud/backport/10839/stable14 
[stable14] adjust Calendar resource / room interfaces to use class implementation
 2018-12-22 12:15:05 +01:00
Roeland Jago Douma
73f19a7a4c Use a case insensitive search for email 
Fixes #7084
Now entering wrongly cased email (roeland@ instead of Roeland@) for
password reset etc. Will also work.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 15:19:28 +00:00
Robin Appelman
2c1ab34aca
upload new files in objectstore to a .part path first 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-12 15:48:29 +01:00
Robin Appelman
601f35c337
Add objectExists to objectstore interface 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-12 15:42:06 +01:00
Carsten Wiedmann
571e3c155c
Apply patch from @cwiedmann but drop -oi option for pipe 
* Add sendmailmode to gui
* Add testcases for pipe mode

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-08 17:18:04 +01:00
Julius Härtl
72ab9edb8d
Make sure to always load the latest icons-vars.css file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-12-07 23:30:28 +01:00
Roeland Jago Douma
2d6cfdce58
Merge pull request #12869 from nextcloud/backport/12857/stable14 
[stable14] Emit write update only once on touch
 2018-12-06 08:30:31 +01:00
Roeland Jago Douma
bdd974db3f Emit write update only once on touch 
When a touch is done (i.e. when creating a new file in the node API)
The hooks contain 'write' and 'touch' (and the operation is touch as
well). This would cause a double write update. Which doesn't make sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 21:56:01 +00:00
Roeland Jago Douma
ab31b26b0c Only execute query in propagateChange once 
The second execute statement should be inside the if block. Else it gets
executed twice which makes no sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 20:45:15 +00:00
Roeland Jago Douma
ab8f31b24c Do not update child all child shares on group share update 
Else we overwrite the whole share for link shares. Basically breaking
them.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-04 21:53:35 +00:00
Morris Jobke
316d79b2ae PHP module is named mbstring 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-12-04 17:57:19 +00:00
Peter Kraume
6dbfe24777 Set Referrer-Policy also in addSecurityHeaders() 
Fix: #12689
Signed-off-by: Peter Kraume <peter.kraume@gmx.de>
 2018-11-29 16:48:12 +00:00
Robin Appelman
7ee9781087 Fix folder path containing leading slash when getting mount root by id 
This fixes collabora on public link shared groupfolders

Fixes https://github.com/nextcloud/groupfolders/issues/225

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-28 19:07:51 +00:00
Georg Ehrke
92b264cc09 RoomManager/ResourceManager: Inject IServerContainer instead of using OC Server 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-11-22 22:41:29 +00:00
Georg Ehrke
b0d17266e4 adjust Calendar resource / room interfaces to use class implementation 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-11-22 22:41:28 +00:00
Morris Jobke
ff59905b12
Merge pull request #12540 from nextcloud/backport/12450/stable14 
[stable14] Throw exception if decryption fails
 2018-11-22 14:54:02 +01:00
Roeland Jago Douma
adf1488e4e Bearer tokens are app token 
Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 10:50:21 +00:00
Roeland Jago Douma
40a3937877 Throw exception if decryption fails 
For #11868

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-19 21:26:01 +00:00
Robin Appelman
f43cfd9275
forward object not found error in swift as dav 404 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-19 11:36:33 +01:00
Morris Jobke
db9e1b90f9
Merge pull request #12375 from nextcloud/backport/12284/stable14 
[14] Properly search the root of a shared external storage
 2018-11-13 15:09:24 +01:00
Morris Jobke
ec5c11d284
Fix UniqueConstraintViolationException while insert into oc_file_locks 
* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-13 13:59:24 +01:00
Morris Jobke
442680024f
Fix UniqueConstraintViolationException while insert into oc_filecache 
* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-13 13:59:15 +01:00
Roeland Jago Douma
b71bc1289b
Properly search the root of a shared external storage 
Fixes #1020

When an external storage is shared with you in full the root is ''
(empty). This adds an extra check for an empty jail basically.

Because if the jail is on the empty string. It matches all paths.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-09 13:21:45 +01:00
Joas Schilling
f48f43818e
Fix default types of activity event member variables 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 14:14:01 +01:00
Roeland Jago Douma
a46ca94723
Merge pull request #12197 from nextcloud/backport/12188/revert-wait-for-cron 
[stable14] Revert "Wait for cron to finish before running upgrade command"
 2018-11-02 08:21:05 +01:00
Roeland Jago Douma
fd39fba5f7
Merge pull request #12202 from brad2014/stable14 
Fix bug #12151: fix list formatting by correcting malformed html
 2018-11-02 08:20:31 +01:00