Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21999 from owncloud/properly-decode-cached-objects | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ | | | | | [user_ldap] properly decode cached objects | ||||
| * | [user_ldap] properly decode cached objects | Morris Jobke | 2016-01-29 | 1 | -1/+1 |
| | | | | | | | | * fixes #21896 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-01 | 2 | -0/+44 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-31 | 18 | -0/+32 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-30 | 4 | -0/+6 |
| | | |||||
* | | Merge pull request #22018 from owncloud/occ-external-delete | Thomas Müller | 2016-01-29 | 2 | -0/+116 |
|\ \ | | | | | | | Add delete command for external storages | ||||
| * | | Add delete command for external storages | Robin Appelman | 2016-01-29 | 2 | -0/+116 |
| | | | |||||
* | | | inject logger | Robin Appelman | 2016-01-29 | 6 | -11/+33 |
| | | | |||||
* | | | Dont set null values when validating storage definition | Robin Appelman | 2016-01-29 | 3 | -6/+12 |
| | | | |||||
* | | | minor fixes | Robin Appelman | 2016-01-29 | 3 | -7/+11 |
| | | | |||||
* | | | set auth mechanism in tests | Robin Appelman | 2016-01-29 | 1 | -0/+1 |
| | | | |||||
* | | | remove custom controler for user provided password auth | Robin Appelman | 2016-01-29 | 7 | -141/+97 |
| | | | |||||
* | | | dont show user provided auth as option for personal mounts | Robin Appelman | 2016-01-29 | 3 | -3/+5 |
| | | | |||||
* | | | Allow setting user provided credentials from the personal settings page | Robin Appelman | 2016-01-29 | 6 | -44/+180 |
| | | | |||||
* | | | expose user provided credentials for admin mounts | Robin Appelman | 2016-01-29 | 2 | -1/+10 |
| | | | |||||
* | | | Add user provided credentials mechanism | Robin Appelman | 2016-01-29 | 4 | -1/+142 |
| | | | |||||
* | | | Fix invalid storages not showing in directory listing | Robin Appelman | 2016-01-29 | 2 | -1/+130 |
| | | | |||||
* | | | Merge pull request #21660 from owncloud/sharing2_update_reshares | Thomas Müller | 2016-01-29 | 4 | -46/+496 |
|\ \ \ | | | | | | | | | upgrade to sharing 2.0, remove hierarchical re-shares | ||||
| * | | | Update the initiator of the share as well in migration | Roeland Jago Douma | 2016-01-28 | 3 | -7/+74 |
| | | | | |||||
| * | | | Update reshares in batches as not to run out of memory | Roeland Jago Douma | 2016-01-28 | 2 | -14/+97 |
| | | | | |||||
| * | | | upgrade to sharing 2.0, remove hierarchical re-shares | Björn Schießle | 2016-01-28 | 4 | -48/+348 |
| | |/ | |/| | |||||
* | | | Merge pull request #21928 from owncloud/files-external-js-checkbox-fix | Thomas Müller | 2016-01-29 | 2 | -5/+93 |
|\ \ \ | | | | | | | | | Fix validation of inputs that aren't text | ||||
| * | | | Add storage validation JS unit tests | Robin McCorkell | 2016-01-29 | 1 | -1/+75 |
| | | | | |||||
| * | | | Fix validation of inputs that aren't text | Robin McCorkell | 2016-01-26 | 1 | -4/+18 |
| | | | | |||||
* | | | | Merge pull request #21990 from owncloud/systemtags-cleanup-orphans | Thomas Müller | 2016-01-29 | 5 | -17/+268 |
|\ \ \ \ | |_|_|/ |/| | | | Background cleanup job for system and user tag orphaned when file was deleted | ||||
| * | | | Cleanup job for system and user tag orphaned when file was deleted | Vincent Petry | 2016-01-29 | 5 | -17/+268 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file was deleted (also from trash), the tag mapping is pointing at a fileid that doesn't exist any more. This cleanup job will delete such orphaned mapping entries. | ||||
* | | | | Merge pull request #21701 from owncloud/scan_files_more_details_II | Thomas Müller | 2016-01-29 | 1 | -38/+71 |
|\ \ \ \ | | | | | | | | | | | occ scan:files Adding more details in the base print out (II) | ||||
| * | | | | occ scan:files Adding more details in the base print out (II) | martin.mattel@diemattels.at | 2016-01-29 | 1 | -38/+71 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper method name Fixed the interruption logic Checks the availability of the pcntl_signal function Fixed typo crtl-c --> ctrl-c one overseen crtl-c typo | ||||
* | | | | Merge pull request #21932 from owncloud/comments-dav-refinements | Thomas Müller | 2016-01-29 | 4 | -8/+36 |
|\ \ \ \ | |/ / / |/| | | | provide info about plugin, and do not run commit ourselves on proppatch | ||||
| * | | | provide info about plugin, and do not run commit ourselves on proppatch | Arthur Schiwon | 2016-01-26 | 4 | -8/+36 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-29 | 8 | -4/+8 |
| | | | | |||||
* | | | | Merge pull request #21333 from owncloud/migrate-contacts | Thomas Müller | 2016-01-28 | 11 | -2/+650 |
|\ \ \ \ | |_|_|/ |/| | | | Migrate contacts | ||||
| * | | | Add copyright header | Lukas Reschke | 2016-01-28 | 1 | -0/+19 |
| | | | | |||||
| * | | | Fix sql to get shared addressbooks including unit tests | Thomas Müller | 2016-01-27 | 2 | -1/+17 |
| | | | | |||||
| * | | | Unit testing database access to old contacts tables | Thomas Müller | 2016-01-27 | 3 | -3/+267 |
| | | | | |||||
| * | | | Unit testing migration logic | Thomas Müller | 2016-01-27 | 4 | -44/+176 |
| | | | | |||||
| * | | | Add app to migrate contacts and calendars | Thomas Müller | 2016-01-27 | 7 | -2/+219 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add group sharing migration Migrate all users | ||||
* | | | | Fix OCS unit tests after two share merges | Roeland Jago Douma | 2016-01-28 | 2 | -32/+32 |
| | | | | | | | | | | | | | | | | | | | | * Use getNode * Return IShare object so typechecking is happy | ||||
* | | | | Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings | Thomas Müller | 2016-01-28 | 2 | -32/+744 |
|\ \ \ \ | | | | | | | | | | | Share2 ocs fix passing empty strings | ||||
| * | | | | [Share 2.0] Allow using permissions to update link share | Roeland Jago Douma | 2016-01-27 | 2 | -14/+113 |
| | | | | | |||||
| * | | | | [Share 2.0] Still allow isolated updates | Roeland Jago Douma | 2016-01-27 | 2 | -11/+125 |
| | | | | | | | | | | | | | | | | | | | | Still allow isolated updates of parameters | ||||
| * | | | | [Share 2.0] Also handle empty parameter in updateShare | Roeland Jago Douma | 2016-01-27 | 2 | -24/+283 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * More sanity checks * More unit tests | ||||
| * | | | | [Share 2.0] When passing empty strings don't fail | Roeland Jago Douma | 2016-01-27 | 2 | -10/+250 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The password and expiration date can be set to empty strings when created. This is now handled gracefully. | ||||
* | | | | | cleanup shared cache | Robin Appelman | 2016-01-28 | 5 | -543/+61 |
| | | | | | |||||
* | | | | | [Share 2.0] Fix interfaces and comments | Roeland Jago Douma | 2016-01-28 | 4 | -33/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Made comments more clear * Removed unneeded methods * IShares shareTime is now a proper DateTime object * IShares getPath -> getNode & setPath -> setNode * Fix unit tests | ||||
* | | | | | [Share 2.0] Move IShare to OCP | Roeland Jago Douma | 2016-01-27 | 4 | -36/+35 |
|/ / / / | |||||
* | | | | Merge pull request #21895 from owncloud/calendar-sharing | Thomas Müller | 2016-01-27 | 12 | -132/+912 |
|\ \ \ \ | | | | | | | | | | | Migrate from CardDAV sharing to more general DAV sharing | ||||
| * | | | | Extract sharing functionality into own backend class for reusability | Thomas Müller | 2016-01-27 | 6 | -96/+203 |
| | | | | | |||||
| * | | | | Fix server ctor including unit test - this shall never happen again | Thomas Müller | 2016-01-27 | 2 | -1/+25 |
| | | | | | |||||
| * | | | | Migrate from CardDAV sharing to more generalk DAV sharing | Thomas Müller | 2016-01-27 | 9 | -36/+685 |
| | | | | |