summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3884 from nextcloud/downstream-26956Joas Schilling2017-03-2011-103/+315
|\
| * Fix 5.6 duplicate class importJoas Schilling2017-03-171-3/+1
| * Clean up the testJoas Schilling2017-03-171-81/+52
| * Use DIJoas Schilling2017-03-174-37/+49
| * Skip null groups in group manager (#26871) (#26956)Vincent Petry2017-03-1710-10/+241
* | Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footerJoas Schilling2017-03-202-5/+6
|\ \
| * | Don't use private apiJoas Schilling2017-03-201-1/+2
| * | Correctly escape the footer description from themingJoas Schilling2017-03-172-5/+5
* | | Merge pull request #3924 from nextcloud/preview_fixesLukas Reschke2017-03-202-13/+31
|\ \ \
| * | | Fix testsRoeland Jago Douma2017-03-191-1/+5
| * | | Some code cleanupRoeland Jago Douma2017-03-191-12/+21
| * | | Don't generate max preview twiceRoeland Jago Douma2017-03-191-0/+5
* | | | Merge pull request #3950 from nextcloud/downstream-27149Lukas Reschke2017-03-206-2/+23
|\ \ \ \
| * | | | Fix grammarLukas Reschke2017-03-201-1/+1
| * | | | Add ignore_files to config,Felix Heidecke2017-03-206-2/+23
* | | | | Merge pull request #3946 from nextcloud/downstream-27263Roeland Jago Douma2017-03-201-0/+4
|\ \ \ \ \
| * | | | | Fix public link download buttonVincent Petry2017-03-201-0/+4
| |/ / / /
* | | | | Merge pull request #3952 from nextcloud/downstream-27209Morris Jobke2017-03-204-8/+38
|\ \ \ \ \
| * | | | | Update autoloaderLukas Reschke2017-03-202-0/+2
| * | | | | Log files:scan exception, add InterruptedExceptionVincent Petry2017-03-202-8/+36
| |/ / / /
* | | | | Merge pull request #3949 from nextcloud/downstream-27307Morris Jobke2017-03-202-4/+26
|\ \ \ \ \
| * | | | | Add exception to PHPDocLukas Reschke2017-03-201-0/+1
| * | | | | Improve the test caseMorris Jobke2017-03-201-4/+7
| * | | | | checking if app exists in the FileStream nownoveens2017-03-202-4/+22
| |/ / / /
* | | | | Merge pull request #3954 from nextcloud/downstream-27392Morris Jobke2017-03-202-0/+57
|\ \ \ \ \
| * | | | | Added logic and tests to remove everything inside a folderSergio Bertolin2017-03-202-0/+57
* | | | | | Merge pull request #3940 from nextcloud/downstream-27048Lukas Reschke2017-03-201-0/+3
|\ \ \ \ \ \
| * | | | | | Add postLogout hook to finish sessions from external session managers (#27048)Felix Rupp2017-03-191-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3943 from nextcloud/downstream-27318Morris Jobke2017-03-201-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | ownC -> NextcMorris Jobke2017-03-191-1/+1
| * | | | | maintenance warning printed on STDERR rather than STDOUTnoveens2017-03-191-1/+3
| |/ / / /
* | | | | Merge pull request #3947 from nextcloud/downstream-27323Morris Jobke2017-03-201-0/+5
|\ \ \ \ \
| * | | | | Disable empty password for user::resetpassword command using CLISujith H2017-03-201-0/+5
| |/ / / /
* | | | | Merge pull request #3941 from nextcloud/downstream-27254Morris Jobke2017-03-201-2/+2
|\ \ \ \ \
| * | | | | HTTP 1.1 used when giving 403 and 404 errors while attempting to download non...noveens2017-03-191-2/+2
| |/ / / /
* | | | | Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDsMorris Jobke2017-03-203-5/+5
|\ \ \ \ \
| * | | | | Fix duplicate id "apps-management"Michael Letzgus2017-03-191-1/+1
| * | | | | Fix duplicate id "apps-management"Michael Letzgus2017-03-192-4/+4
* | | | | | Merge pull request #3931 from nextcloud/downstream-27295Roeland Jago Douma2017-03-202-0/+12
|\ \ \ \ \ \
| * | | | | | test setTagGroups with empty groupidsJörn Friedrich Dreyer2017-03-191-0/+9
| * | | | | | don't store empty groupidsJörn Friedrich Dreyer2017-03-191-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3930 from nextcloud/downstream-27227Morris Jobke2017-03-201-0/+24
|\ \ \ \ \ \
| * | | | | | Added functions to add files in local_storageSergio Bertolin2017-03-191-0/+24
| |/ / / / /
* | | | | | Merge pull request #3934 from nextcloud/downstream-27246Morris Jobke2017-03-201-4/+4
|\ \ \ \ \ \
| * | | | | | ownC -> NextcMorris Jobke2017-03-191-1/+1
| * | | | | | Update the occ:encrypt-all promptMatthew Setter2017-03-191-4/+4
| |/ / / / /
* | | | | | Merge pull request #3935 from nextcloud/downstream-27293Morris Jobke2017-03-201-1/+1
|\ \ \ \ \ \
| * | | | | | log where a resource was not foundJörn Friedrich Dreyer2017-03-191-1/+1
| |/ / / / /
* | | | | | Merge pull request #3936 from nextcloud/downstream-27253Christoph Wurst2017-03-201-0/+2
|\ \ \ \ \ \
| * | | | | | Add extensionpoint to sharedialogviewFelix Heidecke2017-03-191-0/+2
| |/ / / / /