Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only handle encrypted property on folders | Roeland Jago Douma | 2018-01-30 | 1 | -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-scss | Morris Jobke | 2018-01-29 | 5 | -38/+69 |
|\ | | | | | SCSS hardening | ||||
| * | Fix theming tests | Julius Härtl | 2018-01-26 | 1 | -8/+2 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Add typehinting an fix some minor cleanup | Julius Härtl | 2018-01-26 | 1 | -16/+24 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Add tests for URL rewriting | Julius Härtl | 2018-01-26 | 1 | -4/+14 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Do not rewrite absolute URLs | Julius Härtl | 2018-01-26 | 2 | -3/+3 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Clear injectect variables when resetting the cache | Julius Härtl | 2018-01-26 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Only override image styles if the theming values are set | Julius Härtl | 2018-01-26 | 1 | -8/+10 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Make sure that injected variables do not break the CSS generation | Julius Härtl | 2018-01-26 | 1 | -0/+15 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | SCSS files are only cached if their size is > 0 | Julius Härtl | 2018-01-26 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | Merge pull request #8062 from nextcloud/use-class | Morris Jobke | 2018-01-29 | 53 | -184/+270 |
|\ \ | | | | | | | Use ::class statement instead of string | ||||
| * | | Use ::class statement instead of string | Morris Jobke | 2018-01-29 | 53 | -184/+270 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #7873 from nextcloud/fix_5694 | Roeland Jago Douma | 2018-01-29 | 2 | -10/+28 |
|\ \ \ | |/ / |/| | | Don't perform CSRF check on OCS routes with Bearer auth | ||||
| * | | Update tests | Roeland Jago Douma | 2018-01-29 | 1 | -8/+20 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Don't perform CSRF check on OCS routes with Bearer auth | Roeland Jago Douma | 2018-01-29 | 1 | -2/+8 |
|/ / | | | | | | | | | | | Fixes #5694 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-01-29 | 18 | -172/+182 |
| | | |||||
* | | Merge pull request #8076 from nextcloud/bump_autosize | Morris Jobke | 2018-01-27 | 4 | -10/+10 |
|\ \ | | | | | | | [js] Bump autosize | ||||
| * | | Regenerate core.js | Roeland Jago Douma | 2018-01-26 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Bump autosize to 4.0.0 | Roeland Jago Douma | 2018-01-26 | 3 | -8/+8 |
| |/ | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #8079 from ↵ | Roeland Jago Douma | 2018-01-27 | 79 | -101/+101 |
|\ \ | | | | | | | | | | | | | nextcloud/remove-unneeded-semicolon-and-parentheses Remove unneeded semicolon and parentheses | ||||
| * | | Remove unneeded semicolon and parentheses | Morris Jobke | 2018-01-26 | 79 | -101/+101 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-01-27 | 10 | -0/+14 |
|/ / | |||||
* | | Merge pull request #8072 from nextcloud/type-casting | Morris Jobke | 2018-01-26 | 6 | -35/+35 |
|\ \ | | | | | | | Use type casting instead of *val() method | ||||
| * | | Use type casting instead of *val() method | Morris Jobke | 2018-01-26 | 6 | -35/+35 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8071 from nextcloud/remove-silly-code | Morris Jobke | 2018-01-26 | 3 | -6/+2 |
|\ \ | | | | | | | Cleanup unused code | ||||
| * | | Cleanup unused code | Morris Jobke | 2018-01-26 | 3 | -6/+2 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #7707 from ↵ | Morris Jobke | 2018-01-26 | 2 | -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 event | Georg Ehrke | 2018-01-04 | 2 | -4/+5 |
| | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
* | | | Merge pull request #8070 from nextcloud/remove-theming-migration | Morris Jobke | 2018-01-26 | 3 | -222/+0 |
|\ \ \ | | | | | | | | | Remove theming migration | ||||
| * | | | Remove theming migration | Julius Härtl | 2018-01-26 | 3 | -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-index | Morris Jobke | 2018-01-26 | 12 | -46/+24 |
|\ \ \ | |/ / |/| | | Use index based string access for substr with length of 1 | ||||
| * | | Use index based string access for substr with length of 1 | Morris Jobke | 2018-01-26 | 12 | -46/+24 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #8069 from nextcloud/no-catch-serverdown | Morris Jobke | 2018-01-26 | 2 | -2/+8 |
|\ \ \ | | | | | | | | | do not catch and ignore ServerNotAvailable in the wrong spot | ||||
| * | | | do not catch ServerNotAvailable | Arthur Schiwon | 2018-01-26 | 2 | -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-ternary | Morris Jobke | 2018-01-26 | 13 | -23/+19 |
|\ \ \ \ | |/ / / |/| | | | Simplify ternary operator statements | ||||
| * | | | Simplify ternary operator statements | Morris Jobke | 2018-01-26 | 13 | -23/+19 |
|/ / / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #8061 from nextcloud/use-typecasting | Morris Jobke | 2018-01-26 | 30 | -62/+62 |
|\ \ \ | | | | | | | | | Use type casting instead of *val() method | ||||
| * | | | Use type casting instead of *val() method | Morris Jobke | 2018-01-26 | 30 | -62/+62 |
|/ / / | | | | | | | | | | | | | | | | It should be up to 6x faster Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #8064 from nextcloud/background-jobs | Morris Jobke | 2018-01-26 | 4 | -46/+27 |
|\ \ \ | | | | | | | | | Deprecated OCP interface to fetch background job type | ||||
| * | | | Deprecated OCP interface to fetch background job type | Morris Jobke | 2018-01-26 | 4 | -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-substr | Joas Schilling | 2018-01-26 | 4 | -4/+4 |
|\ \ \ | | | | | | | | | Use short for of substr to not need strlen() | ||||
| * | | | Use short for of substr to not need strlen() | Morris Jobke | 2018-01-25 | 4 | -4/+4 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #8063 from nextcloud/inline-value | Joas Schilling | 2018-01-26 | 19 | -47/+21 |
|\ \ \ | | | | | | | | | Return value immediately instead of assigning to a one-time variable | ||||
| * | | | Return value immediately instead of assigning to a one-time variable | Morris Jobke | 2018-01-26 | 19 | -47/+21 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #8057 from nextcloud/unneeded-implements | Roeland Jago Douma | 2018-01-26 | 3 | -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 class | Morris Jobke | 2018-01-25 | 3 | -3/+3 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #8055 from nextcloud/improve-loop | Roeland Jago Douma | 2018-01-26 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Improve conditional of loop | ||||
| * | | | Improve conditional of loop | Morris Jobke | 2018-01-25 | 1 | -1/+2 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #8052 from nextcloud/fix-array-methods | Roeland Jago Douma | 2018-01-26 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | Fix array method usages with a proper call | ||||
| * | | | Fix array method usages with a proper call | Morris Jobke | 2018-01-25 | 3 | -3/+3 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> |