summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-186-0/+6
|
* Merge pull request #10407 from owncloud/rm-obsolete-japaneseLukas Reschke2014-08-171-17/+0
|\ | | | | remove obsolete japanese lang code
| * remove obsolete japanese lang codeVolkan Gezer2014-08-131-17/+0
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-177-0/+18
| |
* | Merge pull request #10449 from owncloud/share-clientsidesortnoservercallLukas Reschke2014-08-151-0/+2
|\ \ | | | | | | Client side sort for sharing overview
| * | Client side sort for sharing overviewVincent Petry2014-08-151-0/+2
| | | | | | | | | | | | | | | Since the server doesn't support sorting, use client side sort directly instead of calling reload() first.
* | | ssl capitalVolkan Gezer2014-08-151-1/+1
|/ /
* | Merge pull request #10398 from owncloud/external-share-ssl-warnRobin Appelman2014-08-141-11/+17
|\ \ | |/ |/| Give a better error message for external shares with self-signed ssl certificates
| * Give a better error message for external shares with self-signed ssl ↵Robin Appelman2014-08-131-11/+17
| | | | | | | | certificates
* | Cast file id's to int so we can compare them properlyRobin Appelman2014-08-131-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-131-1/+19
|
* Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-nameRobin Appelman2014-08-111-1/+1
|\ | | | | use OC_Util::basename
| * use OC_Util::basenameRobin Appelman2014-01-151-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-111-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-091-1/+22
| |
* | only show "share with others" and "share by link" navigation bar entries if ↵Bjoern Schiessle2014-08-081-18/+22
| | | | | | | | user is allowed to share files
* | Merge pull request #10238 from ↵Thomas Müller2014-08-071-1/+4
|\ \ | | | | | | | | | | | | owncloud/fix-public-download-with-encryption-master we can only close the session if encryption is not used
| * | we can only close the session if encryption is not usedThomas Müller2014-08-071-1/+4
| | |
* | | Merge pull request #10184 from owncloud/getbyid-nodeRobin Appelman2014-08-071-19/+5
|\ \ \ | | | | | | | | Fix Folder::getById
| * | | trim leading slashRobin Appelman2014-08-061-1/+1
| | | |
| * | | Fix SharedCache::getPathByIdRobin Appelman2014-08-061-20/+6
| | | |
* | | | Merge pull request #10223 from dannosaur/patch-1Jan-Christoph Borchardt2014-08-071-0/+1
|\ \ \ \ | | | | | | | | | | fix tiny thumbnails in public preview/share mode
| * | | | fix tiny thumbnails in public preview/share modeDan Jones2014-08-061-0/+1
| | | | |
* | | | | Merge pull request #10218 from owncloud/pzy-masterThomas Müller2014-08-071-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Adding link tag to enable facebook timeline previews
| * | | | | Update public.phppzy2014-08-071-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added tag to make facebook load a preview picture Update public.php add check ifMimeSupported and put the thumbsize in a variable generate preview for all supported mimes
* | | | | Merge pull request #8915 from owncloud/MorrisJobke-travisThomas Müller2014-08-071-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Travis support for PRs and master, stable5 and stable6
| * | | | Minor fixesMorris Jobke2014-08-051-2/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | * instanceof \OC\Files\View * fix misplaced paranthesis * remove misplaced character in comment
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-072-4/+4
| |/ / |/| |
* | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slashMorris Jobke2014-08-051-1/+0
|\ \ \ | |/ / |/| | [sharing] remove trailing slash
| * | remove unused variableBjoern Schiessle2014-08-051-1/+0
| | |
* | | close session right before the download starts - this enables parallel downloadsThomas Müller2014-08-051-0/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-021-1/+1
| |
* | Merge pull request #10067 from owncloud/fix-#9119Morris Jobke2014-08-011-1/+1
|\ \ | | | | | | Quick fix for #9119. Increase preview to keep empty message more centered
| * | Quick fix for #9119. Increase preview to keep empty message more centered ↵Remco Brenninkmeijer2014-07-301-1/+1
| | | | | | | | | | | | and push footer down.
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-011-3/+3
| | |
* | | Merge pull request #10048 from owncloud/fix_search_in_shared_filesJörn Friedrich Dreyer2014-07-312-62/+101
|\ \ \ | |/ / |/| | traverse folders in php to search in shared files
| * | add test for search() in shared cacheJörn Friedrich Dreyer2014-07-311-3/+75
| | |
| * | traverse folders in php to search in shared filesJörn Friedrich Dreyer2014-07-311-59/+26
| | |
* | | Merge pull request #10054 from owncloud/dont_preload_videosJan-Christoph Borchardt2014-07-301-1/+1
|\ \ \ | | | | | | | | don't preload videos on public sharing, fixes #10042
| * | | don't preload videos on public sharing, fixes #10042Georg Ehrke2014-07-301-1/+1
| |/ /
* / / Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-301-4/+0
|/ /
* | Merge pull request #9983 from owncloud/sharing_add_unshare_to_overviewBjörn Schießle2014-07-291-0/+3
|\ \ | | | | | | update attributes for share-with-user view
| * | update attributes for share with user list, file should always have delete ↵Bjoern Schiessle2014-07-281-0/+3
| | | | | | | | | | | | permissions, this means unshare in this context, and the overview page is always a root view
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-291-3/+3
|/ /
* | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_dateBjörn Schießle2014-07-282-3/+100
|\ \ | | | | | | [share api] add OCS api call to set expire date for link shares
| * | adjust error codeBjoern Schiessle2014-07-281-2/+2
| | |
| * | add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-252-2/+99
| | |
* | | Merge pull request #9585 from owncloud/design-fix-public-footerJan-Christoph Borchardt2014-07-281-16/+0
|\ \ \ | | | | | | | | move public page footer rules from sharing app to core so it is used by other apps too
| * | | move public page footer rules from sharing app to core so it is used by ↵Jan-Christoph Borchardt2014-07-071-16/+0
| | | | | | | | | | | | | | | | other apps too
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-282-1/+9
| | | |