summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-09-0316-64/+136
|
* Merge pull request #16968 from ↵Roeland Jago Douma2019-09-021-0/+19
|\ | | | | | | | | nextcloud/feature/noid/guest-mention-notifications-for-talk Define a guest type so Talk can use it in it's notifications
| * Define a guest type so Talk can use it in it's notificationsJoas Schilling2019-09-021-0/+19
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #16930 from nextcloud/npm/audit/buildRoeland Jago Douma2019-09-021-55/+58
|\ \ | |/ |/| Fix npm audit warning in build
| * Fix npm audit warning in buildRoeland Jago Douma2019-08-301-55/+58
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16950 from ↵Roeland Jago Douma2019-09-024-10/+10
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-router-3.1.3 Bump vue-router from 3.1.2 to 3.1.3
| * | Bump vue-router from 3.1.2 to 3.1.3dependabot-preview[bot]2019-09-024-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/vuejs/vue-router/releases) - [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-router/compare/v3.1.2...v3.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #16961 from nextcloud/fix/settings/js_errorRoeland Jago Douma2019-09-021-0/+1
|\ \ \ | | | | | | | | Fix JS error on personal security page
| * | | Fix JS error on personal security pageRoeland Jago Douma2019-09-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16954 from ↵Roeland Jago Douma2019-09-022-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud-password-confirmation-0.4.2 Bump nextcloud-password-confirmation from 0.4.1 to 0.4.2
| * | | | Bump nextcloud-password-confirmation from 0.4.1 to 0.4.2dependabot-preview[bot]2019-09-012-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [nextcloud-password-confirmation](https://github.com/ChristophWurst/nextcloud-password-confirmation) from 0.4.1 to 0.4.2. - [Release notes](https://github.com/ChristophWurst/nextcloud-password-confirmation/releases) - [Commits](https://github.com/ChristophWurst/nextcloud-password-confirmation/compare/v0.4.1...v0.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-0216-2/+922
| | | | |
* | | | | Merge pull request #16953 from ↵Roeland Jago Douma2019-09-012-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/blueimp-md5-2.12.0 Bump blueimp-md5 from 2.11.1 to 2.12.0
| * | | | Bump blueimp-md5 from 2.11.1 to 2.12.0dependabot-preview[bot]2019-09-012-8/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bumps [blueimp-md5](https://github.com/blueimp/JavaScript-MD5) from 2.11.1 to 2.12.0. - [Release notes](https://github.com/blueimp/JavaScript-MD5/releases) - [Commits](https://github.com/blueimp/JavaScript-MD5/compare/v2.11.1...v2.12.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #16952 from ↵Roeland Jago Douma2019-09-012-5/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-merge-4.2.2 Bump webpack-merge from 4.2.1 to 4.2.2
| * | | Bump webpack-merge from 4.2.1 to 4.2.2dependabot-preview[bot]2019-09-012-9/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.1...v4.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #16957 from ↵Roeland Jago Douma2019-09-012-8/+8
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud-axios-0.2.1 Bump nextcloud-axios from 0.2.0 to 0.2.1
| * | | Bump nextcloud-axios from 0.2.0 to 0.2.1dependabot-preview[bot]2019-09-012-8/+8
| |/ / | | | | | | | | | | | | | | | | | | Bumps [nextcloud-axios](https://github.com/ChristophWurst/nextcloud-axios) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/ChristophWurst/nextcloud-axios/releases) - [Commits](https://github.com/ChristophWurst/nextcloud-axios/compare/v0.2.0...v0.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* / / [tx-robot] updated from transifexNextcloud bot2019-09-0110-0/+56
|/ /
* / [tx-robot] updated from transifexNextcloud bot2019-08-316-8/+8
|/
* [tx-robot] updated from transifexNextcloud bot2019-08-3024-6/+104
|
* Merge pull request #16925 from nextcloud/bugfix/throwable-middlewareRoeland Jago Douma2019-08-291-0/+4
|\ | | | | Handle throwables in the http dispatcher
| * Handle throwables in the http dispatcherJulius Härtl2019-08-291-0/+4
| | | | | | | | | | | | Co-authored-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #16924 from nextcloud/td/csp/evalRoeland Jago Douma2019-08-291-0/+1
|\ \ | |/ |/| Add deprecation warning
| * Add deprecation warningRoeland Jago Douma2019-08-291-0/+1
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #16913 from nextcloud/fix/declare_membersRoeland Jago Douma2019-08-293-30/+10
|\ | | | | SessionMiddleware: declare session property
| * SessionMiddleware: declare session propertyRoeland Jago Douma2019-08-283-30/+10
| | | | | | | | | | | | | | * Remove request since we don't useit * Update tests as well Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16843 from nextcloud/version/17.0.0/beta3v17.0.0beta3Roeland Jago Douma2019-08-292-35/+4
|\ \ | | | | | | 17 beta 3
| * | Update ca-bundleRoeland Jago Douma2019-08-291-33/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | 17 beta 3Roeland Jago Douma2019-08-281-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2019-08-2928-0/+112
|/ /
* | Merge pull request #16863 from ↵Roeland Jago Douma2019-08-288-18/+13
|\ \ | | | | | | | | | | | | nextcloud/ignore-enter-key-up-event-on-menu-button-toggles Ignore Enter key up event on menu button toggles
| * | Ignore Enter key up event on menu button togglesDaniel Calviño Sánchez2019-08-288-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like links, buttons generate a "click" event as well as the regular "keydown" and "keyup" events when pressing Enter. Due to this, if both the "click" and the "keyup" events are handled, when the menu is open and Enter is pressed in the toggle the menu is first hidden when the first event is handled, but then shown again when the second event is handled. To prevent that only the "click" event should be handled when the toggle is a button, like it is already done with links. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #16912 from nextcloud/fix/duplicate_array_keyRoeland Jago Douma2019-08-281-1/+0
|\ \ \ | |/ / |/| | Make sure they keys are unique
| * | Make sure they keys are uniqueRoeland Jago Douma2019-08-281-1/+0
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #16872 from ↵Roeland Jago Douma2019-08-281-0/+1
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/left-alignment-search-resuls Fix left-alignment of other results on search
| * | Fix left-alignment of other results on searchGreta Doci2019-08-261-0/+1
| | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | | Merge pull request #16615 from ↵Roeland Jago Douma2019-08-282-2/+436
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/16518/rooms_resources_should_respond Make rooms / resources automatically reply to invites
| * | | Make rooms / resources automatically reply to invitesGeorg Ehrke2019-08-262-2/+436
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #16898 from ↵Roeland Jago Douma2019-08-281-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/mixin-deep-1.3.2 [Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /build
| * | | | [Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /builddependabot-preview[bot]2019-08-271-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.** - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* / | | [tx-robot] updated from transifexNextcloud bot2019-08-2878-622/+5060
|/ / /
* | | Merge pull request #16879 from only-run-integration-tests-on-php-changesJohn Molakvoæ2019-08-272-0/+48
|\ \ \ | | | | | | | | Only run integration tests when PHP was modified
| * | | Only run integration tests when PHP was modifiedJoas Schilling2019-08-272-0/+48
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #16875 from nextcloud/bugfix/16874/welcome-mail-client-urlRoeland Jago Douma2019-08-272-6/+13
|\ \ \ \ | | | | | | | | | | Use custom client URL in welcome emails
| * | | | Mock client URL in new user mail testsJulius Härtl2019-08-271-5/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use custom client URL in welcome emailsJulius Härtl2019-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-08-27120-272/+288
| | | | |
* | | | | Merge pull request #16871 from nextcloud/fix/dav-reminder-job-constructorRoeland Jago Douma2019-08-261-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix missing parent constructor call in DAV reminder job
| * | | | | Fix missing parent constructor call in DAV reminder jobChristoph Wurst2019-08-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>