summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1130 from nextcloud/shared-upload-quotaRoeland Jago Douma2016-08-292-0/+28
|\
| * A shared storage is never a home storage - fixes #25582Thomas Müller2016-08-291-0/+10
| * Added integration testSergio Bertolin2016-08-291-0/+18
* | Merge pull request #1147 from nextcloud/files-hidden-files-summaryRoeland Jago Douma2016-08-294-52/+230
|\ \
| * | Display number of hidden files in files summary (#25870)Vincent Petry2016-08-294-52/+230
| |/
* | Merge pull request #1146 from nextcloud/init-filesconfigRoeland Jago Douma2016-08-291-0/+4
|\ \
| * | Make sure file list files config always existsVincent Petry2016-08-291-0/+4
| |/
* | Merge pull request #1148 from nextcloud/files-scan-reconnect-database-before-...Roeland Jago Douma2016-08-291-1/+26
|\ \
| * | Before a user is getting scanned the database connection is re-establishedThomas Müller2016-08-291-1/+26
| |/
* | Merge pull request #1145 from nextcloud/upstream-25794Roeland Jago Douma2016-08-292-9/+6
|\ \
| * | [master] DAV: Return data-fingerprint always when asked (#25482)Markus Goetz2016-08-292-9/+6
| |/
* | Merge pull request #1142 from nextcloud/fix-case-sensitive-settingsRoeland Jago Douma2016-08-291-0/+10
|\ \
| * | Fix issues where some user settings cannot be loaded when the user id differs...Thomas Müller2016-08-291-0/+10
| |/
* | Merge pull request #1139 from nextcloud/clean-code-imageRoeland Jago Douma2016-08-291-15/+11
|\ \
| * | Some cleanup within OC_Image (#25875)Thomas Müller2016-08-291-15/+11
| |/
* | Merge pull request #1115 from nextcloud/fix_146Christoph Wurst2016-08-291-1/+1
|\ \
| * | Link 'Allow editing' => 'Allow upload and editing'Roeland Jago Douma2016-08-281-1/+1
| |/
* | Merge pull request #1136 from nextcloud/fix-16041Joas Schilling2016-08-291-0/+2
|\ \
| * | Modified overflow in multiselectorSergio Bertolín2016-08-291-0/+2
| |/
* | Merge pull request #1135 from nextcloud/choose-buttonsJoas Schilling2016-08-291-0/+14
|\ \
| * | Choose button remains disabled unless files are chosenSujith Haridasan2016-08-291-0/+14
| |/
* | Merge pull request #1134 from nextcloud/fix_redirectionJoas Schilling2016-08-291-1/+1
|\ \
| * | Fix redirection taking care of protocol and portJuan Pablo Villafáñez2016-08-291-1/+1
| |/
* | Merge pull request #1133 from nextcloud/fix-numerousJoas Schilling2016-08-292-33/+19
|\ \
| * | always return numeric storage id as int, also check type equality in test ass...Jörn Friedrich Dreyer2016-08-292-33/+19
| |/
* | Merge pull request #1131 from nextcloud/add-paddingJoas Schilling2016-08-291-1/+2
|\ \
| * | Adds padding and max-width to the input for the sign up page. (#25959)Raghu Nayyar2016-08-291-1/+2
| |/
* | Merge pull request #1128 from nextcloud/upstream-25922Roeland Jago Douma2016-08-297-119/+143
|\ \
| * | Fix group sorting in user list group selectionVincent Petry2016-08-291-2/+2
| * | Extra non-available groups also in listVincent Petry2016-08-291-2/+15
| * | Users page lazy multiselect group dropdownsVincent Petry2016-08-296-117/+128
| |/
* | Merge pull request #1117 from iamfool/masterLukas Reschke2016-08-292-4/+4
|\ \ | |/ |/|
| * Update AdminTest.phpiamfool2016-08-291-3/+3
| * Update Admin.phpiamfool2016-08-281-1/+1
* | Merge pull request #976 from nextcloud/downstream-25702Lukas Reschke2016-08-284-8/+19
|\ \
| * | Hide the LDAP password in the client sideJuan Pablo Villafáñez2016-08-194-8/+19
* | | Merge pull request #847 from nextcloud/quota-mount-in-homefolderLukas Reschke2016-08-281-1/+1
|\ \ \ | |_|/ |/| |
| * | fix quota calculation when a filesystem is mounted in a user homeRobin Appelman2016-08-121-1/+1
* | | Merge pull request #1093 from nextcloud/mail-fontstackRaghu Nayyar2016-08-281-1/+1
|\ \ \
| * | | use proper font stack for emailJan-Christoph Borchardt2016-08-261-1/+1
* | | | Merge pull request #1105 from nextcloud/usermenu-orderingRaghu Nayyar2016-08-281-3/+3
|\ \ \ \
| * | | | fix ordering of user menu entriesJan-Christoph Borchardt2016-08-271-3/+3
* | | | | Merge pull request #1097 from nextcloud/2fa-cancel-login-stylingJan-Christoph Borchardt2016-08-271-2/+4
|\ \ \ \ \
| * | | | | fix double semicolonJan-Christoph Borchardt2016-08-271-1/+1
| * | | | | 2fa cancel login stylingChristoph Wurst2016-08-271-2/+4
* | | | | | Merge pull request #1103 from nextcloud/improve-theming-performanceJan-Christoph Borchardt2016-08-273-10/+107
|\ \ \ \ \ \
| * | | | | | Use temporary file as cacheLukas Reschke2016-08-272-4/+16
| * | | | | | Increase theming performanceLukas Reschke2016-08-273-7/+92
* | | | | | | Merge pull request #1098 from nextcloud/2fa-challenge-stylingJan-Christoph Borchardt2016-08-273-32/+38
|\ \ \ \ \ \ \
| * | | | | | | list 2FA providers as buttonsChristoph Wurst2016-08-273-5/+8