Commit Graph

43508 Commits

Author SHA1 Message Date
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
Morris Jobke a56ec1062a
Merge pull request #9346 from nextcloud/techdep/noid/needsPartFile_to_storage
Use an actual function of the storage to determine needsPartFile
2018-05-02 16:03:31 +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
Morris Jobke e9c6ec4b22
Merge pull request #8564 from nextcloud/files_external_read_only
Make it possible to make external storages read only
2018-05-01 23:39:30 +02:00
Roeland Jago Douma ea5393e9f8
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:20:20 +02:00
Roeland Jago Douma 953691abb2
External mount does not get DELETE and UPDATE if readonly
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:18:56 +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
Roeland Jago Douma 055a003661
Use an actual function of the storage to determine needsPartFile
We have a function for it so better to override that. Also because other
codes that might check this should get the right value.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:02:36 +02:00
Morris Jobke f212c692ac
Merge pull request #9178 from nextcloud/feature/9142/directdownload
Add directdownload endpoint
2018-05-01 14:54:44 +02:00
Roeland Jago Douma 7f194be3ab
Merge pull request #9202 from nextcloud/feature/1332/trashbin_dav
Trashbin endpoint in DAV
2018-05-01 14:24:38 +02:00
Nextcloud bot c8cb42fd26
[tx-robot] updated from transifex 2018-05-01 00:11:52 +00:00
John Molakvoæ 49f26d1221
Merge pull request #9348 from nextcloud/fix-js-tests
Replace deprecated sinon reset() call with resetHistory()
2018-04-30 14:54:34 +02:00
Julius Härtl 16865e59dd
Replace deprecated sinon reset() call with resetHistory()
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-30 13:52:58 +02:00
Nextcloud bot b87b0689c5
[tx-robot] updated from transifex 2018-04-30 00:11:48 +00:00
Nextcloud bot a546dcfcb3
[tx-robot] updated from transifex 2018-04-29 00:11:47 +00:00
Nextcloud bot 6ee00a8be5
[tx-robot] updated from transifex 2018-04-28 00:11:58 +00:00
Morris Jobke d8350c69ef
Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logic
Do not add sharePermission logic in JS
2018-04-27 14:01:40 +02:00
Morris Jobke 7102ddad50
Merge pull request #9325 from GitHubUser4234/ldap_cloned_connection_nc13fix
Fix for unbound cloned LDAP connections
2018-04-27 14:01:15 +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
Morris Jobke 21da3594f6
Merge pull request #9322 from nextcloud/bugfix/noid/swift_token_cache
Better swift V3 token handling
2018-04-27 13:51:44 +02:00
Roger Szabo 8637b90e15 unbound cloned connection fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-04-27 17:29:15 +08:00
Morris Jobke 7da1e968f9
Merge pull request #9319 from nextcloud/rakekniven-patch-1
Fixed typo
2018-04-27 09:15:21 +02:00
Nextcloud bot 9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00: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
rakekniven ace2063f21
Fixed typo 2018-04-26 18:12:21 +02:00
Roeland Jago Douma d379770cf2
Fix sharedfilelistSpec.js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 16:34:24 +02:00
Morris Jobke bb82bfac6d
Merge pull request #9302 from nextcloud/update-phan-config
Improve phan config
2018-04-26 13:53:14 +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
Roeland Jago Douma 0771dad57f
Do not add sharePermission logic in JS
We have a dedicated dav property. We should do all the magic in 1 place.
Not several.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 12:14:37 +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 ab7a4b8693
fix dav test
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
Morris Jobke b7e8ab97e7
Merge pull request #9308 from nextcloud/proper-ocp-constants
Move log constants to ILogger
2018-04-26 11:53:21 +02:00
Lukas Reschke 3aaa2307e9
Improve phan config
* exclude routes

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-26 11:51:05 +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
Roeland Jago Douma 1c75ddac45
Improve the directContoller
* Tests
* No directdownload from storage yet (as it is not tested at all)
* No direct links for folders

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:38 +02:00
Roeland Jago Douma d5222d68f0
Add tests for DirectFile and DirectHome
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 392337fa13
Throttle requests to unknown tokens
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma b6c58e75b7
Add backgroundjob to cleanup expired direct links
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 042340ccf6
Check if a direct link is expired
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 6a385dd20b
Add directDownload support of storage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 164d998856
No listing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00