Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Comments GUI | Vincent Petry | 2016-02-02 | 9 | -0/+408 |
| | |||||
* | Merge pull request #22054 from vincchan/vincchan/fix#20199 | Thomas Müller | 2016-02-02 | 6 | -36/+83 |
|\ | | | | | Move data protection check to javascript | ||||
| * | changed variables to lowercase | Vincent Chan | 2016-02-02 | 1 | -5/+5 |
| | | |||||
| * | Move data protection check to javascript | Vincent Chan | 2016-02-01 | 6 | -36/+83 |
| | | | | | | | | fixes #20199 | ||||
* | | Merge pull request #22023 from owncloud/interruptable-commands | Thomas Müller | 2016-02-02 | 3 | -61/+55 |
|\ \ | | | | | | | Interruptable commands | ||||
| * | | Add startup warning that the PCNTL extensions are missing | Thomas Müller | 2016-02-01 | 1 | -0/+4 |
| | | | |||||
| * | | Move signal handling to the base class to allow other commands to reuse this ↵ | Thomas Müller | 2016-02-01 | 2 | -61/+51 |
| | | | | | | | | | | | | feature | ||||
* | | | Merge pull request #22013 from owncloud/share2_moveshare | Thomas Müller | 2016-02-02 | 6 | -3/+249 |
|\ \ \ | | | | | | | | | [Share 2.0] Allow moving of shares | ||||
| * | | | [Share 2.0] Allow moving of shares | Roeland Jago Douma | 2016-02-02 | 6 | -3/+249 |
| | | | | | | | | | | | | | | | | | | | | * Only recipient can move a share * Unit tests | ||||
* | | | | Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags | Thomas Müller | 2016-02-02 | 13 | -42/+875 |
|\ \ \ \ | | | | | | | | | | | Issue 22041 activities for systemtags | ||||
| * | | | | Fix path match | Joas Schilling | 2016-02-02 | 2 | -2/+6 |
| | | | | | |||||
| * | | | | Fix IManager::isFormattingFilteredObject() | Joas Schilling | 2016-02-02 | 1 | -5/+4 |
| | | | | | |||||
| * | | | | Add activities when a tag is (un-)assigned | Joas Schilling | 2016-02-02 | 4 | -20/+175 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | Dispatch events when tags are added/updated/deleted | Joas Schilling | 2016-02-02 | 4 | -14/+161 |
| | | | | | |||||
| * | | | | Dispatch some events when tags are un-/assigned | Joas Schilling | 2016-02-02 | 5 | -22/+145 |
| | | | | | |||||
* | | | | | 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 | ||||
| * | | | | | Make sure user has access to file for system tag operations | Vincent Petry | 2016-02-01 | 6 | -13/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes DAV's SystemTagsObjectTypeCollection to not give access to files where the current user doesn't have access to. | ||||
* | | | | | | Merge pull request #22057 from owncloud/share2_update_hash | Thomas Müller | 2016-02-02 | 2 | -1/+24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update old password hashed for link shares on access | ||||
| * | | | | | | Update old password hashed for link shares on access | Roeland Jago Douma | 2016-02-01 | 2 | -1/+24 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16594 | ||||
* | | | | | | Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooks | Thomas Müller | 2016-02-02 | 8 | -249/+41 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Allow search in synced addressbooks | ||||
| * | | | | | Filter contacts from the local system addressbook - remote share with local ↵ | Thomas Müller | 2016-02-02 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | users is not allowed | ||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | The local address book is replaced now by the system addressbook as part of ↵ | Thomas Müller | 2016-02-02 | 3 | -241/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | the dav app | ||||
* | | | | | | Merge pull request #22005 from owncloud/share2_getshare_byid_as_recipient | Roeland Douma | 2016-02-02 | 5 | -30/+69 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [Share 2.0] Allow recipient to be passed in to getShareById | ||||
| * | | | | | getChildren should not return usergroup shares | Roeland Jago Douma | 2016-02-02 | 2 | -6/+7 |
| | | | | | | |||||
| * | | | | | [Share 2.0] Allow recipient to be passed in to getShareById | Roeland Jago Douma | 2016-02-02 | 5 | -24/+62 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | * This allows us to retrieve usergroup shares for a given id. If the user deleted a share or moved it this will be a different share | ||||
* | | | | | Merge pull request #20903 from owncloud/sharing-mount-option | Thomas Müller | 2016-02-02 | 3 | -1/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Add mount option to disable sharing | ||||
| * | | | | | adjust js unit test | Robin Appelman | 2016-01-29 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add mount option to disable sharing | Robin Appelman | 2016-01-29 | 2 | -1/+17 |
| | | | | | | |||||
* | | | | | | Merge pull request #22015 from owncloud/share-no-permissions | Thomas Müller | 2016-02-02 | 2 | -8/+21 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Block shares that dont have the correct source permissions | ||||
| * | | | | | Block shares that dont have the correct source permissions | Robin Appelman | 2016-01-29 | 2 | -8/+21 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-02 | 56 | -82/+38 |
| | | | | | | |||||
* | | | | | | 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() | ||||
| * | | | | | 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 | 12 | -8/+590 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Comments WebDAV adjustements | ||||
| * | | | | | url encode id | Arthur Schiwon | 2016-01-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | introduce comments read marke tables, comes with user cleanup after deletion | Arthur Schiwon | 2016-01-29 | 7 | -14/+213 |
| | | | | | | |||||
| * | | | | | standardize datetime output | Arthur Schiwon | 2016-01-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Comments WebDAV adjustements | Arthur Schiwon | 2016-01-29 | 9 | -7/+390 |
| | |_|/ / | |/| | | | |||||
* | | | | | 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 | ||||
| * | | | | | Prevent invalid storages being displayed in the storages view | Robin McCorkell | 2016-01-26 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #22028 from owncloud/share_hook_expirationdate | Thomas Müller | 2016-02-01 | 2 | -28/+134 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Share hook expirationdate | ||||
| * | | | | | | Add Unit tests | Roeland Jago Douma | 2016-01-30 | 1 | -19/+111 |
| | | | | | | | |||||
| * | | | | | | Emit hook for expirationDate verification | Roeland Jago Douma | 2016-01-30 | 1 | -9/+23 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #22046 from owncloud/improved_error_handling | Thomas Müller | 2016-02-01 | 3 | -4/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improved error handling | ||||
| * | | | | | | | catch all exceptions | Björn Schießle | 2016-02-01 | 2 | -0/+6 |
| | | | | | | | |