summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17653 from owncloud/backport-17330-share-group-path-excep...Morris Jobke2015-07-161-0/+130
|\
| * Add test case when owner renames shared folderVincent Petry2015-07-151-5/+8
| * Add unit test for getUsersSharingFileVincent Petry2015-07-151-0/+127
* | Merge pull request #17658 from owncloud/share-lock-owner-parent-stable81Vincent Petry2015-07-163-10/+134
|\ \
| * | only lock the parent foldersRobin Appelman2015-07-152-2/+13
| * | lock parent folders for the owner when locking a shared file as recipientRobin Appelman2015-07-153-10/+123
| |/
* | Merge pull request #17294 from owncloud/stable8.1-s2s-catchmoreexceptiontypesMorris Jobke2015-07-161-13/+7
|\ \
| * | Throw storage not available on guzzle errorVincent Petry2015-07-131-1/+1
| * | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
* | | Merge pull request #17337 from owncloud/stable8.1-backport-17077Morris Jobke2015-07-151-3/+5
|\ \ \ | |_|/ |/| |
| * | handle error during setupRobin Appelman2015-07-021-3/+5
| |/
* | Merge pull request #17332 from owncloud/fix-temporary-mountpoint-name-in-acti...Morris Jobke2015-07-082-2/+8
|\ \
| * | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
| |/
* | Merge pull request #17370 from owncloud/stable8.1-share-onlyshowstaticownerif...Morris Jobke2015-07-082-1/+18
|\ \
| * | Do not show static share owner if not availableVincent Petry2015-07-032-1/+18
* | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-07-062-2/+2
|/ /
* | Merge pull request #17317 from owncloud/stable81-clean-ocsidLukas Reschke2015-07-021-1/+1
|\ \
| * | Bump versionsLukas Reschke2015-07-021-1/+1
| |/
* / [stable81] Remove OCS IDsLukas Reschke2015-07-021-1/+0
|/
* Fixing ctor calls and ctor itself to not break usage in calendar and contacts...Thomas Müller2015-06-291-1/+1
* Merge pull request #17083 from owncloud/share-etag-update-targetVincent Petry2015-06-292-10/+38
|\
| * Unit test for etag update on custom share folderVincent Petry2015-06-261-8/+36
| * take share target into account when updating recipient etagsRobin Appelman2015-06-221-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-292-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-286-10/+40
* | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-2726-31/+108
|\ \
| * | update license headers and authorsMorris Jobke2015-06-2526-31/+108
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-274-4/+24
* | | Signature of overriding method should match the parentOlivier Paroz2015-06-261-1/+1
* | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-261-0/+4
|\ \ \
| * | | Use \OC\HintException and translate the hintJoas Schilling2015-06-221-0/+4
| | |/ | |/|
* | | Merge pull request #17082 from owncloud/shared-etag-propagate-fileThomas Müller2015-06-264-12/+51
|\ \ \ | |_|/ |/| |
| * | add some docsRobin Appelman2015-06-251-0/+2
| * | fix etag propagation for single file sharesRobin Appelman2015-06-243-12/+37
| * | add unit test for single file share etag propagationRobin Appelman2015-06-241-0/+12
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-256-6/+28
* | | Merge pull request #17110 from owncloud/share-error-handlingMorris Jobke2015-06-241-2/+10
|\ \ \
| * | | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-2/+10
* | | | Added unit test to verify link password removealRoeland Jago Douma2015-06-241-1/+23
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-244-2/+8
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-06-238-8/+40
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-222-2/+16
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-216-4/+24
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-2014-16/+96
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-1934-68/+34
* Merge pull request #16692 from owncloud/add_social_media_buttonsBjörn Schießle2015-06-1811-6/+650
|\
| * add id to urlBjoern Schiessle2015-06-182-7/+7
| * fix look of 'Share with me via ownCloud' button, fix wordingJan-Christoph Borchardt2015-06-173-51/+11
| * fix path to owncloud logoBjoern Schiessle2015-06-172-2/+4
| * make the click actions workBjoern Schiessle2015-06-172-7/+9