Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [Share 2.0] Use GenericShareException | Roeland Jago Douma | 2016-02-02 | 2 | -28/+8 |
* | [Share 2.0] Add exceptions to OCP | Roeland Jago Douma | 2016-02-02 | 4 | -8/+9 |
* | Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags | Thomas Müller | 2016-02-02 | 4 | -1/+561 |
|\ | |||||
| * | Fix path match | Joas Schilling | 2016-02-02 | 2 | -2/+6 |
| * | Add activities when a tag is (un-)assigned | Joas Schilling | 2016-02-02 | 3 | -20/+171 |
| * | Add activities for admins when a tag is created/updated/deleted | Joas Schilling | 2016-02-02 | 3 | -0/+402 |
| * | App needs to be of type logging to be able to have activities | Joas Schilling | 2016-02-02 | 1 | -1/+4 |
* | | Merge pull request #22055 from owncloud/systemtags-checkfileidowner | Thomas Müller | 2016-02-02 | 6 | -13/+109 |
|\ \ | |||||
| * | | Make sure user has access to file for system tag operations | Vincent Petry | 2016-02-01 | 6 | -13/+109 |
* | | | Filter contacts from the local system addressbook - remote share with local u... | Thomas Müller | 2016-02-02 | 2 | -0/+7 |
* | | | PHP 5.4 compatibility | Thomas Müller | 2016-02-02 | 1 | -1/+2 |
* | | | In some cases $contact['CLOUD'] is not an array | Thomas Müller | 2016-02-02 | 1 | -1/+5 |
* | | | Register all system address books to the contacts manager | Thomas Müller | 2016-02-02 | 3 | -6/+27 |
* | | | Merge pull request #20903 from owncloud/sharing-mount-option | Thomas Müller | 2016-02-02 | 2 | -1/+8 |
|\ \ \ | |||||
| * | | | adjust js unit test | Robin Appelman | 2016-01-29 | 1 | -0/+1 |
| * | | | Add mount option to disable sharing | Robin Appelman | 2016-01-29 | 1 | -1/+7 |
* | | | | Merge pull request #22015 from owncloud/share-no-permissions | Thomas Müller | 2016-02-02 | 1 | -6/+18 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Block shares that dont have the correct source permissions | Robin Appelman | 2016-01-29 | 1 | -6/+18 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-02 | 48 | -82/+12 |
* | | | | 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 |