summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [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>
* | [tx-robot] updated from transifexNextcloud bot2017-08-254-2/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-244-42/+132
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-224-2/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-202-80/+80
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-182-0/+2
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-172-0/+2
|
* Merge pull request #6130 from nextcloud/cleanup-unused-methodsMorris Jobke2017-08-164-5/+5
|\ | | | | Cleanup unused methods
| * Cleanup unused methodsMorris Jobke2017-08-154-5/+5
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-errorLukas Reschke2017-08-151-5/+21
|\ \ | |/ |/| Catch exceptions on error of cloud id resolution
| * Catch exceptions on error of cloud id resolutionJoas Schilling2017-08-141-5/+21
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6123 from nextcloud/cleanup-shareItemMorris Jobke2017-08-154-8/+8
|\ \ | | | | | | Cleanup usage of shareItem in internal code base
| * | Cleanup usage of shareItem in internal code baseMorris Jobke2017-08-154-8/+8
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Use proper methods for registerBackendMorris Jobke2017-08-152-3/+3
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / Cleanup unused methodsMorris Jobke2017-08-151-63/+0
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-08-122-0/+2
|
* Add unit testsRoeland Jago Douma2017-08-104-16/+437
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Remove old code + add MiddlewareRoeland Jago Douma2017-08-105-125/+96
| | | | | | | * Add proper middleware for shareinfo * Remove old shareinfo routes Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Move shareinfo over to proper controllerRoeland Jago Douma2017-08-102-1/+137
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2017-08-102-0/+2
|
* Fix files_sharing CacheTestsRoeland Jago Douma2017-08-091-2/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2017-08-0948-48/+0
|
* Logo claim is not used anymoreMorris Jobke2017-08-021-1/+0
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #5920 from nextcloud/gallery-share-view-fixMorris Jobke2017-08-021-2/+2
|\ | | | | Top bar buttons in share view are wrong positioned
| * Change id to class in the main share templateMarin Treselj2017-07-311-2/+2
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Merge pull request #4790 from nextcloud/fix-comparisons-in-appsMorris Jobke2017-08-025-10/+10
|\ \ | | | | | | Fix comparisons in apps
| * | Fix comparisons in the sharing appJoas Schilling2017-08-015-10/+10
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Remove explicit type hints for ControllerLukas Reschke2017-08-012-4/+4
| | | | | | | | | | | | | | | | | | This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #5877 from nextcloud/typehint_middlewareMorris Jobke2017-08-012-8/+10
|\ \ \ | |/ / |/| | Prop argument type for Middleware
| * | Fix middleware implementations signaturesRoeland Jago Douma2017-07-312-8/+10
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #5897 from nextcloud/add-share-mail-for-user-shareRoeland Jago Douma2017-08-012-2/+2
|\ \ \ | | | | | | | | Send an email once a file/folder is shared with a user
| * | | Disable default activity email for incoming sharesMorris Jobke2017-07-312-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-016-6/+8
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-07-302-0/+14
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-07-294-4/+6
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-07-272-118/+98
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-264-0/+4
|
* [tx-robot] updated from transifexNextcloud bot2017-07-254-6/+10
|
* Some app fixes of phpstorm inspectionsRoeland Jago Douma2017-07-2416-37/+26
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2017-07-2422-0/+22
|
* [tx-robot] updated from transifexNextcloud bot2017-07-232-114/+198
|
* Merge pull request #5827 from nextcloud/improve-public-share-headerMorris Jobke2017-07-222-4/+16
|\ | | | | Add filename and sharer in public page
| * Add filename and sharer in public pageMorris Jobke2017-07-212-4/+16
| | | | | | | | | | | | | | | | * shows the filename and sharer on the public page * allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting * remove link on logo that redirects to login (fixes #5720) Signed-off-by: Morris Jobke <hey@morrisjobke.de>