summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update version requirements and versions of shipped appsJoas Schilling2018-09-0524-52/+55
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Bump the version on masterJoas Schilling2018-09-051-3/+3
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #11058 from nextcloud/3rdparty/guzzle/6.3.3Christoph Wurst2018-09-051-0/+0
|\ | | | | [3rdparty] Update to guzzle 6.3.3
| * [3rdparty] Update to guzzle 6.3.3Roeland Jago Douma2018-09-051-0/+0
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2018-09-0522-26/+6
|
* Merge pull request #11048 from nextcloud/stable14-10963Julius Härtl2018-09-041-3/+3
|\ | | | | [stable14] Updates logo scss to regard default values
| * Updates logo scss to regard default valuesMichael Weimann2018-09-041-3/+3
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Merge pull request #11022 from nextcloud/bump/npm/settingsJulius Härtl2018-09-044-97/+85
|\ \ | | | | | | Bump js deps settings
| * | Bump js deps settingsRoeland Jago Douma2018-09-044-97/+85
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11047 from nextcloud/typo/config.sample.phpRoeland Jago Douma2018-09-041-1/+1
|\ \ \ | | | | | | | | Fix typo in config.sample.php
| * | | Fix typo in config.sample.phpMarius Blüm2018-09-041-1/+1
| |/ / | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | Merge pull request #11046 from nextcloud/feature/10725/apploggerRoeland Jago Douma2018-09-044-0/+96
|\ \ \ | |/ / |/| | Add wrapper Logger in DIContainer
| * | Add wrapper Logger in DIContainerRoeland Jago Douma2018-09-044-0/+96
| | | | | | | | | | | | | | | | | | | | | This makes sure that for example app for the context is always set. We can in the future extend this to include more info. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10975 from ↵John Molakvoæ2018-09-042-1503/+1518
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/node-sass-4.9.3 Bump node-sass from 4.9.2 to 4.9.3 in /build
| * | | Bump node-sass from 4.9.2 to 4.9.3 in /builddependabot[bot]2018-09-032-1503/+1518
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [node-sass](https://github.com/sass/node-sass) from 4.9.2 to 4.9.3. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.9.2...v4.9.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #11023 from nextcloud/bump/npm/accessibilityChristoph Wurst2018-09-044-17/+19
|\ \ \ \ | | | | | | | | | | Bump JS deps Accessibility
| * | | | Bump JS deps AccessibilityRoeland Jago Douma2018-09-034-17/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 07:20:18 +0000