summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | 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
|/ / /