summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Dont overwrite OCA.SharingRobin Appelman2014-06-051-1/+3
* Merge pull request #8861 from owncloud/share-overview-linklistVincent Petry2014-06-054-2/+146
|\
| * Fixed wording to "Shared by link"Vincent Petry2014-06-042-3/+3
| * Added "Shared with link" sidebar section in files appVincent Petry2014-06-044-2/+146
* | Merge pull request #8862 from owncloud/share-overview-fixmimetypeicewind19912014-06-051-4/+2
|\ \
| * | Fix mime type returning for "shared with others" filesVincent Petry2014-06-041-4/+2
| |/
* | Merge pull request #8852 from owncloud/kill-permissions-masterThomas Müller2014-06-054-118/+3
|\ \
| * | - drop permissions table and related codeThomas Müller2014-06-054-118/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0517-15/+9
* | | Merge pull request #8724 from owncloud/update-sabre-2.0Thomas Müller2014-06-043-4/+5
|\ \ \
| * | | Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-043-4/+5
| |/ /
* | | Merge pull request #8824 from owncloud/mail_template_editing_in_webuiMorris Jobke2014-06-0410-0/+457
|\ \ \
| * | | fixes during testThomas Müller2014-06-043-21/+32
| * | | convert mail template editor to app framework for a restful apiJörn Friedrich Dreyer2014-06-0313-141/+204
| * | | minimal mail template editor for administrators, refs #7177Jörn Friedrich Dreyer2014-06-0210-0/+383
* | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatusMorris Jobke2014-06-046-110/+640
|\ \ \ \ | |_|/ / |/| | |
| * | | Do not update action icon recipients for file listVincent Petry2014-06-041-0/+5
| * | | Use recipient display names when updating shares in the UIVincent Petry2014-06-042-25/+33
| * | | Multiple fixes to sharing overviewVincent Petry2014-06-033-36/+145
| * | | Now using shareOwner for the share ownerVincent Petry2014-06-023-6/+12
| * | | More unit tests and fixes for shareVincent Petry2014-06-022-125/+255
| * | | Added unit tests for share.js and share iconVincent Petry2014-06-023-21/+229
| * | | Update share action text to display owner/recipientsVincent Petry2014-06-023-99/+163
| |/ /
* | | Merge pull request #8468 from owncloud/remove-infieldlabelsJan-Christoph Borchardt2014-06-042-9/+2
|\ \ \
| * | | infield label removal: remove last occurences of infield labelsJan-Christoph Borchardt2014-06-032-9/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-045-2/+23
| |_|/ |/| |
* | | Merge pull request #8698 from owncloud/sharing_improve_permissionsThomas Müller2014-06-032-36/+16
|\ \ \ | |/ / |/| |
| * | check if it is a share storageBjoern Schiessle2014-06-021-1/+5
| * | no need to empty array in a special wayThomas Müller2014-06-021-3/+1
| * | get permissions directly from share storage to avoid additional db callsBjoern Schiessle2014-06-022-34/+12
| |/
* | fix unit testsMorris Jobke2014-06-021-1/+1
* | drop allowZIPdownload and maxZIPSize as optionsMorris Jobke2014-06-022-7/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-022-4/+4
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-0169-1/+197
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-313-6/+8
* Merge pull request #8444 from owncloud/cleanup-list-codeThomas Müller2014-05-302-17/+13
|\
| * Merge branch 'master' into cleanup-list-codeThomas Müller2014-05-1924-183/+480
| |\
| * | Add missing \Lukas Reschke2014-05-041-1/+1
| * | Cleanup code a little bitLukas Reschke2014-05-042-23/+14
* | | Merge pull request #8778 from owncloud/storage-instanceoficewind19912014-05-302-2/+2
|\ \ \
| * | | Use instanceOfStorage instead of instanceofRobin Appelman2014-05-292-2/+2
* | | | Fixed warning when file_target is not setVincent Petry2014-05-301-1/+3
* | | | Removed "Share with" columnVincent Petry2014-05-303-17/+1
* | | | Added owner display name in actionVincent Petry2014-05-303-1/+13
* | | | Sharing overview fixes and unit testsVincent Petry2014-05-307-26/+634
* | | | Mimetype for sharing overviewVincent Petry2014-05-302-4/+16
* | | | Distinguish legacy file actions from regular file actionsVincent Petry2014-05-303-20/+31
* | | | Small fixes to sharing overviewVincent Petry2014-05-302-1/+12
* | | | Fixed navigation orderVincent Petry2014-05-301-2/+2
* | | | Removed selection checkboxesVincent Petry2014-05-301-9/+0