summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / / / /
* | | | | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-261-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve splitting of username and remote adress when username contains an `@`
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix etag propagation for single file shares
| * | | | | | 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-2644-40/+14
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #17152 from owncloud/LDAP/AD-TypoMorris Jobke2015-06-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ldap/ad typo
| * | | | | | Dropped an S from the mouseoverLukas Reschke2015-06-241-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2536-20/+94
|/ / / / /
* | | | | Merge pull request #17110 from owncloud/share-error-handlingMorris Jobke2015-06-241-2/+10
|\ \ \ \ \ | | | | | | | | | | | | [sharing] handle shares of users that aren't available anymore
| * | | | | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * properly handle the case where an abandoned share is left and simply skip it
* | | | | | Merge pull request #17136 from rullzer/fix_remove_link_OCSLukas Reschke2015-06-241-1/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Allow removing of link password in OCS again
| * | | | | Added unit test to verify link password removealRoeland Jago Douma2015-06-241-1/+23
| | | | | |
* | | | | | Rename user_webdavauth to prevent accidental activation - refs #17112Thomas Müller2015-06-241-3/+3
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-246-6/+12
| | | | |
* | | | | Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-messageVincent Petry2015-06-232-0/+19
|\ \ \ \ \ | |/ / / / |/| | | | adding correct blocking logic for ffw
| * | | | adding correct blocking logic for fffClark Tomlinson2015-06-222-0/+19
| | | | |
* | | | | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | encryption improvements
| * | | | | remove files_encryption from database at the end of the migration processBjoern Schiessle2015-06-191-1/+1
| | | | | |
* | | | | | Merge pull request #17085 from owncloud/use-trusted-mimetypeMorris Jobke2015-06-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use trusted mimetype
| * | | | | | Use trusted mimetypeLukas Reschke2015-06-221-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | We shall not use untrusted mimetypes in this context