Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #17316 from ↵ | Joas Schilling | 2015-07-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | owncloud/master-delete-ocsid-from-db-if-none-specified [Master] Delete OCS ID from DB if none is specified | |||||
| * | | | | | | Bump versions | Lukas Reschke | 2015-07-02 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #17246 from owncloud/share-lock-owner-parent | Joas Schilling | 2015-07-02 | 3 | -10/+134 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | lock parent folders for the owner when locking a shared file as recipient | |||||
| * | | | | | | only lock the parent folders | Robin Appelman | 2015-07-01 | 2 | -2/+13 | |
| | | | | | | | ||||||
| * | | | | | | lock parent folders for the owner when locking a shared file as recipient | Robin Appelman | 2015-07-01 | 3 | -10/+123 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | [master] Remove OCS IDs | Lukas Reschke | 2015-07-02 | 1 | -1/+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 transifex | Jenkins for ownCloud | 2015-07-02 | 6 | -8/+20 | |
| | | | | | ||||||
* | | | | | Fix scanFile signature to avoid boring warning | Vincent Petry | 2015-07-01 | 1 | -1/+3 | |
|/ / / / | ||||||
* | | | | 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. | |||||
* | | | | 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 | 3 | -9/+9 | |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 3 | -9/+9 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | 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 | |
| |/ / / / | ||||||
* | | / / | Fixing ctor calls and ctor itself to not break usage in calendar and ↵ | Thomas Müller | 2015-06-29 | 1 | -1/+1 | |
| |_|/ / |/| | | | | | | | | | | | 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 | 2 | -0/+4 | |
| | | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-28 | 6 | -10/+40 | |
| | | | | | ||||||
* | | | | | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 26 | -31/+108 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update license headers | |||||
| * | | | | | update license headers and authors | Morris Jobke | 2015-06-25 | 26 | -31/+108 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-27 | 4 | -4/+24 | |
| | | | | | ||||||
* | | | | | 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-25 | 6 | -6/+28 | |
| | | | | | ||||||
* | | | | | 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 | |||||
* | | | | | | Added unit test to verify link password removeal | Roeland Jago Douma | 2015-06-24 | 1 | -1/+23 | |
| |/ / / / |/| | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-24 | 4 | -2/+8 | |
|/ / / / | ||||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-23 | 8 | -8/+40 | |
|/ / / | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-22 | 2 | -2/+16 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-21 | 6 | -4/+24 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-20 | 14 | -16/+96 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-19 | 34 | -68/+34 | |
| | | | ||||||
* | | | Merge pull request #16692 from owncloud/add_social_media_buttons | Björn Schießle | 2015-06-18 | 11 | -6/+650 | |
|\ \ \ | | | | | | | | | Add social media buttons | |||||
| * | | | add id to url | Bjoern Schiessle | 2015-06-18 | 2 | -7/+7 | |
| | | | | ||||||
| * | | | fix look of 'Share with me via ownCloud' button, fix wording | Jan-Christoph Borchardt | 2015-06-17 | 3 | -51/+11 | |
| | | | | ||||||
| * | | | fix path to owncloud logo | Bjoern Schiessle | 2015-06-17 | 2 | -2/+4 | |
| | | | | ||||||
| * | | | make the click actions work | Bjoern Schiessle | 2015-06-17 | 2 | -7/+9 | |
| | | | | ||||||
| * | | | federated cloud ID: add icons, fix HTML & layout, fix wording | Jan-Christoph Borchardt | 2015-06-17 | 10 | -39/+382 | |
| | | | | ||||||
| * | | | add social media button for diaspora, twitter, facebook and google+ | Bjoern Schiessle | 2015-06-17 | 7 | -6/+343 | |
| | | | | ||||||
* | | | | Merge pull request #16993 from owncloud/verify-if-path-exists | Lukas Reschke | 2015-06-18 | 1 | -0/+7 | |
|\ \ \ \ | | | | | | | | | | | [master] Verify if path exists | |||||
| * | | | | Throw nicer error message instead 500 | Lukas Reschke | 2015-06-17 | 1 | -1/+3 | |
| | | | | |