summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16724 from owncloud/mimetype-jsRoeland Douma2015-07-062-2/+1
|\
| * Share app no longer use the OCS API iconRoeland Jago Douma2015-07-062-2/+1
* | Merge pull request #17418 from owncloud/fix-public-download-button-regressionJan-Christoph Borchardt2015-07-061-1/+1
|\ \ | |/ |/|
| * Fix regression of button at public download pageMorris Jobke2015-07-061-1/+1
* | Merge pull request #17290 from owncloud/remove-readonly-wrapperThomas Müller2015-07-063-76/+2
|\ \ | |/ |/|
| * remove no longer needed readonly wrapperRobin Appelman2015-07-011-74/+0
| * use permissions mask wrapper instead of readonly wrapperRobin Appelman2015-07-012-2/+2
* | Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activi...Joas Schilling2015-07-062-13/+26
|\ \
| * | Use federated cloud id as a parameter typeJoas Schilling2015-07-021-3/+3
| * | Add the item name to the federated sahre activityJoas Schilling2015-07-022-1/+6
| * | Use the app constant to fix the groupingJoas Schilling2015-07-022-9/+11
| * | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
* | | Merge pull request #16733 from owncloud/add-smashbox-tests-remote-sharesJoas Schilling2015-07-064-3/+122
|\ \ \
| * | | Add OCS api to get, accept and decline remote sharesJoas Schilling2015-07-034-1/+120
| * | | Allow sharing with type remote shareJoas Schilling2015-07-031-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-052-2/+20
* | | | Remove OC_LogThomas Müller2015-07-031-1/+1
* | | | Merge pull request #15470 from rullzer/files_sharing_getUrlContentVincent Petry2015-07-031-51/+56
|\ \ \ \
| * | | | Move away from private static deprecated functioRoeland Jago Douma2015-05-181-51/+56
* | | | | Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailableMorris Jobke2015-07-032-1/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Do not show static share owner if not availableVincent Petry2015-07-022-1/+18
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-034-2/+12
* | | | | Merge pull request #17159 from owncloud/fix-duplicate-idMorris Jobke2015-07-021-1/+1
|\ \ \ \ \
| * | | | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-06-251-1/+1
* | | | | | Do not register JS share plugin if core sharing API is disabledVincent Petry2015-07-021-0/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #17077 from owncloud/files-scan-absolute-pathMorris Jobke2015-07-021-3/+5
|\ \ \ \ \
| * | | | | handle error during setupRobin Appelman2015-06-291-3/+5
* | | | | | Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-blockVincent Petry2015-07-021-1/+0
|\ \ \ \ \ \
| * | | | | | Fix duplicated line in doc blockJoas Schilling2015-07-021-1/+0
* | | | | | | Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-s...Joas Schilling2015-07-021-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Bump versionsLukas Reschke2015-07-021-1/+1
* | | | | | | Merge pull request #17246 from owncloud/share-lock-owner-parentJoas Schilling2015-07-023-10/+134
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | only lock the parent foldersRobin Appelman2015-07-012-2/+13
| * | | | | | lock parent folders for the owner when locking a shared file as recipientRobin Appelman2015-07-013-10/+123
| | |_|_|_|/ | |/| | | |
* | | | | | [master] Remove OCS IDsLukas Reschke2015-07-021-1/+0
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-026-8/+20
* | | | | Fix scanFile signature to avoid boring warningVincent Petry2015-07-011-1/+3
|/ / / /
* | | | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
* | | | Merge pull request #16535 from rullzer/ocs_share_api_urlMorris Jobke2015-07-012-0/+55
|\ \ \ \
| * | | | OCS Share API link shares now always have an urlRoeland Jago Douma2015-05-222-0/+55
* | | | | Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_utilMorris Jobke2015-07-013-9/+9
|\ \ \ \ \
| * | | | | Move core apps from OC_Log::write to OCP\UtilRoeland Jago Douma2015-05-183-9/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15475 from rullzer/files_sharing_OCP_DBMorris Jobke2015-07-017-14/+14
|\ \ \ \ \
| * | | | | Move files sharing app (mostly) to OCP\DBRoeland Jago Douma2015-05-187-14/+14
| |/ / / /
* | | / / 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