summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8000 from nextcloud/fix_7983Morris Jobke2018-01-306-4/+142
|\
| * Fix testsRoeland Jago Douma2018-01-266-7/+117
| * Don't expose language and password as editableRoeland Jago Douma2018-01-261-5/+0
| * Provide list of editable fields via OCS APIRoeland Jago Douma2018-01-262-0/+33
* | Merge pull request #8114 from nextcloud/settings-initalization-fixRoeland Jago Douma2018-01-301-2/+5
|\ \
| * | Make sure we don't query the AppManager before the installation startedJulius Härtl2018-01-301-2/+5
* | | Merge pull request #8111 from nextcloud/only_encrypted_prop_on_foldersRoeland Jago Douma2018-01-301-4/+4
|\ \ \ | |/ / |/| |
| * | Only handle encrypted property on foldersRoeland Jago Douma2018-01-301-4/+4
* | | Merge pull request #8103 from nextcloud/bump_clipboardRoeland Jago Douma2018-01-304-10/+10
|\ \ \
| * | | Update core.jsRoeland Jago Douma2018-01-291-2/+2
| * | | Bump clipboardjsRoeland Jago Douma2018-01-293-8/+8
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2018-01-304-2/+12
|/ /
* | Merge pull request #8078 from nextcloud/theming-validate-scssMorris Jobke2018-01-295-38/+69
|\ \
| * | Fix theming testsJulius Härtl2018-01-261-8/+2
| * | Add typehinting an fix some minor cleanupJulius Härtl2018-01-261-16/+24
| * | Add tests for URL rewritingJulius Härtl2018-01-261-4/+14
| * | Do not rewrite absolute URLsJulius Härtl2018-01-262-3/+3
| * | Clear injectect variables when resetting the cacheJulius Härtl2018-01-261-0/+1
| * | Only override image styles if the theming values are setJulius Härtl2018-01-261-8/+10
| * | Make sure that injected variables do not break the CSS generationJulius Härtl2018-01-261-0/+15
| * | SCSS files are only cached if their size is > 0Julius Härtl2018-01-261-1/+2
* | | Merge pull request #8062 from nextcloud/use-classMorris Jobke2018-01-2953-184/+270
|\ \ \
| * | | Use ::class statement instead of stringMorris Jobke2018-01-2953-184/+270
* | | | Merge pull request #7873 from nextcloud/fix_5694Roeland Jago Douma2018-01-292-10/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Update testsRoeland Jago Douma2018-01-291-8/+20
| * | | Don't perform CSRF check on OCS routes with Bearer authRoeland Jago Douma2018-01-291-2/+8
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-01-2918-172/+182
* | | Merge pull request #8076 from nextcloud/bump_autosizeMorris Jobke2018-01-274-10/+10
|\ \ \
| * | | Regenerate core.jsRoeland Jago Douma2018-01-261-2/+2
| * | | Bump autosize to 4.0.0Roeland Jago Douma2018-01-263-8/+8
| |/ /
* | | Merge pull request #8079 from nextcloud/remove-unneeded-semicolon-and-parenth...Roeland Jago Douma2018-01-2779-101/+101
|\ \ \
| * | | Remove unneeded semicolon and parenthesesMorris Jobke2018-01-2679-101/+101
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-2710-0/+14
|/ / /
* | | Merge pull request #8072 from nextcloud/type-castingMorris Jobke2018-01-266-35/+35
|\ \ \
| * | | Use type casting instead of *val() methodMorris Jobke2018-01-266-35/+35
| |/ /
* | | Merge pull request #8071 from nextcloud/remove-silly-codeMorris Jobke2018-01-263-6/+2
|\ \ \
| * | | Cleanup unused codeMorris Jobke2018-01-263-6/+2
| |/ /
* | | Merge pull request #7707 from nextcloud/bugfix/noid/birthdaycalendar-differen...Morris Jobke2018-01-262-4/+5
|\ \ \
| * | | generate different UIDs for Birthday, Anniversary and Death eventGeorg Ehrke2018-01-042-4/+5
* | | | Merge pull request #8070 from nextcloud/remove-theming-migrationMorris Jobke2018-01-263-222/+0
|\ \ \ \
| * | | | Remove theming migrationJulius Härtl2018-01-263-222/+0
| | |/ / | |/| |
* | | | Merge pull request #8054 from nextcloud/substr-use-indexMorris Jobke2018-01-2612-46/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Use index based string access for substr with length of 1Morris Jobke2018-01-2612-46/+24
* | | | Merge pull request #8069 from nextcloud/no-catch-serverdownMorris Jobke2018-01-262-2/+8
|\ \ \ \
| * | | | do not catch ServerNotAvailableArthur Schiwon2018-01-262-2/+8
* | | | | Merge pull request #8068 from nextcloud/simplify-ternaryMorris Jobke2018-01-2613-23/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Simplify ternary operator statementsMorris Jobke2018-01-2613-23/+19
|/ / / /
* | | | Merge pull request #8061 from nextcloud/use-typecastingMorris Jobke2018-01-2630-62/+62
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use type casting instead of *val() methodMorris Jobke2018-01-2630-62/+62
|/ / /
* | | Merge pull request #8064 from nextcloud/background-jobsMorris Jobke2018-01-264-46/+27
|\ \ \