summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Move core apps from private to public functionsRoeland Jago Douma2015-04-011-1/+1
* Correct the app name for sharing eventsJoas Schilling2015-03-301-12/+7
* Merge pull request #13964 from rullzer/capabilitiesMorris Jobke2015-03-303-0/+280
|\
| * Mark functions privateRoeland Jago Douma2015-03-111-2/+2
| * Slight better formattingRoeland Jago Douma2015-03-112-47/+11
| * New array syntaxRoeland Jago Douma2015-03-112-56/+56
| * Added new headerRoeland Jago Douma2015-03-112-11/+35
| * Now added enabled elementRoeland Jago Douma2015-03-112-9/+13
| * Added route againRoeland Jago Douma2015-03-111-0/+6
| * Add file_sharing info to capabilitiesRoeland Jago Douma2015-03-112-0/+282
* | Merge pull request #15239 from owncloud/see-no-evilMorris Jobke2015-03-301-14/+16
|\ \
| * | fix layout for Sharing settingsJan-Christoph Borchardt2015-03-271-13/+15
| * | Move federated cloud sharing, files externals and updater to special positionsJoas Schilling2015-03-271-2/+2
* | | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-271-5/+15
|\ \ \ | |/ / |/| |
| * | fix unit testsMorris Jobke2015-03-171-5/+15
* | | Merge pull request #15244 from owncloud/use_default_share_folderMorris Jobke2015-03-263-5/+20
|\ \ \
| * | | always fall back to default share folderBjoern Schiessle2015-03-263-5/+20
* | | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-262-20/+192
|\ \ \ \ | |/ / / |/| | |
| * | | Fix share permission related unit testsVincent Petry2015-03-201-9/+13
| * | | Rename must be possible with update-only permissionVincent Petry2015-03-191-17/+23
| * | | Fix shared storage permission checksVincent Petry2015-03-182-4/+166
* | | | Merge pull request #15001 from owncloud/kill-share-proxyThomas Müller2015-03-266-76/+23
|\ \ \ \
| * | | | replace share proxy with hookRobin Appelman2015-03-266-71/+18
| * | | | rename proxy testRobin Appelman2015-03-261-7/+7
* | | | | Remove IDE autocomplete failLukas Reschke2015-03-261-1/+0
|/ / / /
* | | | Update license headersJenkins for ownCloud2015-03-2663-510/+1119
* | | | Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-263-27/+15
|\ \ \ \
| * | | | Add wrapper for GuzzleLukas Reschke2015-03-253-27/+15
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-262-0/+2
|/ / / /
* | | | Merge pull request #15055 from owncloud/share-activity-groupingMorris Jobke2015-03-241-0/+14
|\ \ \ \
| * | | | Group sharing activities by user/group and file respectivelyJoas Schilling2015-03-201-0/+14
| |/ / /
* | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-testsMorris Jobke2015-03-242-154/+67
|\ \ \ \
| * | | | Merge the two tests into oneJoas Schilling2015-03-242-154/+67
* | | | | Merge pull request #15158 from owncloud/fix-failing-masterRobin Appelman2015-03-242-5/+14
|\| | | |
| * | | | *cough*Joas Schilling2015-03-242-5/+14
* | | | | Merge pull request #14998 from rullzer/ocs_api_new_urlMorris Jobke2015-03-242-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added extra unit testRoeland Jago Douma2015-03-211-0/+5
| * | | | OCS API should return fancy OC urlRoeland Jago Douma2015-03-211-2/+1
* | | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-shareMorris Jobke2015-03-244-26/+209
|\ \ \ \ \
| * | | | | Add a unit test for the naming conflict on the mountpoint nameJoas Schilling2015-03-172-6/+155
| * | | | | Use insertIfNotExists() instead of manual logicJoas Schilling2015-03-171-24/+31
| * | | | | Correctly get the unique mountpoint name when mounting the shareJoas Schilling2015-03-173-10/+37
| | |_|/ / | |/| | |
* | | | | when the path doesnt exist show a proper error pageRobin Appelman2015-03-241-0/+2
* | | | | Properly catch whether a share is `null`Lukas Reschke2015-03-244-23/+85
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-222-0/+2
* | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-managerThomas Müller2015-03-203-4/+5
|\ \ \ \ \
| * | | | | Fix controller testJoas Schilling2015-03-161-0/+1
| * | | | | Move mimetype check from template to controllerJoas Schilling2015-03-162-4/+4
| * | | | | Use the PreviewManager where possibleJoas Schilling2015-03-161-2/+2
* | | | | | Do not automatically add "update" permission to shared mountsVincent Petry2015-03-201-2/+1
| |_|/ / / |/| | | |