summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-10-142-0/+38
|
* [tx-robot] updated from transifexNextcloud bot2017-10-102-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2017-10-052-60/+170
|
* Merge pull request #6328 from nextcloud/split-sharees-api-logicblizzz2017-10-042-2123/+88
|\ | | | | Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
| * shareeAPIController unit test clean up and last fixesArthur Schiwon2017-09-262-57/+22
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * remove unused methodArthur Schiwon2017-09-262-43/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * move splitUserRemote unit testsArthur Schiwon2017-09-261-72/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * adapt unit test for ensuring exceptionArthur Schiwon2017-09-261-2/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * split off former searchSharee unit testArthur Schiwon2017-09-261-176/+0
| | | | | | | | | | | | also moves registering default plugins to Server for proper unit testing Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * adjust ShareeAPIController invalid-input search unit testArthur Schiwon2017-09-261-16/+15
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * adjust ShareeAPIController search testArthur Schiwon2017-09-262-32/+22
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * split off getEmail testsArthur Schiwon2017-09-261-244/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * split off getRemote unit testsArthur Schiwon2017-09-261-220/+0
| | | | | | | | | | | | adds two small fixes → they actually work \o/ Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * split off getGroups unit testsArthur Schiwon2017-09-261-392/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * split off getUsers unit testsArthur Schiwon2017-09-261-318/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * allow more than one plugin per share typeArthur Schiwon2017-09-261-0/+2
| | | | | | | | | | | | | | however it does not dedupe (appears too complex/expensive while we don't havve the issue currently) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * don't keep result types hard codedArthur Schiwon2017-09-261-1/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Splits off the logic from sharees endpoint thus making it available fromArthur Schiwon2017-09-261-558/+31
| | | | | | | | | | | | within Nc/via PHP. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2017-09-304-4/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-09-286-38/+182
| |
* | Merge pull request #6599 from nextcloud/fix_2523Morris Jobke2017-09-274-2/+55
|\ \ | |/ |/| Add direct preview link
| * Only have direct preview urls for image filesRoeland Jago Douma2017-09-251-2/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix testsRoeland Jago Douma2017-09-251-1/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add annotationRoeland Jago Douma2017-09-251-0/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * For images we have a preview for use the preview linkRoeland Jago Douma2017-09-252-1/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add direct preview link to single shared image filesRoeland Jago Douma2017-09-251-0/+46
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-09-262-2/+2
| |
* | Merge pull request #6372 from nextcloud/scss-normalizationJohn Molakvoæ2017-09-251-2/+0
|\ \ | |/ |/| Scss normalization
| * Removed unused filter for opacity, fix #6408John Molakvoæ (skjnldsv)2017-09-231-2/+0
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-09-252-2/+2
| |
* | Fix commentMorris Jobke2017-09-211-1/+1
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-09-212-0/+2
|
* Merge pull request #5562 from nextcloud/link-password-styleJoas Schilling2017-09-202-7/+17
|\ | | | | Fix style of link share password input view
| * Fix browser width compatibilityJohn Molakvoæ (skjnldsv)2017-09-191-3/+10
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Move link share password box and button togetherJan-Christoph Borchardt2017-09-171-3/+6
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Add box around link share password box, fix #5560Jan-Christoph Borchardt2017-09-171-1/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-09-172-0/+190
|/
* Merge pull request #6120 from nextcloud/public_upload_share_api_fixblizzz2017-09-042-7/+18
|\ | | | | Public upload share permission handling
| * Update to new test caseRoeland Jago Douma2017-08-161-7/+17
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Public upload share permission handlingRoeland Jago Douma2017-08-161-0/+1
| | | | | | | | | | | | | | | | If you set the permissions on a public share the SHARE permission makes no sense. So instead of throwing a warning. Just filter out the share permission. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6221 from nextcloud/fav_share_api_fixMorris Jobke2017-09-041-2/+2
|\ \ | | | | | | Correctly format OCS response with favorites
| * | Correctly format OCS response with favoritesRoeland Jago Douma2017-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper funtion did not handle the response correctly and basically only returned the last share with tags. This is a simple rewrite. That is still understandable. Loops maybe more than strictly required. But preformance is not the issue here. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-302-12/+12
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-08-292-28/+28
| | |
* | | Merge pull request #6182 from nextcloud/fixes-in-files-drop-jsRoeland Jago Douma2017-08-261-16/+14
|\ \ \ | |/ / |/| | Fixes in files_drop.js
| * | Do not iterate over the filesDaniel Calviño Sánchez2017-08-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As "singleFileUpload" is used the "add" callback (which in turn calls "addFileToUpload") will always be called with a single file. Therefore there is no need to iterate over the files (and it is not done in the other callbacks either, so this aligns the code with the rest of the callbacks). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Replace fileName variable with data.files[0].nameDaniel Calviño Sánchez2017-08-181-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to store the file name, as the "data" parameter given to all the callbacks provides a "files" attribute with all the files that the callback refers to; moreover, it will always be a single file due to the use of "singleFileUploads" in the jQuery File Upload plugin. This also fixes the loading icon not disappearing when several files were uploaded at once. "singleFileUploads" causes the "add" callback to be called once for each file to be uploaded, so "fileName" was overwritten with the name of each new file in the upload set; when "fileName" was later used in the "done" callback to find the file in the list whose loading icon replace with the MIME type icon "fileName" always had the name of the last file, and thus its icon was the only one replaced. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Update the whole file item instead of only its contentsDaniel Calviño Sánchez2017-08-181-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "done" and "fail" callbacks both update the item for the uploaded file using "setFileIcon". "setFileIcon" updates the contents of the "<li>" element for the file, but the "fail" callback was giving "setFileIcon" an element generated by the template, so the resulting HTML contained a "<li>" element nested in another "<li>" element. However, generating the HTML is better done through a template, so the template now receives the icon to show in order to be used by a successful upload and a failed one, and "setFileIcon" was changed to "updateFileItem". Note that the mimeTypeUrl does no longer need to be escaped, as Handlebars templates escape the needed characters automatically. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove "errorThrown" parameterDaniel Calviño Sánchez2017-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | When the "fail" callback is called, "errorThrown" is a property of the data object instead of a parameter. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Fix sorting of entries in Files sidebarJan-Christoph Borchardt2017-08-251-3/+3
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>