Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | AvatarController use proper JSONResponse | Roeland Jago Douma | 2016-08-29 | 2 | -45/+36 | |
| * | | | | | Minor cleanup in core Controllers | Roeland Jago Douma | 2016-08-29 | 5 | -17/+14 | |
| * | | | | | UserController does not require Defaults | Roeland Jago Douma | 2016-08-29 | 2 | -17/+3 | |
* | | | | | | Merge pull request #891 from nextcloud/us_25810 | Morris Jobke | 2016-08-30 | 2 | -45/+216 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Improve regexp to detect duplicate folders when repairing unmerged shares | Vincent Petry | 2016-08-17 | 2 | -42/+74 | |
| * | | | | | Fix unmerged shares repair with mixed group and direct shares | Vincent Petry | 2016-08-17 | 2 | -4/+57 | |
| * | | | | | Improve file_target finding logic when repairing unmerged shares | Vincent Petry | 2016-08-17 | 2 | -10/+96 | |
* | | | | | | Merge pull request #1132 from nextcloud/prevent-parse-error-on-editing-an-htm... | blizzz | 2016-08-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Prevent parse error on editing an HTML comment | Joas Schilling | 2016-08-29 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1169 from nextcloud/2fa-single-provider | Lukas Reschke | 2016-08-29 | 2 | -5/+93 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | redirect to 2fa provider if there's only one active for the user | Christoph Wurst | 2016-08-29 | 2 | -5/+93 | |
* | | | | | | | Merge pull request #1170 from nextcloud/theming-fix-primary-button | Lukas Reschke | 2016-08-29 | 2 | -35/+77 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Theming: fix primary button for bright colors | Julius Haertl | 2016-08-29 | 2 | -35/+77 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1130 from nextcloud/shared-upload-quota | Roeland Jago Douma | 2016-08-29 | 2 | -0/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | A shared storage is never a home storage - fixes #25582 | Thomas Müller | 2016-08-29 | 1 | -0/+10 | |
| * | | | | | | Added integration test | Sergio Bertolin | 2016-08-29 | 1 | -0/+18 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1147 from nextcloud/files-hidden-files-summary | Roeland Jago Douma | 2016-08-29 | 4 | -52/+230 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Display number of hidden files in files summary (#25870) | Vincent Petry | 2016-08-29 | 4 | -52/+230 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1146 from nextcloud/init-filesconfig | Roeland Jago Douma | 2016-08-29 | 1 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Make sure file list files config always exists | Vincent Petry | 2016-08-29 | 1 | -0/+4 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1148 from nextcloud/files-scan-reconnect-database-before-... | Roeland Jago Douma | 2016-08-29 | 1 | -1/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Before a user is getting scanned the database connection is re-established | Thomas Müller | 2016-08-29 | 1 | -1/+26 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1145 from nextcloud/upstream-25794 | Roeland Jago Douma | 2016-08-29 | 2 | -9/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [master] DAV: Return data-fingerprint always when asked (#25482) | Markus Goetz | 2016-08-29 | 2 | -9/+6 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1142 from nextcloud/fix-case-sensitive-settings | Roeland Jago Douma | 2016-08-29 | 1 | -0/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix issues where some user settings cannot be loaded when the user id differs... | Thomas Müller | 2016-08-29 | 1 | -0/+10 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1139 from nextcloud/clean-code-image | Roeland Jago Douma | 2016-08-29 | 1 | -15/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Some cleanup within OC_Image (#25875) | Thomas Müller | 2016-08-29 | 1 | -15/+11 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1115 from nextcloud/fix_146 | Christoph Wurst | 2016-08-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Link 'Allow editing' => 'Allow upload and editing' | Roeland Jago Douma | 2016-08-28 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1136 from nextcloud/fix-16041 | Joas Schilling | 2016-08-29 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Modified overflow in multiselector | Sergio Bertolín | 2016-08-29 | 1 | -0/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1135 from nextcloud/choose-buttons | Joas Schilling | 2016-08-29 | 1 | -0/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Choose button remains disabled unless files are chosen | Sujith Haridasan | 2016-08-29 | 1 | -0/+14 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1134 from nextcloud/fix_redirection | Joas Schilling | 2016-08-29 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix redirection taking care of protocol and port | Juan Pablo Villafáñez | 2016-08-29 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1133 from nextcloud/fix-numerous | Joas Schilling | 2016-08-29 | 2 | -33/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | always return numeric storage id as int, also check type equality in test ass... | Jörn Friedrich Dreyer | 2016-08-29 | 2 | -33/+19 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1131 from nextcloud/add-padding | Joas Schilling | 2016-08-29 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Adds padding and max-width to the input for the sign up page. (#25959) | Raghu Nayyar | 2016-08-29 | 1 | -1/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1128 from nextcloud/upstream-25922 | Roeland Jago Douma | 2016-08-29 | 7 | -119/+143 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix group sorting in user list group selection | Vincent Petry | 2016-08-29 | 1 | -2/+2 | |
| * | | | | | Extra non-available groups also in list | Vincent Petry | 2016-08-29 | 1 | -2/+15 | |
| * | | | | | Users page lazy multiselect group dropdowns | Vincent Petry | 2016-08-29 | 6 | -117/+128 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1117 from iamfool/master | Lukas Reschke | 2016-08-29 | 2 | -4/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Update AdminTest.php | iamfool | 2016-08-29 | 1 | -3/+3 | |
| * | | | | Update Admin.php | iamfool | 2016-08-28 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #976 from nextcloud/downstream-25702 | Lukas Reschke | 2016-08-28 | 4 | -8/+19 | |
|\ \ \ \ | ||||||
| * | | | | Hide the LDAP password in the client side | Juan Pablo Villafáñez | 2016-08-19 | 4 | -8/+19 | |
* | | | | | Merge pull request #847 from nextcloud/quota-mount-in-homefolder | Lukas Reschke | 2016-08-28 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | |