Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents | Vincent Petry | 2016-06-22 | 1 | -1/+22 |
|\ | | | | | Fire hooks for mkdir for folder upload | ||||
| * | Fire hooks for mkdir for folder upload | karakayasemi | 2016-06-21 | 1 | -1/+22 |
| | | | | | | | | | | | | fromTmpFile function, usual mkdir call is only working for file's parent directory. Does not care upper parent folders. I added a recursive function that creates parent non-existing folders with usual mkdir. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-22 | 26 | -12/+174 |
| | | |||||
* | | 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 | 2 | -4/+9 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | Give mysql docker more time to start up | Thomas Müller | 2016-06-17 | 1 | -4/+4 |
| | | | |||||
* | | | redirect to new login route (#25099) | Christoph Wurst | 2016-06-21 | 2 | -5/+17 |
| | | | | | | | | | | | | | | | | | | * redirect to new login route * encode anchor in url and restore it client-side | ||||
* | | | Merge pull request #25196 from owncloud/update-session-token-password | Christoph Wurst | 2016-06-21 | 6 | -0/+143 |
|\ \ \ | | | | | | | | | update session token password on user password change | ||||
| * | | | pass new password instead of username | Christoph Wurst | 2016-06-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | update session token password on user password change | Christoph Wurst | 2016-06-21 | 6 | -0/+143 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | Merge pull request #25042 from owncloud/session-settings-ellipsis | Vincent Petry | 2016-06-21 | 3 | -33/+36 |
|\ \ \ \ | | | | | | | | | | | add overflow ellipsis to session and device tokens list | ||||
| * | | | | Fix tooltip position in token list | Vincent Petry | 2016-06-17 | 1 | -6/+4 |
| | | | | | |||||
| * | | | | rearrange personal settings sections | Christoph Wurst | 2016-06-10 | 1 | -28/+28 |
| | | | | | |||||
| * | | | | add tooltip to token names | Christoph Wurst | 2016-06-10 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | add overflow ellipsis to session and device tokens list | Christoph Wurst | 2016-06-10 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Filter out group shares for owner where owner is included (#25190) | Vincent Petry | 2016-06-21 | 2 | -2/+132 |
| |/ / / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-21 | 4 | -0/+8 |
| | | | | |||||
* | | | | 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 | 8 | -28/+176 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 7 | -27/+118 |
| | | | | | | |||||
* | | | | | | 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. | ||||
* | | | | | | | Update ExcludeFileByNameFilterIterator.php (#25184) | Thomas Müller | 2016-06-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application: 1: .webapp tag with more detailed info on the configuration done by webapp-config 2: .webapp-appname with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations. | ||||
* | | | | | | | 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 | ||||
* | | | | | | | | Merge pull request #25174 from owncloud/tokenmapper-close-cursor | Vincent Petry | 2016-06-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | close cursor after loading a token | ||||
| * | | | | | | | | close cursor after loading a token | Christoph Wurst | 2016-06-17 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #25168 from owncloud/capped-user-cache | Vincent Petry | 2016-06-20 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Capped cache for user config | ||||
| * | | | | | | | | Capped cache for user config | Jörn Friedrich Dreyer | 2016-06-17 | 1 | -2/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 16 | -4/+130 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-18 | 4 | -2/+68 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #25158 from owncloud/removerootshares-delaygetrootfolder | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Delay getRootFolder from RemoveRootShares repair step | ||||
| * | | | | | | Use getLazyRootFolder from RemoveRootShares repair step | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the command registration to setup the FS too early when FS-related apps might need upgrading. | ||||
* | | | | / | Added test with new endpoint (#23934) | Sergio Bertolín | 2016-06-17 | 2 | -37/+55 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added test with new endpoint * Moved all scenarios using new dav endpoint to a new feature file * Removed extra slash in welcome.txt * some fixes * Incorrect user while downloading with range * Fixed Content-disposition | ||||
* | | | | | Merge pull request #25153 from owncloud/fix-problem-added-in-25023 | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Changed global variable to local | ||||
| * | | | | 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 | 28 | -6/+176 |
| | | | | |||||
* | | | | Merge pull request #24965 from owncloud/streams-0.4.1 | Vincent Petry | 2016-06-16 | 6 | -52/+39 |
|\ \ \ \ | | | | | | | | | | | update icewind/streams to 0.4.1 |