summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-052-1/+11
* Merge pull request #1340 from owncloud/fixing-js-errors-public-link-masterThomas Müller2013-02-031-0/+1
|\
| * Merge branch 'master' into fixing-js-errors-public-link-masterThomas Mueller2013-01-3111-275/+785
| |\
| * | include keyboardshortcuts.jsThomas Mueller2013-01-281-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-041-0/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-031-4/+7
| |/ |/|
* | merge master into filesystemRobin Appelman2013-01-302-2/+3
|\ \
| * \ Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-292-2/+3
| |\ \ | | |/ | |/|
| | * show display name instead of uid in the public shared files viewBjörn Schießle2013-01-252-2/+3
* | | Sharing: partailly fix searchByMimeRobin Appelman2013-01-281-27/+28
* | | change required ownCloud version to 4.91Robin Appelman2013-01-281-1/+1
* | | merge master into filesystemRobin Appelman2013-01-282-2/+2
|\| |
| * | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-282-2/+2
| |\ \
| | * | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-262-2/+2
* | | | Move streamwrappers to seperate files and put them in a namespaceRobin Appelman2013-01-281-1/+1
* | | | Merge branch 'master' into filesystemRobin Appelman2013-01-281-0/+3
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-271-0/+3
| |/ /
* | | merge master into filesystemRobin Appelman2013-01-265-11/+9
|\| |
| * | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-252-1/+5
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-251-1/+2
| | |/
| | * [tx-robot] updated from transifexJenkins for ownCloud2013-01-241-0/+3
| * | missing renames of publicListView to disableSharingThomas Mueller2013-01-232-2/+2
| * | Move publicListView to external JSLukas Reschke2013-01-211-8/+2
| |/
* | Implement getETag() in shared storageMichael Gapczynski2013-01-191-1/+8
* | merge master into filesystemRobin Appelman2013-01-162-3/+3
|\|
| * Whitespace cleanupBart Visscher2013-01-162-7/+7
* | merge master into filesystemRobin Appelman2013-01-153-18/+44
|\|
| * Merge pull request #1133 from owncloud/add_linebreaks_in_sharingThomas Müller2013-01-101-17/+35
| |\
| | * add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-091-17/+35
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-111-2/+5
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-101-0/+9
| |/
* | Return NOT_FOUND in shared cacheMichael Gapczynski2013-01-101-1/+1
* | Almost fix Shared scanner...Michael Gapczynski2013-01-075-9/+26
* | Maked Shared_Permissions extend Permissions classMichael Gapczynski2013-01-071-6/+6
* | Fix mimetypes in shared cacheMichael Gapczynski2013-01-071-1/+8
* | merge master into filesystemRobin Appelman2013-01-071-6/+6
|\|
| * Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-041-1/+1
| |\
| | * Remove the WIP external sharing apiTom Needham2012-12-314-84/+0
| | * Merge branch 'master' into ocs_apiTom Needham2012-12-314-4/+34
| | |\
| | * \ Merge branch 'master' into ocs_apiTom Needham2012-12-161-1/+1
| | |\ \
| | * \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-1416-276/+354
| | |\ \ \
| | * | | | External Share API: Move url down one level in responseTom Needham2012-10-313-2/+15
| | * | | | Fix url generated for public shared filesTom Needham2012-10-281-2/+2
| | * | | | Merge master into ocs_apiTom Needham2012-10-2845-114/+559
| | |\ \ \ \
| | * | | | | Add API method for sharing a file, currently only via a link.Tom Needham2012-10-283-1/+72
* | | | | | | Don't mount shared storage unless there are shared filesMichael Gapczynski2013-01-031-2/+4
* | | | | | | merge master into filesystemRobin Appelman2013-01-033-4/+22
|\| | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-031-0/+6
| | |_|_|_|/ | |/| | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-312-1/+16
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-301-4/+1