summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11044 from nextcloud/td/8.2.0-public-utilChristoph Wurst2018-09-041-44/+0
|\ | | | | Remove deprecated methods from OCP\Util
| * Remove deprecated methods from OCP\UtilRoeland Jago Douma2018-09-041-44/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11040 from nextcloud/feature/11035/worker-srcRoeland Jago Douma2018-09-043-0/+46
|\ \ | | | | | | Add worker-src to CSP
| * | Deprecate the childSrc functionsRoeland Jago Douma2018-09-042-0/+4
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add workerSrc to CSPRoeland Jago Douma2018-09-043-0/+42
| |/ | | | | | | | | | | | | | | | | Fixes #11035 Since the child-src directive is deprecated (we should kill it at some point) we need to have the proper worker-src available Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10914 from nextcloud/quota-typoRoeland Jago Douma2018-09-043-3/+3
|\ \ | |/ |/| remove space between quota and colon
| * Update mapRoeland Jago Douma2018-09-031-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * add missing js filesJin Lin Wright2018-08-292-2/+2
| |
| * remove space between quota and colonJin Lin Wright2018-08-281-1/+1
| | | | | | | | Signed-off-by: Jin Lin Wright <jinlin.wright@gmail.com>
* | Merge pull request #11024 from nextcloud/bump/npm/updatenotificationChristoph Wurst2018-09-044-75/+70
|\ \ | | | | | | Bump JS deps updatenotification
| * | Bump JS deps updatenotificationRoeland Jago Douma2018-09-034-75/+70
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-09-046-2/+80
| | |
* | | Merge pull request #11016 from nextcloud/bump/npm/oauthRoeland Jago Douma2018-09-034-77/+59
|\ \ \ | |/ / |/| | Bump OAuth2 js deps
| * | Bump OAuth2 js depsRoeland Jago Douma2018-09-034-77/+59
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10969 from nextcloud/fix/10968/upload-progressJulius Härtl2018-09-031-0/+4
|\ \ \ | | | | | | | | Fixes the upload progress bar layout
| * | | Fixes the upload progress bar layoutMichael Weimann2018-09-021-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | Merge pull request #10984 from ↵Julius Härtl2018-09-032-68/+42
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.17.1 Bump webpack from 4.16.1 to 4.17.1 in /apps/accessibility
| * | | Bump webpack from 4.16.1 to 4.17.1 in /apps/accessibilitydependabot[bot]2018-09-032-68/+42
|/ / / | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.16.1 to 4.17.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.16.1...v4.17.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* / / [tx-robot] updated from transifexNextcloud bot2018-09-032-0/+8
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-09-022-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-0136-6/+214
| |
* | Merge pull request #10861 from nextcloud/version/noid/14.0.0RC2v14.0.0RC2Morris Jobke2018-08-311-2/+2
|\ \ | | | | | | 14.0.0 RC 2
| * | 14.0.0 RC 2Morris Jobke2018-08-311-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #10943 from nextcloud/fix/2fa-provider-dao-concurrent-insertMorris Jobke2018-08-311-20/+9
|\ \ | | | | | | Fix handlng of concurrent inserts of the 2FA provider registry DAO
| * | Fix handlng of concurrent inserts of the 2FA provider registry DAOChristoph Wurst2018-08-311-20/+9
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #10944 from nextcloud/content-list-overflow-fixRoeland Jago Douma2018-08-311-3/+3
|\ \ \ | | | | | | | | Fix overflow x scroll on app content list
| * | | Fix overflow x scroll on app content listJohn Molakvoæ (skjnldsv)2018-08-311-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #10942 from ↵Morris Jobke2018-08-312-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/feature/10776/longer-password-reset-time Change password expiration time from 12h to 7d
| * | | Change password expiration time from 12h to 7dMorris Jobke2018-08-312-2/+2
|/ / / | | | | | | | | | | | | | | | We use the same logic for creating accounts without a password and there the 12h is a bit short. Users don't expect that the signup link needs to be clicked within 12h - 7d should be a more expected behavior. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-08-3116-2/+96
| | |
* | | Merge pull request #10939 from nextcloud/bugfix/10930/perm-checker-wrong-pathMorris Jobke2018-08-301-6/+5
|\ \ \ | | | | | | | | Fix path when app has wrong permission
| * | | Fix path when app has wrong permissionDaniel Kesselberg2018-08-301-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Replace slow array function used in loop: https://github.com/kalessil/phpinspectionsea/blob/master/docs/performance.md#slow-array-function-used-in-loop Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #10910 from nextcloud/customproperties-ignored-listMorris Jobke2018-08-302-1/+1
|\ \ \ \ | | | | | | | | | | use the same ignored properties list for both CustomerPropertiesBackends
| * | | | use the same ignored properties list for both CustomerPropertiesBackendsRobin Appelman2018-08-282-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #10906 from nextcloud/request-params-arrayRoeland Jago Douma2018-08-301-1/+1
|\ \ \ \ | | | | | | | | | | ensure we always return an array from `Request::getParams`
| * | | | ensure we always return an array from `Request::getParams`Robin Appelman2018-08-281-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #10936 from ↵Morris Jobke2018-08-302-9/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/make-possible-to-pick-both-files-and-folders Make possible to pick both files and folders
| * | | | Make possible to pick both files and foldersDaniel Calviño Sánchez2018-08-301-1/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Store the mime type filter always as an arrayDaniel Calviño Sánchez2018-08-301-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make easier to check if both directories and files should be pickable. This also removes an unused assignment to the mime type. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Fix empty mime type filterDaniel Calviño Sánchez2018-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mime type is an empty array no filter should be applied. However, the filter was loosely compared to an empty array, but as arrays are objects then it became an implicit strict equality comparison which always failed due to being different objects. Now the length of the array is compared instead, and also moved outside the loop as it is not needed to check it for each file. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Prevent default action from being executed when the button is disabledDaniel Calviño Sánchez2018-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When "enter" is pressed in the file picker a "click" event is triggered on the primary action button. However, in some cases, like when the file picker is in "Choose" mode and the current directory in the file picker is the root folder, the primary action button is disabled. In those cases pressing enter should not trigger a click action on the button and be ignored instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #10925 from ↵Morris Jobke2018-08-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/use-main-text-color-for-editable-divs-and-text-areas Use main text color for editable divs and text areas
| * | | | | Use main text color for editable divs and text areasDaniel Calviño Sánchez2018-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #10913 from ↵Morris Jobke2018-08-301-16/+20
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | nextcloud/do-not-parse-html-in-user-id-and-display-name Do not parse HTML in user id and display name
| * | | | | Do not parse HTML in user id and display nameJoas Schilling2018-08-281-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #10924 from nextcloud/bugfix/10901/theming-bugfix-primaryJulius Härtl2018-08-307-8/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix SCSS variable management with the theming app
| * | | | | | Fix capabilities testJulius Härtl2018-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Make the default element color for bright theming colors lighterJulius Härtl2018-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Remove border from primary button when color is brightJulius Härtl2018-08-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Move SCSS variable fetching before the variables.scss to properly calculate ↵Julius Härtl2018-08-293-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color values Signed-off-by: Julius Härtl <jus@bitgrid.net>