summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that we don't merge broken json.Daniel Kesselberg2019-12-093-14/+40
| | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Merge pull request #17325 from nextcloud/enh/decouple-register-resource-providerChristoph Wurst2019-12-0911-31/+304
|\ | | | | Decouple resource provider registration
| * Decouple resource provider registrationDaniel Kesselberg2019-12-0711-31/+304
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #18278 from ↵Roeland Jago Douma2019-12-092-90/+71
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.7.6 Bump @babel/preset-env from 7.7.4 to 7.7.6
| * | Bump @babel/preset-env from 7.7.4 to 7.7.6dependabot-preview[bot]2019-12-092-90/+71
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #18289 from ↵Roeland Jago Douma2019-12-091-2/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bug/18203/dont-log-exception-on-connect-exception Don't log the stack trace for ConnectException
| * | | Don't log the stack trace for ConnectExceptionDaniel Kesselberg2019-12-081-2/+2
| | |/ | |/| | | | | | | | | | | | | The stack trace for ConnectException could contain the old apps.json content and is probably huge. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #18264 from nextcloud/enh/actions/fixRoeland Jago Douma2019-12-091-0/+13
|\ \ \ | | | | | | | | Move away from fixupbot
| * | | Move away from fixupbotRoeland Jago Douma2019-12-061-0/+13
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #18282 from ↵Roeland Jago Douma2019-12-092-9/+21
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/eslint-loader-3.0.3 Bump eslint-loader from 3.0.2 to 3.0.3
| * | | Bump eslint-loader from 3.0.2 to 3.0.3dependabot-preview[bot]2019-12-082-9/+21
| | |/ | |/| | | | | | | | | | | | | | | | | | | Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/webpack-contrib/eslint-loader/releases) - [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.2...v3.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #18280 from ↵Roeland Jago Douma2019-12-092-11/+11
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/core-7.7.5 Bump @babel/core from 7.7.4 to 7.7.5
| * | | Bump @babel/core from 7.7.4 to 7.7.5dependabot-preview[bot]2019-12-082-11/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #18290 from ↵Roeland Jago Douma2019-12-092-8/+12
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/debt/tests-enable-disable-apps-contains-string Fix: Using assertContains() with string haystacks is deprecated and w…
| * | | Fix: Using assertContains() with string haystacks is deprecated and will not ↵Daniel Kesselberg2019-12-082-8/+12
| |/ / | | | | | | | | | | | | | | | be supported in PHPUnit 9. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | [tx-robot] updated from transifexNextcloud bot2019-12-0934-38/+250
| | |
* | | Bump css-loader from 3.2.0 to 3.2.1 (#18279)John Molakvoæ2019-12-084-13/+45
|\ \ \ | | | | | | | | Bump css-loader from 3.2.0 to 3.2.1
| * | | Bump css-loader from 3.2.0 to 3.2.1dependabot-preview[bot]2019-12-084-13/+45
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.2.0...v3.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* / / [tx-robot] updated from transifexNextcloud bot2019-12-0818-96/+190
|/ /
* | Fix size of header menus (#16057)John Molakvoæ2019-12-071-9/+4
|\ \ | | | | | | Fix size of header menus
| * | Move to proper scroll container and add more space to heightJulius Härtl2019-10-041-12/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix horizontal scrollbar in user menuJan-Christoph Borchardt2019-10-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Fix size of header menusJulius Härtl2019-10-041-0/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2019-12-0750-122/+276
| | |
* | | rejig right to left join for sqlite's satisfaction (#18254)John Molakvoæ2019-12-061-3/+3
|\ \ \ | |_|/ |/| | rejig right to left join for sqlite's satisfaction
| * | rejig right to left join for sqlite's satisfactionArthur Schiwon2019-12-061-3/+3
|/ / | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #18262 from ↵Roeland Jago Douma2019-12-062-3/+3
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/workflow-eventnames-fallback Make sure event names is always an array
| * | Make sure event names is always an arrayJulius Härtl2019-12-062-3/+3
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2019-12-0688-6/+288
| |
* | Merge pull request #18242 from nextcloud/directEditingEditorWithIdRoeland Jago Douma2019-12-051-0/+1
|\ \ | | | | | | add id to editor of direct editing
| * | add id to editor of direct editingtobiasKaminsky2019-12-051-0/+1
| | | | | | | | | | | | Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
* | | Merge pull request #18216 from nextcloud/fix/license-scriptRoeland Jago Douma2019-12-052476-3706/+7283
|\ \ \ | | | | | | | | Fix license header script and update headers
| * | | Update license headersChristoph Wurst2019-12-052476-3691/+7242
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | Update license script appsChristoph Wurst2019-12-051-15/+41
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18250 from nextcloud/fix/gallery/photos/shippedRoeland Jago Douma2019-12-051-1/+1
|\ \ \ | | | | | | | | Fix shipped.json
| * | | Fix shipped.jsonRoeland Jago Douma2019-12-051-1/+1
|/ / / | | | | | | | | | | | | | | | We no longer ship gallery but ship photos Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #18234 from nextcloud/version/18/beta1v18.0.0beta1Roeland Jago Douma2019-12-051-2/+2
|\ \ \ | | | | | | | | 18 Beta 1
| * | | 18 Beta 1Roeland Jago Douma2019-12-041-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Allow to unfavorite all files (#18241)John Molakvoæ2019-12-051-2/+1
|\ \ \ \ | | | | | | | | | | Allow to unfavorite all files
| * | | | Allow to unfavorite all filesJoas Schilling2019-12-051-2/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #17941 from nextcloud/search-by-ownerRoeland Jago Douma2019-12-057-26/+210
|\ \ \ \ | | | | | | | | | | Allow filtering the search results to the users home storage
| * | | | add @since to limitToHomeRobin Appelman2019-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | remove old 'owner' filterRobin Appelman2019-12-031-5/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Allow filtering the search results to the users home storageRobin Appelman2019-12-037-26/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by adding a ```xml <d:eq> <d:prop> <oc:owner-id/> </d:prop> <d:literal>$userId</d:literal> </d:eq> ``` clause to the search query. Searching by `owner-id` can only be done with the current user id and the comparison can not be inside a `<d:not>` or `<d:or>` statement Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #17989 from Noodlesalat/fix-padding-top-filelistRoeland Jago Douma2019-12-052-5/+10
|\ \ \ \ \ | | | | | | | | | | | | Remove whitespace above file list ref #17891
| * | | | | Remove whitespace above file listFabian Dreßler2019-11-182-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts #16366 and fixes #17891 Signed-off-by: Fabian Dreßler <nudelsalat@clouz.de>
* | | | | | Merge pull request #18130 from ↵Roeland Jago Douma2019-12-052-7/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/prevent-creating-users-with-existing-files Prevent creating users with existing files
| * | | | | | I love unit tests that mock unnecessary stuffJoas Schilling2019-12-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Prevent creating users with existing filesJoas Schilling2019-12-041-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #18144 from nextcloud/enh/gs/always_search_lookupRoeland Jago Douma2019-12-055-8/+33
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Sharee API GS fixes
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 23:39:48 +0000