Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3884 from nextcloud/downstream-26956 | Joas Schilling | 2017-03-20 | 11 | -103/+315 |
|\ | |||||
| * | Fix 5.6 duplicate class import | Joas Schilling | 2017-03-17 | 1 | -3/+1 |
| * | Clean up the test | Joas Schilling | 2017-03-17 | 1 | -81/+52 |
| * | Use DI | Joas Schilling | 2017-03-17 | 4 | -37/+49 |
| * | Skip null groups in group manager (#26871) (#26956) | Vincent Petry | 2017-03-17 | 10 | -10/+241 |
* | | Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer | Joas Schilling | 2017-03-20 | 2 | -5/+6 |
|\ \ | |||||
| * | | Don't use private api | Joas Schilling | 2017-03-20 | 1 | -1/+2 |
| * | | Correctly escape the footer description from theming | Joas Schilling | 2017-03-17 | 2 | -5/+5 |
* | | | Merge pull request #3924 from nextcloud/preview_fixes | Lukas Reschke | 2017-03-20 | 2 | -13/+31 |
|\ \ \ | |||||
| * | | | Fix tests | Roeland Jago Douma | 2017-03-19 | 1 | -1/+5 |
| * | | | Some code cleanup | Roeland Jago Douma | 2017-03-19 | 1 | -12/+21 |
| * | | | Don't generate max preview twice | Roeland Jago Douma | 2017-03-19 | 1 | -0/+5 |
* | | | | Merge pull request #3950 from nextcloud/downstream-27149 | Lukas Reschke | 2017-03-20 | 6 | -2/+23 |
|\ \ \ \ | |||||
| * | | | | Fix grammar | Lukas Reschke | 2017-03-20 | 1 | -1/+1 |
| * | | | | Add ignore_files to config, | Felix Heidecke | 2017-03-20 | 6 | -2/+23 |
* | | | | | Merge pull request #3946 from nextcloud/downstream-27263 | Roeland Jago Douma | 2017-03-20 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix public link download button | Vincent Petry | 2017-03-20 | 1 | -0/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #3952 from nextcloud/downstream-27209 | Morris Jobke | 2017-03-20 | 4 | -8/+38 |
|\ \ \ \ \ | |||||
| * | | | | | Update autoloader | Lukas Reschke | 2017-03-20 | 2 | -0/+2 |
| * | | | | | Log files:scan exception, add InterruptedException | Vincent Petry | 2017-03-20 | 2 | -8/+36 |
| |/ / / / | |||||
* | | | | | Merge pull request #3949 from nextcloud/downstream-27307 | Morris Jobke | 2017-03-20 | 2 | -4/+26 |
|\ \ \ \ \ | |||||
| * | | | | | Add exception to PHPDoc | Lukas Reschke | 2017-03-20 | 1 | -0/+1 |
| * | | | | | Improve the test case | Morris Jobke | 2017-03-20 | 1 | -4/+7 |
| * | | | | | checking if app exists in the FileStream now | noveens | 2017-03-20 | 2 | -4/+22 |
| |/ / / / | |||||
* | | | | | Merge pull request #3954 from nextcloud/downstream-27392 | Morris Jobke | 2017-03-20 | 2 | -0/+57 |
|\ \ \ \ \ | |||||
| * | | | | | Added logic and tests to remove everything inside a folder | Sergio Bertolin | 2017-03-20 | 2 | -0/+57 |
* | | | | | | Merge pull request #3940 from nextcloud/downstream-27048 | Lukas Reschke | 2017-03-20 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add postLogout hook to finish sessions from external session managers (#27048) | Felix Rupp | 2017-03-19 | 1 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3943 from nextcloud/downstream-27318 | Morris Jobke | 2017-03-20 | 1 | -1/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | ownC -> Nextc | Morris Jobke | 2017-03-19 | 1 | -1/+1 |
| * | | | | | maintenance warning printed on STDERR rather than STDOUT | noveens | 2017-03-19 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #3947 from nextcloud/downstream-27323 | Morris Jobke | 2017-03-20 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Disable empty password for user::resetpassword command using CLI | Sujith H | 2017-03-20 | 1 | -0/+5 |
| |/ / / / | |||||
* | | | | | Merge pull request #3941 from nextcloud/downstream-27254 | Morris Jobke | 2017-03-20 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | HTTP 1.1 used when giving 403 and 404 errors while attempting to download non... | noveens | 2017-03-19 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs | Morris Jobke | 2017-03-20 | 3 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fix duplicate id "apps-management" | Michael Letzgus | 2017-03-19 | 1 | -1/+1 |
| * | | | | | Fix duplicate id "apps-management" | Michael Letzgus | 2017-03-19 | 2 | -4/+4 |
* | | | | | | Merge pull request #3931 from nextcloud/downstream-27295 | Roeland Jago Douma | 2017-03-20 | 2 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test setTagGroups with empty groupids | Jörn Friedrich Dreyer | 2017-03-19 | 1 | -0/+9 |
| * | | | | | | don't store empty groupids | Jörn Friedrich Dreyer | 2017-03-19 | 1 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3930 from nextcloud/downstream-27227 | Morris Jobke | 2017-03-20 | 1 | -0/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added functions to add files in local_storage | Sergio Bertolin | 2017-03-19 | 1 | -0/+24 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3934 from nextcloud/downstream-27246 | Morris Jobke | 2017-03-20 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ownC -> Nextc | Morris Jobke | 2017-03-19 | 1 | -1/+1 |
| * | | | | | | Update the occ:encrypt-all prompt | Matthew Setter | 2017-03-19 | 1 | -4/+4 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3935 from nextcloud/downstream-27293 | Morris Jobke | 2017-03-20 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log where a resource was not found | Jörn Friedrich Dreyer | 2017-03-19 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3936 from nextcloud/downstream-27253 | Christoph Wurst | 2017-03-20 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add extensionpoint to sharedialogview | Felix Heidecke | 2017-03-19 | 1 | -0/+2 |
| |/ / / / / |