Commit message (Expand) | 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 | karakayasemi | 2016-06-21 | 1 | -1/+22 |
* | | [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 |
|\ \ | |||||
| * | | 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 |
* | | | Merge pull request #25196 from owncloud/update-session-token-password | Christoph Wurst | 2016-06-21 | 6 | -0/+143 |
|\ \ \ | |||||
| * | | | 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 |
* | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 | Juan Pablo Villafáñez | 2016-06-20 | 4 | -0/+6 |
* | | | | | Merge pull request #25162 from owncloud/password-login-forbidden-hint | Vincent Petry | 2016-06-20 | 8 | -28/+176 |
|\ \ \ \ \ | |||||
| * | | | | | PasswordLoginForbidden must extend NotAuthenticated | Vincent Petry | 2016-06-17 | 1 | -2/+2 |
| * | | | | | 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 | Vincent Petry | 2016-06-17 | 1 | -3/+3 |
* | | | | | | | Update ExcludeFileByNameFilterIterator.php (#25184) | Thomas Müller | 2016-06-20 | 1 | -0/+1 |
* | | | | | | | Merge pull request #25010 from owncloud/gdrive-fix-tests | Vincent Petry | 2016-06-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 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 #20032 #22655 | Markus Goetz | 2016-06-17 | 2 | -3/+7 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #25174 from owncloud/tokenmapper-close-cursor | Vincent Petry | 2016-06-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | 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 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Use getLazyRootFolder from RemoveRootShares repair step | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | / | Added test with new endpoint (#23934) | Sergio Bertolín | 2016-06-17 | 2 | -37/+55 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #25153 from owncloud/fix-problem-added-in-25023 | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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 |
|\ \ \ \ |