summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7222 from nextcloud/fix-filerow-avatarsblizzz2017-11-274-110/+80
|\ | | | | Fix filerow avatars
| * recycle SharedFileInfo values in fileInfoArthur Schiwon2017-11-231-1/+21
| | | | | | | | | | | | | | | | | | fileInfo is composed of data from sharing, however additional data is pulled when sidebar opens, e.g. the size. Then, existing data is overwritten by data from the other source (files). The data points that would be lost are not dirty however and still used, so we keep them. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * rip out obsolete recipientsDisplayNameArthur Schiwon2017-11-234-98/+20
| | | | | | | | | | | | also needs tests adjustements, and this also brings in natural sorting Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * adjust tests and apply sortingArthur Schiwon2017-11-233-10/+32
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Fix avatars in file rows of incoming sharesArthur Schiwon2017-11-232-0/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix avatars in file rows of outgoing sharesArthur Schiwon2017-11-232-2/+6
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #7246 from william-p/Add_html5_audioplayer_publicLukas Reschke2017-11-271-0/+6
|\ \ | |/ |/| Add HTML5 audio player in public view
| * Add HTML5 audio player in public viewWilliam Pain2017-11-221-0/+6
| | | | | | | | Signed-off-by: William Pain <pain.william@gmail.com>
* | Merge pull request #7137 from nextcloud/shared-jailed-source-rootMorris Jobke2017-11-232-1/+53
|\ \ | |/ |/| Use the correct root for shared jail when the source storage is also a jail
| * Use the correct root for shared jail when the source storage is also a jailRobin Appelman2017-11-102-1/+53
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-11-1112-78/+1192
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-1010-0/+1140
|/
* Merge pull request #7064 from nextcloud/popover-fixRoeland Jago Douma2017-11-081-11/+2
|\ | | | | Fix popover layout
| * Fixed sharing popover and removed unused old codeJohn Molakvoæ (skjnldsv)2017-11-071-11/+2
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-11-082-4/+212
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-072-0/+228
| |
* | Change @georgehrke's emailMorris Jobke2017-11-068-2/+8
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Update license headersMorris Jobke2017-11-0656-26/+222
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-11-0366-122/+578
|
* Merge pull request #6652 from nextcloud/sharing-link-menuJohn Molakvoæ2017-11-024-48/+87
|\ | | | | Move sharing page options to menu in top right
| * Fix Scrutinizer issueJan-Christoph Borchardt2017-11-021-1/+2
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Clicking publicly shared image opens direct preview urlJan-Christoph Borchardt2017-11-012-4/+6
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Directly show linkJan-Christoph Borchardt2017-11-012-9/+8
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Use standard way of showing and hiding popover menuJan-Christoph Borchardt2017-11-012-3/+3
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Fix scrollbar showing up on public pageJan-Christoph Borchardt2017-11-011-1/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Show and hide menu via Javascript, thanks @skjnldsvJan-Christoph Borchardt2017-11-013-2/+24
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Adjust prominence of shared-by info to not overpower file nameJan-Christoph Borchardt2017-11-011-1/+2
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Add label to download actionJan-Christoph Borchardt2017-11-012-1/+4
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Fix display of Download entry textJan-Christoph Borchardt2017-11-013-7/+5
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Move shared page controls to menu in top rightJan-Christoph Borchardt2017-11-012-30/+43
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #6094 from nextcloud/sharedby-avatarJan-Christoph Borchardt2017-11-021-6/+6
|\ \ | | | | | | Show avatar instead of username for shared files
| * | adjust more js unit testsArthur Schiwon2017-11-021-6/+6
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7030 from nextcloud/proper_og_imageRoeland Jago Douma2017-11-011-1/+6
|\ \ \ | | | | | | | | Use the new direct endpoint for the OpenGraph image
| * | | Use the new direct endpoint for the og:imageRoeland Jago Douma2017-10-311-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some providers had issues when using the preview link (since it was double encoded). Now we actually serve the max size preview so it looks better The image isn't cropped anymore so supporting platforms can just embed the whole image. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-0177-245/+475
|\ \ \ | | |/ | |/|
| * | Merge pull request #6875 from nextcloud/app_autoloadersJoas Schilling2017-11-014-10/+11
| |\ \ | | |/ | |/| Move server apps to dedicated autoloader
| | * Files_Sharing AutoloaderRoeland Jago Douma2017-10-244-10/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not error when downloading from a numeric public subfolderRoeland Jago Douma2017-10-301-0/+4
| | | | | | | | | | | | | | | | | | Fixes #6820 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Merge pull request #6976 from nextcloud/fix-checkbox-in-popoverMorris Jobke2017-10-301-16/+0
| |\ \ | | | | | | | | Fix checkboxes on popover
| | * | Share views fixJohn Molakvoæ (skjnldsv)2017-10-261-11/+0
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| | * | Fix checkboxes on popoverJohn Molakvoæ (skjnldsv)2017-10-261-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Use ::class in test mocks of encryption appMorris Jobke2017-10-262-17/+19
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-appMorris Jobke2017-10-262-8/+9
| |\ \ | | | | | | | | Use ::class in test mocks of dav app
| | * | Use ::class in test mocks of dav appMorris Jobke2017-10-262-8/+9
| | |/ | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | [tx-robot] updated from transifexNextcloud bot2017-10-2662-124/+124
| | |
| * | Updated OpenGraph title to display folder name instead of a nextcloud ↵Sascha Sambale2017-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standard text When sharing a folder via Facebook, WhatsApp or any other platform that makes use of OpenGraph, the display title was "Nextcloud - a safe home for all your data" and the description was the actual name of the folder. This should not be the case, so the display title has been changed to display the folder name and the description now displays the former OpenGraph title. Signed-off-by: Sascha Sambale <mastixmc@gmail.com> Fixing whitespaces and empty line.
| * | Use new-password as autocomplete on share auth pageRoeland Jago Douma2017-10-251-1/+1
| |/ | | | | | | | | | | | | | | | | Fixes #6821 This makes sure that (supported) browsers will not prefill the password field if a user has a password saved for that nextcloud. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Use ::class in test mocksMorris Jobke2017-10-246-70/+80
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Merge pull request #6920 from nextcloud/appmanager-usageMorris Jobke2017-10-241-1/+1
| |\ | | | | | | Use appmanager instead of OC_App for check for enabled app
| | * Use appmanager instead of OC_App for check for enabled appMorris Jobke2017-10-231-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>