summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Only handle encrypted property on foldersRoeland Jago Douma2018-01-301-4/+4
| | | | | | | | | | Exposing the encrypted property is required for E2E. However, there is no need to expose this on files as then it is server side encryption (which the clients don't care about). Better to not confuse the output. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #8078 from nextcloud/theming-validate-scssMorris Jobke2018-01-295-38/+69
|\ | | | | SCSS hardening
| * Fix theming testsJulius Härtl2018-01-261-8/+2
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Add typehinting an fix some minor cleanupJulius Härtl2018-01-261-16/+24
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Add tests for URL rewritingJulius Härtl2018-01-261-4/+14
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Do not rewrite absolute URLsJulius Härtl2018-01-262-3/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Clear injectect variables when resetting the cacheJulius Härtl2018-01-261-0/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Only override image styles if the theming values are setJulius Härtl2018-01-261-8/+10
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Make sure that injected variables do not break the CSS generationJulius Härtl2018-01-261-0/+15
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * SCSS files are only cached if their size is > 0Julius Härtl2018-01-261-1/+2
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #8062 from nextcloud/use-classMorris Jobke2018-01-2953-184/+270
|\ \ | | | | | | Use ::class statement instead of string
| * | Use ::class statement instead of stringMorris Jobke2018-01-2953-184/+270
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7873 from nextcloud/fix_5694Roeland Jago Douma2018-01-292-10/+28
|\ \ \ | |/ / |/| | Don't perform CSRF check on OCS routes with Bearer auth
| * | Update testsRoeland Jago Douma2018-01-291-8/+20
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Don't perform CSRF check on OCS routes with Bearer authRoeland Jago Douma2018-01-291-2/+8
|/ / | | | | | | | | | | Fixes #5694 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-01-2918-172/+182
| |
* | Merge pull request #8076 from nextcloud/bump_autosizeMorris Jobke2018-01-274-10/+10
|\ \ | | | | | | [js] Bump autosize
| * | Regenerate core.jsRoeland Jago Douma2018-01-261-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Bump autosize to 4.0.0Roeland Jago Douma2018-01-263-8/+8
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8079 from ↵Roeland Jago Douma2018-01-2779-101/+101
|\ \ | | | | | | | | | | | | nextcloud/remove-unneeded-semicolon-and-parentheses Remove unneeded semicolon and parentheses
| * | Remove unneeded semicolon and parenthesesMorris Jobke2018-01-2679-101/+101
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [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() method
| * | Use type casting instead of *val() methodMorris Jobke2018-01-266-35/+35
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8071 from nextcloud/remove-silly-codeMorris Jobke2018-01-263-6/+2
|\ \ | | | | | | Cleanup unused code
| * | Cleanup unused codeMorris Jobke2018-01-263-6/+2
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7707 from ↵Morris Jobke2018-01-262-4/+5
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/birthdaycalendar-different-uids generate different UIDs for Birthday, Anniversary and Death event
| * | generate different UIDs for Birthday, Anniversary and Death eventGeorg Ehrke2018-01-042-4/+5
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #8070 from nextcloud/remove-theming-migrationMorris Jobke2018-01-263-222/+0
|\ \ \ | | | | | | | | Remove theming migration
| * | | Remove theming migrationJulius Härtl2018-01-263-222/+0
| | |/ | |/| | | | | | | | | | | | | Those images are alredy migrated after the instance has been updated to NC12 Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #8054 from nextcloud/substr-use-indexMorris Jobke2018-01-2612-46/+24
|\ \ \ | |/ / |/| | Use index based string access for substr with length of 1
| * | Use index based string access for substr with length of 1Morris Jobke2018-01-2612-46/+24
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8069 from nextcloud/no-catch-serverdownMorris Jobke2018-01-262-2/+8
|\ \ \ | | | | | | | | do not catch and ignore ServerNotAvailable in the wrong spot
| * | | do not catch ServerNotAvailableArthur Schiwon2018-01-262-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | might cause the user to be unavailable (race condition). Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #8068 from nextcloud/simplify-ternaryMorris Jobke2018-01-2613-23/+19
|\ \ \ \ | |/ / / |/| | | Simplify ternary operator statements
| * | | Simplify ternary operator statementsMorris Jobke2018-01-2613-23/+19
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8061 from nextcloud/use-typecastingMorris Jobke2018-01-2630-62/+62
|\ \ \ | | | | | | | | Use type casting instead of *val() method
| * | | Use type casting instead of *val() methodMorris Jobke2018-01-2630-62/+62
|/ / / | | | | | | | | | | | | | | | It should be up to 6x faster Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8064 from nextcloud/background-jobsMorris Jobke2018-01-264-46/+27
|\ \ \ | | | | | | | | Deprecated OCP interface to fetch background job type
| * | | Deprecated OCP interface to fetch background job typeMorris Jobke2018-01-264-46/+27
| |/ / | | | | | | | | | | | | | | | | | | * was not used by apps and also is not needed * migrated the documentation to IJobList Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8053 from nextcloud/simplify-substrJoas Schilling2018-01-264-4/+4
|\ \ \ | | | | | | | | Use short for of substr to not need strlen()
| * | | Use short for of substr to not need strlen()Morris Jobke2018-01-254-4/+4
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8063 from nextcloud/inline-valueJoas Schilling2018-01-2619-47/+21
|\ \ \ | | | | | | | | Return value immediately instead of assigning to a one-time variable
| * | | Return value immediately instead of assigning to a one-time variableMorris Jobke2018-01-2619-47/+21
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8057 from nextcloud/unneeded-implementsRoeland Jago Douma2018-01-263-3/+3
|\ \ \ | | | | | | | | Implements are not needed because they are already done by base class
| * | | Implements are not needed because they are already done by base classMorris Jobke2018-01-253-3/+3
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8055 from nextcloud/improve-loopRoeland Jago Douma2018-01-261-1/+2
|\ \ \ | | | | | | | | Improve conditional of loop
| * | | Improve conditional of loopMorris Jobke2018-01-251-1/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8052 from nextcloud/fix-array-methodsRoeland Jago Douma2018-01-263-3/+3
|\ \ \ | | | | | | | | Fix array method usages with a proper call
| * | | Fix array method usages with a proper callMorris Jobke2018-01-253-3/+3
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>