summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update icewind/streams to 0.6.1Robin Appelman2018-05-011-0/+0
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #9178 from nextcloud/feature/9142/directdownloadMorris Jobke2018-05-0118-2/+1239
|\ | | | | Add directdownload endpoint
| * Improve the directContollerRoeland Jago Douma2018-04-262-15/+169
| | | | | | | | | | | | | | | | * 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>
| * Add tests for DirectFile and DirectHomeRoeland Jago Douma2018-04-263-1/+315
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Throttle requests to unknown tokensRoeland Jago Douma2018-04-263-5/+28
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add backgroundjob to cleanup expired direct linksRoeland Jago Douma2018-04-265-2/+74
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Check if a direct link is expiredRoeland Jago Douma2018-04-262-21/+31
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add directDownload support of storageRoeland Jago Douma2018-04-262-12/+16
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * No listingRoeland Jago Douma2018-04-261-12/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Dav endpoint returns proper dataRoeland Jago Douma2018-04-265-15/+90
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Request a direct linkRoeland Jago Douma2018-04-262-5/+53
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * First step of DAV endpointRoeland Jago Douma2018-04-2610-1/+373
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add DB mappingRoeland Jago Douma2018-04-262-0/+93
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add directdownload tableRoeland Jago Douma2018-04-262-1/+81
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9202 from nextcloud/feature/1332/trashbin_davRoeland Jago Douma2018-05-0114-1/+923
|\ \ | | | | | | Trashbin endpoint in DAV
| * | Add folder for trashbinRoeland Jago Douma2018-04-2512-74/+158
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Use getType to determine type of entryRoeland Jago Douma2018-04-253-6/+6
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add propfind properties to trashbinRoeland Jago Douma2018-04-259-10/+131
| | | | | | | | | | | | | | | | | | | | | * get original filename (without the weird timestamp) * get original location Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add special restore folderRoeland Jago Douma2018-04-259-4/+145
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Emptry trashbinRoeland Jago Douma2018-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
| * | List trashbin in DAVRoeland Jago Douma2018-04-2510-1/+577
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-012-0/+2
| | |
* | | Merge pull request #9348 from nextcloud/fix-js-testsJohn Molakvoæ2018-04-301-1/+1
|\ \ \ | | | | | | | | Replace deprecated sinon reset() call with resetHistory()
| * | | Replace deprecated sinon reset() call with resetHistory()Julius Härtl2018-04-301-1/+1
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2018-04-3018-16/+46
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-04-2916-0/+32
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-04-2820-14/+16
| | |
* | | Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logicMorris Jobke2018-04-274-19/+26
|\ \ \ | | | | | | | | Do not add sharePermission logic in JS
| * | | Fix sharedfilelistSpec.js testsRoeland Jago Douma2018-04-261-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Do not add sharePermission logic in JSRoeland Jago Douma2018-04-263-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #9325 from GitHubUser4234/ldap_cloned_connection_nc13fixMorris Jobke2018-04-271-0/+3
|\ \ \ \ | | | | | | | | | | Fix for unbound cloned LDAP connections
| * | | | unbound cloned connection fixRoger Szabo2018-04-271-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | | Merge pull request #9321 from ↵Morris Jobke2018-04-271-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/return_root_folder_when_at_root Actually return the root folder when traversing up the tree
| * | | | | Actually return the root folder when traversing up the treeRoeland Jago Douma2018-04-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #9322 from nextcloud/bugfix/noid/swift_token_cacheMorris Jobke2018-04-271-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Better swift V3 token handling
| * | | | | generateTokenFromCache is only valid for V3Roeland Jago Douma2018-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | json_decode an associative array for the swift cached tokenRoeland Jago Douma2018-04-261-1/+1
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9319 from nextcloud/rakekniven-patch-1Morris Jobke2018-04-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed typo
| * | | | | Fixed typorakekniven2018-04-261-1/+1
| |/ / / /
* / / / / [tx-robot] updated from transifexNextcloud bot2018-04-2756-156/+316
|/ / / /
* | | | Merge pull request #9302 from nextcloud/update-phan-configMorris Jobke2018-04-261-7/+43
|\ \ \ \ | |/ / / |/| | | Improve phan config
| * | | Improve phan configLukas Reschke2018-04-261-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * exclude routes Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #9308 from nextcloud/proper-ocp-constantsMorris Jobke2018-04-2674-298/+412
|\ \ \ \ | |_|_|/ |/| | | Move log constants to ILogger
| * | | move log constants to ILoggerArthur Schiwon2018-04-2674-298/+412
|/ / / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | / [tx-robot] updated from transifexNextcloud bot2018-04-262-0/+2
| |/ |/|
* | Merge pull request #9256 from nextcloud/fed-sharing-improvementsMorris Jobke2018-04-256-89/+25
|\ \ | | | | | | improve error reporting and move format parameter to the options
| * | improve error reporting and move format parameter to the optionsBjoern Schiessle2018-04-256-89/+25
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-apiMorris Jobke2018-04-252-450/+457
|\ \ \ | | | | | | | | Migrate groups fetch to ocs api
| * | | Workflow engine to ocs apiJohn Molakvoæ (skjnldsv)2018-04-251-369/+373
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Settings groups to ocsJohn Molakvoæ (skjnldsv)2018-04-251-81/+84
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>