aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* use the correct user if we update the share tableBjoern Schiessle2015-07-031-4/+10
|
* 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
| * | | | OCS Share API link shares now always have an urlRoeland Jago Douma2015-05-222-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure clients have the correct and latest link add an url field to all OCS Share API return statements on public link shares. * Added unit tests
* | | | | Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_utilMorris Jobke2015-07-0112-33/+33
|\ \ \ \ \ | | | | | | | | | | | | Move core apps from OC_Log::write to OCP\Util
| * | | | | Move core apps from OC_Log::write to OCP\UtilRoeland Jago Douma2015-05-1812-33/+33
| | | | | |
* | | | | | Merge pull request #15475 from rullzer/files_sharing_OCP_DBMorris Jobke2015-07-017-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move files sharing app (mostly) to OCP\DB
| * | | | | | Move files sharing app (mostly) to OCP\DBRoeland Jago Douma2015-05-187-14/+14
| |/ / / / /
* | | | | | Merge pull request #17255 from owncloud/fix-17119Thomas Müller2015-07-019-1/+389
|\ \ \ \ \ \ | | | | | | | | | | | | | | [LDAP] Filter user groups obtained by memberof
| * | | | | | tests solidityArthur Schiwon2015-06-303-0/+24
| | | | | | |
| * | | | | | adjust unit testArthur Schiwon2015-06-301-0/+4
| | | | | | |
| * | | | | | integration testArthur Schiwon2015-06-305-0/+331
| | | | | | |
| * | | | | | ensure groups match filter when using memberOf to read users group, refs #17119Arthur Schiwon2015-06-262-1/+30
| | | | | | |
* | | | | | | Fixing ctor calls and ctor itself to not break usage in calendar and ↵Thomas Müller2015-06-292-2/+2
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | contacts .....
* | | | | | Merge pull request #17083 from owncloud/share-etag-update-targetVincent Petry2015-06-292-10/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | take share target into account when updating recipient etags
| * | | | | | 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-2936-4/+44
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2822-10/+68
| | | | | | |
* | | | | | | Add missing annotations for parametersLukas Reschke2015-06-272-9/+16
| | | | | | |
* | | | | | | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27118-114/+327
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update license headers
| * | | | | | | update license headers and authorsMorris Jobke2015-06-25118-114/+327
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #17199 from ↵Lukas Reschke2015-06-272-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/feature/show-error-when-shareservice-dies add check if server returns a 500 and display error
| * | | | | | | add check if server returns a 500 and display errorClark Tomlinson2015-06-262-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolves https://github.com/owncloud/core/issues/17170
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2718-4/+46
| | | | | | | |
* | | | | | | | Signature of overriding method should match the parentOlivier Paroz2015-06-261-1/+1
|/ / / / / / /