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

8486 commits

Author SHA1 Message Date
Morris Jobke
0da6f6b356
Merge pull request #9371 from nextcloud/bugfix/7444 
Cache is not part of the quota
 2018-05-07 10:11:04 +02:00
Morris Jobke
fb296342b9
Merge pull request #9387 from nextcloud/getcachentry-lock 
remove unneeded locks in getCacheEntry
 2018-05-04 14:57:09 +02:00
Robin Appelman
734aec1522
remove unneeded locks in getCacheEntry 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-04 12:51:41 +02:00
Morris Jobke
2780bb0b2b
Merge pull request #9364 from nextcloud/log-invalid-storage 
Log mount and storage issues in getFileInfo
 2018-05-04 12:01:33 +02:00
Morris Jobke
3f2a5c9335
Merge pull request #9290 from nextcloud/streams-0.6.1 
Use better way to determine stream type in stream wrapper
 2018-05-03 17:15:02 +02:00
Morris Jobke
fb9cb6d4c6
Merge pull request #9373 from nextcloud/bugfix/8929/actual_fetch_version 
Get correct version of an app
 2018-05-03 16:45:18 +02:00
Roeland Jago Douma
f7b518fdbf
Get correct version of an app 
Related to #8929

We should get the version of the app. Not of the appfolder. Else there
is no way to properly compare the versions.

Now note that installing in 1 go will still fail. But at least on the
next page load the new version will be properly detected.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-03 08:22:03 +02:00
Roeland Jago Douma
f2d05120b4
Cache is not part of the quota 
Fixes #7444

Since the quota is calculated on the files. We should allow apps etc to
store temp stuff in the <user>/cache

Else users can't upload avatars for example.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 21:46:28 +02:00
Roland Tapken
6270a01cab
Issue #9318: catch exceptions in SCSSCacher::resetCache() 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-05-02 21:23:13 +02:00
Morris Jobke
2aa108000c
Merge pull request #9293 from nextcloud/feature/9166/custom-auditlogfile 
option for a seperate audit log file
 2018-05-02 16:16:28 +02:00
Robin Appelman
d71783fb93
Log mount and storage issues in getFileInfo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-02 15:11:59 +02:00
Roeland Jago Douma
dfe6d65410
Merge pull request #9310 from nextcloud/bugfix/noid/allow-to-inject-collaboration-search-result 
Allow to inject ISearchResult
 2018-05-02 09:45:25 +02:00
Roeland Jago Douma
db96b0bb0b
Make it possible to make external storages read only 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:18:56 +02:00
Robin Appelman
57ba18f47f
Use better way to determine stream type in encryption stream wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-01 15:06:21 +02:00
Morris Jobke
7306d30708
Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_at_root 
Actually return the root folder when traversing up the tree
 2018-04-27 13:59:29 +02:00
Arthur Schiwon
aff5fe68b3
use SystemConfig, less dependencies, and not publicly needed 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 23:54:11 +02:00
Roeland Jago Douma
a0e038f912
generateTokenFromCache is only valid for V3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:51:05 +02:00
Roeland Jago Douma
7318882357
json_decode an associative array for the swift cached token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:47:47 +02:00
Roeland Jago Douma
235e3480e6
Actually return the root folder when traversing up the tree 
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:04:19 +02:00
Joas Schilling
f5b143e318
Allow to inject ISearchResult 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-26 12:19:15 +02:00
Arthur Schiwon
b841a477c6
log to $datadir/audit.log by default and add rotation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
5751788282
add missing php doc and type hints 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
a21a5bc4ec
improve Syslog a little 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
0e6a317516
revert Log's dependency to SystemConfig to work during Installation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
69592408c4
move IFileBased to public namespace, logreader needs it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:52 +02:00
Arthur Schiwon
cfc3ab0119
offer API to create own File log. admin_audit makes use of it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:52 +02:00
Arthur Schiwon
5fbf184134
destaticfy Log classes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:00:06 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Morris Jobke
b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced 
Add option for header logo and favicon in theming app
 2018-04-25 08:47:14 +02:00
Roeland Jago Douma
81f71cb1f9
Numeric only uids are no fun 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 14:23:50 +02:00
Roeland Jago Douma
074a0e0665
Cast retrieved DB fields to string 
Fixes #9279

If a pure numerical user is in the DB the value might be casted to a int
when returned. Cast it all to a string so we don't break the strict
typing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 12:48:52 +02:00
Roeland Jago Douma
1ceb081c9b
Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 
Swift v3 requires setting a scope
 2018-04-24 09:49:27 +02:00
Roeland Jago Douma
ba71918ad2
Swift v3 requires setting a scope 
Unscoped auth is not guaranteed to return a catalog. So require the
scope to be set properly.

See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 19:34:09 +02:00
Daniel Calviño Sánchez
9b150001ff
Merge pull request #9272 from nextcloud/bugfix/noid/save-a-query-help-saving-the-world 
Only query last comment info, when there is one
 2018-04-23 16:43:09 +02:00
Joas Schilling
05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable 
Fix undefined variable - found by Phan
 2018-04-23 15:51:15 +02:00
Roeland Jago Douma
961b27eeb0
Convert group Database backend 
This now uses the new interfaces

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 14:39:30 +02:00
Morris Jobke
4fd697e733
Remove a check for an unused variable 
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:53:48 +02:00
Joas Schilling
446efa4625
Only query last comment info, when there is one 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-23 11:50:30 +02:00
Morris Jobke
431ccb6386
Fix undefined variable - found by phan 
Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:34:41 +02:00
Morris Jobke
67dcff7a1f
Fix undefined variable - found by Phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:30:22 +02:00
Roeland Jago Douma
0ed6f9c2da
Merge pull request #9129 from nextcloud/feature/noid/proper-comments-offset 
Add proper comment offset support
 2018-04-22 20:47:30 +02:00
Roeland Jago Douma
9f4e928c0f
Merge pull request #9225 from nextcloud/bugfix/9157/ipv6-database-host 
Allow IPv6 database hosts
 2018-04-22 20:43:29 +02:00
Julius Härtl
272b392cac
Move to more generic image handling and add extra images 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Joas Schilling
5157349b69
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 17:10:03 +02:00
Joas Schilling
78ee3abb78
Move regex to a function and add tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 12:49:36 +02:00
Roeland Jago Douma
a0028a2a5f
Allow to skip retrieving from cache in the DiscoveryService 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-18 19:18:34 +02:00
Joas Schilling
8f7a0af951
Allow IPv6 database hosts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 14:48:21 +02:00
Joas Schilling
f50abde7ac
Add proper comment offset support 
The offset is based on the last known comment instead of limit-offset,
so new comments don't mess up requests which get the history of an object-

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 14:23:15 +02:00
Robin Appelman
f399e1591f
Log classnames of arguments in exception trace 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-17 13:46:36 +02:00
Robin Appelman
46d0d0cda1
fix appinfo parsing when a single localized option is provided 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-17 11:14:03 +02:00