Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22050 from owncloud/fix_sync_addressbook | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ | |||||
| * | pass parameter in the right order to syncRemoteAddressBook() | Björn Schießle | 2016-02-01 | 1 | -1/+1 |
* | | Merge pull request #21967 from owncloud/comments-webdav | Thomas Müller | 2016-02-01 | 4 | -2/+281 |
|\ \ | |||||
| * | | url encode id | Arthur Schiwon | 2016-01-29 | 1 | -1/+1 |
| * | | standardize datetime output | Arthur Schiwon | 2016-01-29 | 1 | -1/+1 |
| * | | Comments WebDAV adjustements | Arthur Schiwon | 2016-01-29 | 4 | -2/+281 |
* | | | Merge pull request #21909 from owncloud/files-external-visibility | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Prevent invalid storages being displayed in the storages view | Robin McCorkell | 2016-01-26 | 1 | -1/+1 |
* | | | | Merge pull request #22046 from owncloud/improved_error_handling | Thomas Müller | 2016-02-01 | 3 | -4/+10 |
|\ \ \ \ | |||||
| * | | | | catch all exceptions | Björn Schießle | 2016-02-01 | 2 | -0/+6 |
| * | | | | add context to the error messages | Björn Schießle | 2016-02-01 | 1 | -4/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #22045 from owncloud/ext-storage-auth-backend-rewording | Thomas Müller | 2016-02-01 | 3 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Reword external storage auth backends | Vincent Petry | 2016-02-01 | 3 | -3/+3 |
| |/ / / | |||||
* | | | | Merge pull request #22004 from Pookay/patch-1 | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix the result at the bottom on IE | Pookay | 2016-01-29 | 1 | -1/+1 |
* | | | | | Merge pull request #22021 from owncloud/fix-system-addressbook-sync-with-encr... | Thomas Müller | 2016-02-01 | 1 | -2/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Catch potential exceptions when accessing the users avatar - e.g. issues with... | Thomas Müller | 2016-01-29 | 1 | -2/+15 |
* | | | | | Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithme | Thomas Müller | 2016-02-01 | 1 | -7/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Add path filter to OCS Share API ?shared_with_me=true | Roeland Jago Douma | 2016-01-29 | 1 | -7/+11 |
| |/ / / / | |||||
* | | | | | 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 | Morris Jobke | 2016-01-29 | 1 | -1/+1 |
* | | | | | | [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 | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Cleanup job for system and user tag orphaned when file was deleted | Vincent Petry | 2016-01-29 | 5 | -17/+268 |
* | | | | | 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) | martin.mattel@diemattels.at | 2016-01-29 | 1 | -38/+71 |
| |/ / / | |||||
* | | | | 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 | Arthur Schiwon | 2016-01-26 | 4 | -8/+36 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-29 | 8 | -4/+8 |