summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12891 from nextcloud/theming-cachingRoeland Jago Douma2018-12-072-3/+14
|\ | | | | more caching for theming
| * more caching for themingRobin Appelman2018-12-072-3/+14
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #12895 from nextcloud/bugfix/12890/log-openssl-errorsRoeland Jago Douma2018-12-071-1/+11
|\ \ | | | | | | Read openssl error and log
| * | Read openssl error and logDaniel Kesselberg2018-12-061-1/+11
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #12887 from nextcloud/abstract_appframework_mapper_exceptionsRoeland Jago Douma2018-12-075-2/+36
|\ \ \ | | | | | | | | Abstract appframework mapper exceptions
| * | | Add IMapperExceptionRoeland Jago Douma2018-12-065-2/+36
| |/ / | | | | | | | | | | | | | | | | | | This way code using the DB mappers can have try catch blocks on this type of exceptions if they do not care if there was non or to many. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-12-0716-2/+118
| | |
* | | Merge pull request #12884 from nextcloud/fix/gracefull_oauth2_errorRoeland Jago Douma2018-12-062-4/+26
|\ \ \ | |/ / |/| | Fail gracefull if an unkown oauth2 client tries to authenticate
| * | Fail gracefull if an unkown oauth2 client tries to authenticateRoeland Jago Douma2018-12-062-4/+26
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12866 from ↵Morris Jobke2018-12-062-2/+3
|\ \ | | | | | | | | | | | | nextcloud/fix/12588/show_proper_not_enough_space_message Do not show general warning on free space error
| * | Add abort stub in JSUnitMorris Jobke2018-12-061-1/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Do not show general warning on free space errorRoeland Jago Douma2018-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #12588 Probably needs more fixing for the other cases. But this is the quick fix I could come up with for now. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #12872 from ↵Roeland Jago Douma2018-12-062-13/+8
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.27.1 Bump webpack from 4.27.0 to 4.27.1 in /apps/accessibility
| * | | Bump webpack from 4.27.0 to 4.27.1 in /apps/accessibilitydependabot[bot]2018-12-062-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.27.0 to 4.27.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.27.0...v4.27.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12871 from ↵Roeland Jago Douma2018-12-062-13/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.27.1 Bump webpack from 4.27.0 to 4.27.1 in /apps/oauth2
| * | | | Bump webpack from 4.27.0 to 4.27.1 in /apps/oauth2dependabot[bot]2018-12-062-13/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.27.0 to 4.27.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.27.0...v4.27.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12870 from ↵Roeland Jago Douma2018-12-062-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.27.1 Bump webpack from 4.27.0 to 4.27.1 in /apps/updatenotification
| * | | | Bump webpack from 4.27.0 to 4.27.1 in /apps/updatenotificationdependabot[bot]2018-12-062-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.27.0 to 4.27.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.27.0...v4.27.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12865 from nextcloud/fix/do_not_propogate_in_appdataMorris Jobke2018-12-062-4/+14
|\ \ \ \ | |/ / / |/| | | No need to propogate changes in appdata
| * | | No need to propogate changes in appdataRoeland Jago Douma2018-12-052-4/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | Right now we propogate a lof of changes in appdata. So for example we propogate each and every preview that is added to the system. This has no real added value as far as I can tell. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #12859 from ↵Roeland Jago Douma2018-12-067-25/+19
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/nextcloud-password-confirmation-0.4.1 Bump nextcloud-password-confirmation from 0.4.0 to 0.4.1 in /settings
| * | | Bump nextcloud-password-confirmation from 0.4.0 to 0.4.1 in /settingsdependabot[bot]2018-12-057-31/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [nextcloud-password-confirmation](https://github.com/ChristophWurst/nextcloud-password-confirmation) from 0.4.0 to 0.4.1. - [Release notes](https://github.com/ChristophWurst/nextcloud-password-confirmation/releases) - [Commits](https://github.com/ChristophWurst/nextcloud-password-confirmation/compare/v0.4.0...v0.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #12858 from ↵Roeland Jago Douma2018-12-062-13/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-4.27.1 Bump webpack from 4.27.0 to 4.27.1 in /settings
| * | | | Bump webpack from 4.27.0 to 4.27.1 in /settingsdependabot[bot]2018-12-052-13/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.27.0 to 4.27.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.27.0...v4.27.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-0620-574/+64
| | | |
* | | | Merge pull request #12857 from nextcloud/fix/emit_write_update_once_on_touchMorris Jobke2018-12-051-1/+1
|\ \ \ \ | | | | | | | | | | Emit write update only once on touch
| * | | | Emit write update only once on touchRoeland Jago Douma2018-12-051-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When a touch is done (i.e. when creating a new file in the node API) The hooks contain 'write' and 'touch' (and the operation is touch as well). This would cause a double write update. Which doesn't make sense. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #12854 from nextcloud/vcard-repair-uid-fixMorris Jobke2018-12-053-12/+32
|\ \ \ \ | | | | | | | | | | Log and continue on Dav reader failure (repair uid)
| * | | | Log and continue on Dav reader failureJohn Molakvoæ (skjnldsv)2018-12-053-12/+32
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #12855 from nextcloud/fix/do_not_update_filecache_twiceMorris Jobke2018-12-051-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Only execute query in propagateChange once
| * | | | Only execute query in propagateChange onceRoeland Jago Douma2018-12-051-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | The second execute statement should be inside the if block. Else it gets executed twice which makes no sense. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #12814 from nextcloud/fix/9058/no_user_enumartion_if_disabledRoeland Jago Douma2018-12-054-1/+61
|\ \ \ \ | |/ / / |/| | | No user enumeration on DAV if disabled
| * | | No DAV user enumeration if disabledRoeland Jago Douma2018-12-044-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9058 If the option to autocomplete users is disabled. We also should not enumerate the users on this endpoint. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #12841 from ↵Roeland Jago Douma2018-12-054-22/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-4.27.0 Bump webpack from 4.26.1 to 4.27.0 in /settings
| * | | | Compile assetsRoeland Jago Douma2018-12-053-10/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump webpack from 4.26.1 to 4.27.0 in /settingsdependabot[bot]2018-12-052-25/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.26.1 to 4.27.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.26.1...v4.27.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12824 from ↵Morris Jobke2018-12-055-15/+96
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/feature/12763/add-setup-check-for-bigint-conversion Add setup check for pending bigint conversion
| * | | Add setup check for pending bigint conversionMorris Jobke2018-12-055-13/+86
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix bigint conversion on SQLiteMorris Jobke2018-12-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | * on SQLite primary keys can't be bigint - see https://stackoverflow.com/a/18835967/520507 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Show columns to update in CLI interfaceMorris Jobke2018-12-051-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #12839 from ↵Roeland Jago Douma2018-12-054-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.27.0 Bump webpack from 4.26.1 to 4.27.0 in /apps/oauth2
| * | | | Compile assetsRoeland Jago Douma2018-12-053-6/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump webpack from 4.26.1 to 4.27.0 in /apps/oauth2dependabot[bot]2018-12-052-22/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.26.1 to 4.27.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.26.1...v4.27.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12846 from nextcloud/typo/noid/fix-spelling-of-incomingRoeland Jago Douma2018-12-053-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in "incoming"
| * | | | | Fix typo in "incoming"Joas Schilling2018-12-053-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #12757 from nextcloud/whatsNew-to-buttonMorris Jobke2018-12-053-10/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | make a button out of 'What's new' so it's obvious it can be clicked on
| * | | | | make "open updater" primary and place all buttons on one lineJonas Sulzer2018-12-043-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
| * | | | | make a button out of 'What's new' so it's obvious it can be clicked onJonas Sulzer2018-12-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for #12694 Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | | | | | Merge pull request #12840 from ↵John Molakvoæ2018-12-052-25/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.27.0 Bump webpack from 4.26.1 to 4.27.0 in /apps/updatenotification
| * | | | | Bump webpack from 4.26.1 to 4.27.0 in /apps/updatenotificationdependabot[bot]2018-12-052-25/+20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.26.1 to 4.27.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.26.1...v4.27.0) Signed-off-by: dependabot[bot] <support@dependabot.com>