summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-072-0/+2
|
* Merge pull request #16724 from owncloud/mimetype-jsRoeland Douma2015-07-062-2/+1
|\ | | | | Javascript to fetch mimetype icons
| * Share app no longer use the OCS API iconRoeland Jago Douma2015-07-062-2/+1
| | | | | | | | Switch to new javascript mimetype resolver
* | Merge pull request #17418 from owncloud/fix-public-download-button-regressionJan-Christoph Borchardt2015-07-061-1/+1
|\ \ | |/ |/| Fix regression of button at public download page
| * Fix regression of button at public download pageMorris Jobke2015-07-061-1/+1
| | | | | | | | * introduced with #17159
* | Merge pull request #17290 from owncloud/remove-readonly-wrapperThomas Müller2015-07-063-76/+2
|\ \ | | | | | | Replace readonly wrapper with permissions mask
| * | 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 #16964 from owncloud/versions_occThomas Müller2015-07-063-0/+304
|\ \ \ | |_|/ |/| | add occ tool to delete versions
| * | add occ tool to delete versionsBjoern Schiessle2015-06-163-0/+304
| | |
* | | Merge pull request #17335 from ↵Joas Schilling2015-07-062-13/+26
|\ \ \ | | | | | | | | | | | | | | | | owncloud/better-federated-cloud-sharing-activities Improve federated cloud sharing activities
| * | | 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 send, get, accept and decline remote shares
| * | | | 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-064-8/+20
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-058-18/+94
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-042-8/+8
| | | | |
* | | | | Remove OC_LogThomas Müller2015-07-032-5/+5
| | | | |
* | | | | Merge pull request #15470 from rullzer/files_sharing_getUrlContentVincent Petry2015-07-031-51/+56
|\ \ \ \ \ | | | | | | | | | | | | Move away from private static function OC_Util::getUrlContent
| * | | | | Move away from private static deprecated functioRoeland Jago Douma2015-05-181-51/+56
| | | | | |
* | | | | | Merge pull request #17140 from owncloud/trashbin_occBjörn Schießle2015-07-033-0/+339
|\ \ \ \ \ \ | | | | | | | | | | | | | | add occ command to remove deleted files
| * | | | | | add occ command to trashbin to remove deleted filesBjoern Schiessle2015-06-243-0/+339
| | | | | | |
* | | | | | | Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailableMorris Jobke2015-07-032-1/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Do not show static share owner if not available
| * | | | | | Do not show static share owner if not availableVincent Petry2015-07-022-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some corner cases, an outgoing share exists but sharing is not allowed for the current user. This would cause the file list to break because the static text could not be rendered as the owner was undefined.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0318-4/+70
| | | | | | |
* | | | | | | Merge pull request #17159 from owncloud/fix-duplicate-idMorris Jobke2015-07-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove duplicate ID in HTML template for public shares
| * | | | | | | 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 #17328 from owncloud/revert-15363-ext-ocpThomas Müller2015-07-029-70/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "Use OCP classes as much as possible in files_external"
| * | | | | | | Revert "Use OCP classes as much as possible in files_external"Thomas Müller2015-07-029-70/+49
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #17077 from owncloud/files-scan-absolute-pathMorris Jobke2015-07-021-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix getting mount points when passing a path to the files:scan command
| * | | | | | | 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 block
| * | | | | | | | Fix duplicated line in doc blockJoas Schilling2015-07-021-1/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #17316 from ↵Joas Schilling2015-07-025-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/master-delete-ocsid-from-db-if-none-specified [Master] Delete OCS ID from DB if none is specified
| * | | | | | | | Bump versionsLukas Reschke2015-07-025-5/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #17246 from owncloud/share-lock-owner-parentJoas Schilling2015-07-023-10/+134
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | lock parent folders for the owner when locking a shared file as recipient
| * | | | | | | | 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-025-5/+0
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0240-22/+116
| | | | | | |
* | | | | | | Fix scanFile signature to avoid boring warningVincent Petry2015-07-011-1/+3
|/ / / / / /
* | | | | | Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypesVincent Petry2015-07-011-13/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Catch more error codes thrown by federated shares
| * | | | | | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the time it doesn't make sense to forward Guzzle's RequestException, so we convert it to StorageNotAvailable instead. This prevents unpredictable error codes to block access to unrelated folders needlessly.
* | | | | | | Use OCP classes as much as possible in files_externalRobin McCorkell2015-07-019-49/+70
|/ / / / / /
* | | | | | Merge pull request #16535 from rullzer/ocs_share_api_urlMorris Jobke2015-07-012-0/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | OCS Share API link shares now always have an url