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

43491 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Roeland Jago Douma
b3e7865d9b
Dav endpoint returns proper data 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 10:35:37 +02:00
Roeland Jago Douma
5c6d3b4f41
Request a direct link 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 10:35:37 +02:00
Roeland Jago Douma
f984664bee
First step of DAV endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 10:35:37 +02:00
Roeland Jago Douma
9ab5b6a4f1
Add DB mapping 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 10:35:37 +02:00
Roeland Jago Douma
b0c801c764
Add directdownload table 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 10:35:37 +02:00
Nextcloud bot
12c5db9032
[tx-robot] updated from transifex 2018-04-26 00:12:10 +00:00
Roeland Jago Douma
c625fc5931
Add folder for trashbin 
The trashbin home now contains 2 entries restore and trash.

Made all files strict. Added more types.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-25 20:25:10 +02:00
Roeland Jago Douma
dadc740db5
Use getType to determine type of entry 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-25 20:25:10 +02:00
Roeland Jago Douma
d5937e0fd6
Add propfind properties to trashbin 
* get original filename (without the weird timestamp)
* get original location

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-25 20:25:10 +02:00
Roeland Jago Douma
cb617c4949
Add special restore folder 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-25 20:25:10 +02:00
Roeland Jago Douma
f7ca6149d6
Emptry trashbin 
A delete on a users trashbin will empty it (the trashbin won't be
deleted of course)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-25 20:25:10 +02:00
Roeland Jago Douma
09940bcde6
List trashbin in DAV 
First steps for #1332

* Add a new DAV collection
* List all files in the trashbin for this user
* Deleting files from trashbin
* Get files from trashbin (just read)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-25 20:25:10 +02:00
Morris Jobke
9c64a203e3
Merge pull request #9256 from nextcloud/fed-sharing-improvements 
improve error reporting and move format parameter to the options
 2018-04-25 15:49:30 +02:00
Bjoern Schiessle
0e0cfa0fa1
improve error reporting and move format parameter to the options 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-25 13:53:56 +02:00
Morris Jobke
5a4a0add3c
Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-api 
Migrate groups fetch to ocs api
 2018-04-25 13:45:35 +02:00
Morris Jobke
c907b68842
Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_api 
Make ShareesAPIController strict
 2018-04-25 11:53: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