Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix scanFile signature to avoid boring warning | Vincent Petry | 2015-07-01 | 1 | -1/+3 |
| | |||||
* | Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes | Vincent Petry | 2015-07-01 | 1 | -13/+7 |
|\ | | | | | Catch more error codes thrown by federated shares | ||||
| * | Catch more error codes thrown by federated shares | Vincent Petry | 2015-07-01 | 1 | -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_external | Robin McCorkell | 2015-07-01 | 9 | -49/+70 |
|/ | |||||
* | Merge pull request #16535 from rullzer/ocs_share_api_url | Morris Jobke | 2015-07-01 | 2 | -0/+55 |
|\ | | | | | OCS Share API link shares now always have an url | ||||
| * | OCS Share API link shares now always have an url | Roeland Jago Douma | 2015-05-22 | 2 | -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_util | Morris Jobke | 2015-07-01 | 12 | -33/+33 |
|\ \ | | | | | | | Move core apps from OC_Log::write to OCP\Util | ||||
| * | | Move core apps from OC_Log::write to OCP\Util | Roeland Jago Douma | 2015-05-18 | 12 | -33/+33 |
| | | | |||||
* | | | Merge pull request #15475 from rullzer/files_sharing_OCP_DB | Morris Jobke | 2015-07-01 | 7 | -14/+14 |
|\ \ \ | | | | | | | | | Move files sharing app (mostly) to OCP\DB | ||||
| * | | | Move files sharing app (mostly) to OCP\DB | Roeland Jago Douma | 2015-05-18 | 7 | -14/+14 |
| |/ / | |||||
* | | | Merge pull request #17255 from owncloud/fix-17119 | Thomas Müller | 2015-07-01 | 9 | -1/+389 |
|\ \ \ | | | | | | | | | [LDAP] Filter user groups obtained by memberof | ||||
| * | | | tests solidity | Arthur Schiwon | 2015-06-30 | 3 | -0/+24 |
| | | | | |||||
| * | | | adjust unit test | Arthur Schiwon | 2015-06-30 | 1 | -0/+4 |
| | | | | |||||
| * | | | integration test | Arthur Schiwon | 2015-06-30 | 5 | -0/+331 |
| | | | | |||||
| * | | | ensure groups match filter when using memberOf to read users group, refs #17119 | Arthur Schiwon | 2015-06-26 | 2 | -1/+30 |
| | | | | |||||
* | | | | Fixing ctor calls and ctor itself to not break usage in calendar and ↵ | Thomas Müller | 2015-06-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | contacts ..... | ||||
* | | | | Merge pull request #17083 from owncloud/share-etag-update-target | Vincent Petry | 2015-06-29 | 2 | -10/+38 |
|\ \ \ \ | | | | | | | | | | | take share target into account when updating recipient etags | ||||
| * | | | | Unit test for etag update on custom share folder | Vincent Petry | 2015-06-26 | 1 | -8/+36 |
| | | | | | |||||
| * | | | | take share target into account when updating recipient etags | Robin Appelman | 2015-06-22 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-29 | 36 | -4/+44 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-28 | 22 | -10/+68 |
| | | | | | |||||
* | | | | | Add missing annotations for parameters | Lukas Reschke | 2015-06-27 | 2 | -9/+16 |
| | | | | | |||||
* | | | | | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 118 | -114/+327 |
|\ \ \ \ \ | | | | | | | | | | | | | Update license headers | ||||
| * | | | | | update license headers and authors | Morris Jobke | 2015-06-25 | 118 | -114/+327 |
| | | | | | | |||||
* | | | | | | Merge pull request #17199 from ↵ | Lukas Reschke | 2015-06-27 | 2 | -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 error | Clark Tomlinson | 2015-06-26 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolves https://github.com/owncloud/core/issues/17170 | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-27 | 18 | -4/+46 |
| | | | | | | | |||||
* | | | | | | | Signature of overriding method should match the parent | Olivier Paroz | 2015-06-26 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #17008 from owncloud/fix-17006 | Björn Schießle | 2015-06-26 | 1 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve splitting of username and remote adress when username contains an `@` | ||||
| * | | | | | | Use \OC\HintException and translate the hint | Joas Schilling | 2015-06-22 | 1 | -0/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #17082 from owncloud/shared-etag-propagate-file | Thomas Müller | 2015-06-26 | 4 | -12/+51 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix etag propagation for single file shares | ||||
| * | | | | | | add some docs | Robin Appelman | 2015-06-25 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | fix etag propagation for single file shares | Robin Appelman | 2015-06-24 | 3 | -12/+37 |
| | | | | | | | |||||
| * | | | | | | add unit test for single file share etag propagation | Robin Appelman | 2015-06-24 | 1 | -0/+12 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-26 | 44 | -40/+14 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #17152 from owncloud/LDAP/AD-Typo | Morris Jobke | 2015-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Ldap/ad typo | ||||
| * | | | | | | Dropped an S from the mouseover | Lukas Reschke | 2015-06-24 | 1 | -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 transifex | Jenkins for ownCloud | 2015-06-25 | 36 | -20/+94 |
|/ / / / / | |||||
* | | | | | Merge pull request #17110 from owncloud/share-error-handling | Morris Jobke | 2015-06-24 | 1 | -2/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | [sharing] handle shares of users that aren't available anymore | ||||
| * | | | | | [sharing] handle shares of users that aren't available anymore | Morris Jobke | 2015-06-23 | 1 | -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_OCS | Lukas Reschke | 2015-06-24 | 1 | -1/+23 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Allow removing of link password in OCS again | ||||
| * | | | | | Added unit test to verify link password removeal | Roeland Jago Douma | 2015-06-24 | 1 | -1/+23 |
| | | | | | | |||||
* | | | | | | Rename user_webdavauth to prevent accidental activation - refs #17112 | Thomas Müller | 2015-06-24 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-24 | 6 | -6/+12 |
| | | | | | |||||
* | | | | | Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message | Vincent Petry | 2015-06-23 | 2 | -0/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | adding correct blocking logic for ffw | ||||
| * | | | | adding correct blocking logic for fff | Clark Tomlinson | 2015-06-22 | 2 | -0/+19 |
| | | | | | |||||
* | | | | | Merge pull request #17045 from owncloud/enc_improvements | Björn Schießle | 2015-06-23 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | encryption improvements | ||||
| * | | | | | remove files_encryption from database at the end of the migration process | Bjoern Schiessle | 2015-06-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #17085 from owncloud/use-trusted-mimetype | Morris Jobke | 2015-06-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use trusted mimetype | ||||
| * | | | | | | Use trusted mimetype | Lukas Reschke | 2015-06-22 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | We shall not use untrusted mimetypes in this context |