summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix sass compile testsJulius Härtl2017-03-201-1/+6
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Add tests for SCSSCacherJulius Härtl2017-03-204-54/+205
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Add variables.scss to sass compile testJulius Haertl2017-03-201-1/+1
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Add tests for SCSSCacherJulius Haertl2017-03-203-7/+116
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Replace old color occurences with calculationsJulius Haertl2017-03-205-84/+75
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Make remaining colors depending on $color-main-text and $color-main-backgroundJulius Haertl2017-03-203-21/+19
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Remove legacy CSSJulius Haertl2017-03-202-45/+1
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Merge color tones aaaaaa, bebebe, cccccc in bbbbbbJulius Haertl2017-03-204-14/+7
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Remove grey tintsJulius Haertl2017-03-202-3/+3
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Remove separate error colorsJulius Haertl2017-03-202-4/+3
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Extra variable for loading iconsJulius Haertl2017-03-202-8/+7
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Merge #666 and #777 to #555Julius Haertl2017-03-203-6/+6
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Use one box-shadow colorJulius Haertl2017-03-203-5/+5
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Replace #222 with #333Julius Haertl2017-03-202-3/+3
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Remove unused old #999Julius Haertl2017-03-201-1/+0
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Merge colorsJulius Haertl2017-03-204-16/+12
| | | | | | | - #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8 - #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Remove rgb color valuesJulius Haertl2017-03-205-16/+15
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Simplify colorsJulius Haertl2017-03-201-22/+24
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in tooltip.scssJulius Haertl2017-03-201-6/+6
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in styles.scssJulius Haertl2017-03-201-67/+67
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in share.scssJulius Haertl2017-03-201-5/+5
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in multiselect.scssJulius Haertl2017-03-201-11/+11
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in inputs.scssJulius Haertl2017-03-201-63/+63
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in icons.scssJulius Haertl2017-03-201-4/+4
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in apps.scssJulius Haertl2017-03-201-40/+40
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* SCSS colors in header.scssJulius Haertl2017-03-202-16/+16
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Add variables of existing colorsJulius Haertl2017-03-201-1/+36
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Add variables.scss and import it for each scss fileJulius Haertl2017-03-202-6/+39
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Merge pull request #3939 from nextcloud/downstream-27159Joas Schilling2017-03-202-0/+13
|\ | | | | Fix malformed logging in exception
| * Move error message to log entryLukas Reschke2017-03-202-1/+14
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix malformed logging in exceptionkdslkdsaldsal2017-03-191-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3929 from nextcloud/downstream-27068Joas Schilling2017-03-202-3/+25
|\ \ | | | | | | cache loadUser if not exists
| * | Add tests for database user backend cachingVincent Petry2017-03-202-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | Add comment, closeCursor in user DB query Invalidate user in cache after successful creation Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | cache loadUser if not existsJörn Friedrich Dreyer2017-03-201-1/+1
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3884 from nextcloud/downstream-26956Joas Schilling2017-03-2011-103/+315
|\ \ | | | | | | Skip null groups in group manager
| * | Fix 5.6 duplicate class importJoas Schilling2017-03-171-3/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Clean up the testJoas Schilling2017-03-171-81/+52
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use DIJoas Schilling2017-03-174-37/+49
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Skip null groups in group manager (#26871) (#26956)Vincent Petry2017-03-1710-10/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Skip null groups in group manager (#26871) * Skip null groups in group manager * Also skip null groups in group manager's search function * Add more group null checks in sharing code * Add unit tests for null group safety in group manager * Add unit tests for sharing code null group checks * Added tests for null groups handling in sharing code * Ignore moveShare optional repair in mount provider In some cases, data is inconsistent in the oc_share table due to legacy data. The mount provider might attempt to make it consistent but if the target group does not exist any more it cannot work. In such case we simply ignore the exception as it is not critical. Keeping the exception would break user accounts as they would be unable to use their filesystem. * Adjust null group handing + tests * Fix new group manager tests Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footerJoas Schilling2017-03-202-5/+6
|\ \ \ | | | | | | | | Correctly escape the footer description from theming
| * | | Don't use private apiJoas Schilling2017-03-201-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Correctly escape the footer description from themingJoas Schilling2017-03-172-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3924 from nextcloud/preview_fixesLukas Reschke2017-03-202-13/+31
|\ \ \ \ | | | | | | | | | | Do not generate the max preview twice
| * | | | Fix testsRoeland Jago Douma2017-03-191-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Some code cleanupRoeland Jago Douma2017-03-191-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by the inspector Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Don't generate max preview twiceRoeland Jago Douma2017-03-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you request a preview of X by Y. And after calculating X and Y are equal to maxWidth and maxHeight then there is no reason to create a preview of that size. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3950 from nextcloud/downstream-27149Lukas Reschke2017-03-206-2/+23
|\ \ \ \ \ | | | | | | | | | | | | Forbid to upload part files via web UI
| * | | | | Fix grammarLukas Reschke2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add ignore_files to config,Felix Heidecke2017-03-206-2/+23
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test files against ignore_files list on upload fix typo and indentation Move blacklist declaration to lib/public/Files/FileInfo.php, Rename *ignored to *blacklisted Mocked blacklist_files for testing Mocked blacklist_files for testing Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3946 from nextcloud/downstream-27263Roeland Jago Douma2017-03-201-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix public link download button (unit test only)