summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* 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
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-202-10/+10
* | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_dateThomas Müller2015-03-191-0/+18
|\ \ \ \
| * | | | Added unit testRoeland Jago Douma2015-03-191-0/+18
* | | | | Merge pull request #14537 from owncloud/oci-external-shareRobin Appelman2015-03-193-2/+144
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not make setupMounts() public just because of testingJoas Schilling2015-03-112-12/+12
| * | | | Add unit tests for external share manangerRobin Appelman2015-03-102-2/+144
| * | | | Fix external shares without password on oracleRobin Appelman2015-02-271-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-192-0/+6
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-184-2/+16
* | | | Cache \OC\URLGenerator::imagePathLukas Reschke2015-03-171-1/+1
| |_|/ |/| |
* | | Fix PHPDoc and Co.Lukas Reschke2015-03-171-4/+12
* | | Fix scanFile signature warningsVincent Petry2015-03-161-1/+1
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-122-2/+2
* | Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-viewLukas Reschke2015-03-112-1/+11
|\ \
| * | Allow iframes from same domain in share viewLukas Reschke2015-03-102-1/+11
* | | Adding a more meaningful message for sabre dav exception - fixes #14516Thomas Müller2015-03-111-1/+1
|/ /
* | Merge pull request #14720 from owncloud/fix-shareetagpropagationMorris Jobke2015-03-092-0/+112
|\ \
| * | Add unit test for size propagation across share boundariesVincent Petry2015-03-091-0/+90
| * | Fix size propagation over shared storage boundaryVincent Petry2015-03-051-0/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-072-2/+2
|/ /
* | Shares should have a least read permissionRoeland Jago Douma2015-03-012-1/+79
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-012-2/+38
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-282-2/+70
|/
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-2761-1046/+550
|\
| * Revert "Updating license headers"Morris Jobke2015-02-2661-1046/+550
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-272-0/+2