Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Hide search results after switching directory | Vincent Petry | 2016-06-24 | 1 | -0/+7 |
| | | | | | When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear. | ||||
* | Fix search result link for file results outside default list | Vincent Petry | 2016-06-24 | 1 | -2/+2 |
| | | | | | When outside the "All files" list, the search result link must properly redirect to the "All files" list. | ||||
* | Merge pull request #25171 from owncloud/files_external-list-all | Vincent Petry | 2016-06-24 | 5 | -10/+81 |
|\ | | | | | Add option to `occ files_external:list` to show all configured mounts | ||||
| * | Add option to `occ files_external:list` to show all configured mounts | Robin Appelman | 2016-06-23 | 5 | -10/+81 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-24 | 6 | -4/+68 |
| | | |||||
* | | Merge pull request #25238 from owncloud/files-trashlistnamecorruption | Vincent Petry | 2016-06-23 | 2 | -0/+24 |
|\ \ | |/ |/| | Fix trashed file name corruption when rerendering trashbin list | ||||
| * | Fix trashed file name corruption when rerendering trashbin list | Vincent Petry | 2016-06-23 | 2 | -0/+24 |
| | | | | | | | | | | | | | | The trashbin code does some gymnastics with the file data at render time. This fix makes sure that the modifications done on the file data are only local to the rendering code and doesn't affect the actual file data from the file list. | ||||
* | | Merge pull request #25225 from owncloud/enc-revertversionsize | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
|\ \ | | | | | | | Rollback version must also adjust cached size | ||||
| * | | Rollback version must also adjust cached size | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
| | | | |||||
* | | | Merge pull request #25223 from owncloud/external-list-default-options | Vincent Petry | 2016-06-22 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Hide more default options in occ files_external:list | ||||
| * | | | Hide more default options in occ files_external:list | Robin Appelman | 2016-06-22 | 1 | -1/+3 |
| | | | | |||||
* | | | | Increase fed share timeout from 3 to 10 + unit tests | Vincent Petry | 2016-06-22 | 5 | -15/+30 |
| | | | | |||||
* | | | | Add timeouts to make the UI usable again when a remote share is unreachable | Joas Schilling | 2016-06-22 | 4 | -5/+20 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-22 | 18 | -6/+150 |
| | | | |||||
* | | | Fix null pointer exception in user_ldap (#25062) | Jörn Friedrich Dreyer | 2016-06-21 | 1 | -1/+8 |
| | | | |||||
* | | | Merge pull request #24505 from owncloud/ceph-wait-for-http | Vincent Petry | 2016-06-21 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Don't rely on the notify socket but on the service responding | ||||
| * | | | Wait for port being accessible in addition to the notify socket | Thomas Müller | 2016-06-17 | 1 | -0/+5 |
| | | | | |||||
* | | | | Contacts API: replace raw image data with url (#25081) | Georg Ehrke | 2016-06-21 | 11 | -39/+384 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add uri to AddressBookImpl array * Introduce ImageExportPlugin for CardDav * add plugin to v1 routes * replace binary contact photo with link * update tests * Adding unit tests | ||||
* | | | fix broken unit test (#25198) | Thomas Müller | 2016-06-21 | 1 | -1/+8 |
| |/ |/| | |||||
* | | Filter out group shares for owner where owner is included (#25190) | Vincent Petry | 2016-06-21 | 2 | -2/+132 |
| | | |||||
* | | Catch exceptions while creating shared mounts (#25077) | Robin Appelman | 2016-06-20 | 2 | -11/+25 |
| | | |||||
* | | Don't send activity to non-admins when assigning invisible tags (#25192) | Vincent Petry | 2016-06-20 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #25173 from owncloud/fix_conversion_issues | Vincent Petry | 2016-06-20 | 4 | -0/+6 |
|\ \ | | | | | | | Fix conversion issues | ||||
| * | | Fix conversion issues | Juan Pablo Villafáñez | 2016-06-20 | 4 | -0/+6 |
| |/ | | | | | | | Change to phpdoc type for automatic conversion | ||||
* | | Merge pull request #25162 from owncloud/password-login-forbidden-hint | Vincent Petry | 2016-06-20 | 3 | -7/+87 |
|\ \ | | | | | | | Password login forbidden hint | ||||
| * | | PasswordLoginForbidden must extend NotAuthenticated | Vincent Petry | 2016-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | The auth code from Sabre will forward NotAuthenticated exceptions but in the case of a generic exception, it is packaged as "service not available". | ||||
| * | | throw PasswordLoginForbidden on DAV | Christoph Wurst | 2016-06-17 | 3 | -3/+60 |
| | | | |||||
| * | | add PasswordLoginForbiddenException | Christoph Wurst | 2016-06-17 | 2 | -6/+29 |
| | | | |||||
* | | | Merge pull request #25159 from owncloud/share-app-initorder | Vincent Petry | 2016-06-20 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Delay files_sharing's registerMountProviders | ||||
| * | | | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized. | ||||
* | | | | Merge pull request #25010 from owncloud/gdrive-fix-tests | Vincent Petry | 2016-06-20 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix GDrive test rename overwrite folder | ||||
| * | | | | Fix GDrive test rename overwrite folder | Vincent Petry | 2016-06-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #25161 from owncloud/fixgetsharefolder | Vincent Petry | 2016-06-20 | 2 | -5/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Make getShareFolder use given view instead of static FS | ||||
| * | | | | | Make getShareFolder use given view instead of static FS | Vincent Petry | 2016-06-17 | 2 | -5/+9 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newline | Vincent Petry | 2016-06-20 | 2 | -3/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | files_external: Keep checkbox and its label on one line | ||||
| * | | | | | files_external: Keep checkbox and its label on one line #20032 #22655 | Markus Goetz | 2016-06-17 | 2 | -3/+7 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Else the checkbox and the decription end up on different lines in my Chrome on OS X | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 10 | -2/+56 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-18 | 4 | -2/+68 |
|/ / / / | |||||
* / / / | Changed global variable to local | Sergio Bertolín | 2016-06-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 18 | -4/+116 |
| | | | |||||
* | | | Merge pull request #24965 from owncloud/streams-0.4.1 | Vincent Petry | 2016-06-16 | 5 | -52/+39 |
|\ \ \ | | | | | | | | | update icewind/streams to 0.4.1 | ||||
| * | | | update icewind/streams to 0.4.1 | Robin Appelman | 2016-06-15 | 5 | -52/+39 |
| | |/ | |/| | |||||
* | | | Move birthday calendar generation to a live migration job (#25135) | Thomas Müller | 2016-06-16 | 5 | -66/+84 |
| | | | |||||
* | | | Merge pull request #25104 from owncloud/dropbox-catchratelimit | Vincent Petry | 2016-06-16 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | ||||
| * | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-14 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolder | Vincent Petry | 2016-06-16 | 2 | -1/+43 |
|\ \ \ \ | |_|/ / |/| | | | disable cleanFolder for the federated share storage | ||||
| * | | | disable cleanFolder for the federated share storage | Robin Appelman | 2016-06-14 | 2 | -1/+43 |
| |/ / | |||||
* | | | Merge pull request #25082 from owncloud/fix-sessionless-clients | Vincent Petry | 2016-06-15 | 2 | -14/+6 |
|\ \ \ | | | | | | | | | Fix sessionless clients | ||||
| * | | | create session token only for clients that support cookies | Christoph Wurst | 2016-06-13 | 1 | -12/+5 |
| | | | | |||||
| * | | | create session token on all APIs | Christoph Wurst | 2016-06-13 | 1 | -2/+1 |
| | | | |