aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge colorsJulius Haertl2017-03-204-16/+12
* Remove rgb color valuesJulius Haertl2017-03-205-16/+15
* Simplify colorsJulius Haertl2017-03-201-22/+24
* SCSS colors in tooltip.scssJulius Haertl2017-03-201-6/+6
* SCSS colors in styles.scssJulius Haertl2017-03-201-67/+67
* SCSS colors in share.scssJulius Haertl2017-03-201-5/+5
* SCSS colors in multiselect.scssJulius Haertl2017-03-201-11/+11
* SCSS colors in inputs.scssJulius Haertl2017-03-201-63/+63
* SCSS colors in icons.scssJulius Haertl2017-03-201-4/+4
* SCSS colors in apps.scssJulius Haertl2017-03-201-40/+40
* SCSS colors in header.scssJulius Haertl2017-03-202-16/+16
* Add variables of existing colorsJulius Haertl2017-03-201-1/+36
* Add variables.scss and import it for each scss fileJulius Haertl2017-03-202-6/+39
* Merge pull request #3939 from nextcloud/downstream-27159Joas Schilling2017-03-202-0/+13
|\
| * Move error message to log entryLukas Reschke2017-03-202-1/+14
| * Fix malformed logging in exceptionkdslkdsaldsal2017-03-191-1/+1
* | Merge pull request #3929 from nextcloud/downstream-27068Joas Schilling2017-03-202-3/+25
|\ \
| * | Add tests for database user backend cachingVincent Petry2017-03-202-2/+24
| * | cache loadUser if not existsJörn Friedrich Dreyer2017-03-201-1/+1
| |/
* | 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
| |/ / / /