summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparentsVincent Petry2016-06-221-1/+22
|\
| * Fire hooks for mkdir for folder uploadkarakayasemi2016-06-211-1/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2226-12/+174
* | Fix null pointer exception in user_ldap (#25062)Jörn Friedrich Dreyer2016-06-211-1/+8
* | Merge pull request #24505 from owncloud/ceph-wait-for-httpVincent Petry2016-06-212-4/+9
|\ \
| * | Wait for port being accessible in addition to the notify socketThomas Müller2016-06-171-0/+5
| * | Give mysql docker more time to start upThomas Müller2016-06-171-4/+4
* | | redirect to new login route (#25099)Christoph Wurst2016-06-212-5/+17
* | | Merge pull request #25196 from owncloud/update-session-token-passwordChristoph Wurst2016-06-216-0/+143
|\ \ \
| * | | pass new password instead of usernameChristoph Wurst2016-06-211-1/+1
| * | | update session token password on user password changeChristoph Wurst2016-06-216-0/+143
* | | | Contacts API: replace raw image data with url (#25081)Georg Ehrke2016-06-2111-39/+384
* | | | fix broken unit test (#25198)Thomas Müller2016-06-211-1/+8
* | | | Merge pull request #25042 from owncloud/session-settings-ellipsisVincent Petry2016-06-213-33/+36
|\ \ \ \
| * | | | Fix tooltip position in token listVincent Petry2016-06-171-6/+4
| * | | | rearrange personal settings sectionsChristoph Wurst2016-06-101-28/+28
| * | | | add tooltip to token namesChristoph Wurst2016-06-101-1/+2
| * | | | add overflow ellipsis to session and device tokens listChristoph Wurst2016-06-101-0/+4
* | | | | Filter out group shares for owner where owner is included (#25190)Vincent Petry2016-06-212-2/+132
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-214-0/+8
* | | | Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
* | | | Don't send activity to non-admins when assigning invisible tags (#25192)Vincent Petry2016-06-201-0/+4
* | | | Merge pull request #25173 from owncloud/fix_conversion_issuesVincent Petry2016-06-204-0/+6
|\ \ \ \
| * | | | Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
* | | | | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-208-28/+176
|\ \ \ \ \
| * | | | | PasswordLoginForbidden must extend NotAuthenticatedVincent Petry2016-06-171-2/+2
| * | | | | throw PasswordLoginForbidden on DAVChristoph Wurst2016-06-173-3/+60
| * | | | | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-177-27/+118
* | | | | | Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
|\ \ \ \ \ \
| * | | | | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
* | | | | | | Update ExcludeFileByNameFilterIterator.php (#25184)Thomas Müller2016-06-201-0/+1
* | | | | | | Merge pull request #25010 from owncloud/gdrive-fix-testsVincent Petry2016-06-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix GDrive test rename overwrite folderVincent Petry2016-06-101-2/+2
* | | | | | | | Merge pull request #25161 from owncloud/fixgetsharefolderVincent Petry2016-06-202-5/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newlineVincent Petry2016-06-202-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | files_external: Keep checkbox and its label on one line #20032 #22655Markus Goetz2016-06-172-3/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #25174 from owncloud/tokenmapper-close-cursorVincent Petry2016-06-201-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | close cursor after loading a tokenChristoph Wurst2016-06-171-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #25168 from owncloud/capped-user-cacheVincent Petry2016-06-201-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Capped cache for user configJörn Friedrich Dreyer2016-06-171-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2016-4/+130
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-184-2/+68
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #25158 from owncloud/removerootshares-delaygetrootfolderVincent Petry2016-06-171-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Use getLazyRootFolder from RemoveRootShares repair stepVincent Petry2016-06-171-1/+1
| |/ / / / /
* | | | | / Added test with new endpoint (#23934)Sergio Bertolín2016-06-172-37/+55
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #25153 from owncloud/fix-problem-added-in-25023Vincent Petry2016-06-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changed global variable to localSergio Bertolín2016-06-171-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1728-6/+176
* | | | Merge pull request #24965 from owncloud/streams-0.4.1Vincent Petry2016-06-166-52/+39
|\ \ \ \