Граф коммитов

8058 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 32f14e15c4
Only show the conflict warning when the session was in a call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-23 09:24:30 +02:00
Nextcloud bot 675eb3c2aa
[tx-robot] updated from transifex 2020-10-23 03:09:23 +00:00
Vincent Petry 9228196f5b
Don't copy array for reverse iteration
Copying an array just for the sake of reverse iteration is a bit
wasteful, especially with bigger arrays.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-22 17:15:18 +02:00
Joas Schilling a35132b5e3
Merge pull request #4411 from nextcloud/bugfix/4368/push-to-talk-issue-when-being-muted-by-moderator
Fix bug when being muted by a moderator while on push to talk
2020-10-22 10:03:45 +02:00
Vincent Petry 825ffb624c
Merge pull request #4429 from nextcloud/fix-empty-call-view-position-in-sidebar
Fix empty call view position in sidebar
2020-10-22 09:46:46 +02:00
Nextcloud bot 1be0833808
[tx-robot] updated from transifex 2020-10-22 03:09:09 +00:00
Joas Schilling 1ff8c73e24
Merge pull request #4431 from nextcloud/abort-integration-tests-if-talk-or-helper-apps-can-not-be-installed
Abort integration tests if Talk or helper apps can not be installed
2020-10-21 23:32:30 +02:00
Daniel Calviño Sánchez 7130432090 Abort integration tests if Talk or helper apps can not be installed
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-10-21 21:58:00 +02:00
Daniel Calviño Sánchez 1542a4dc1b
Merge pull request #4430 from nextcloud/nickvergessen-patch-1
Update info.xml
2020-10-21 17:34:03 +02:00
Marco Ambrosini b6a0a5abab Fix bug when being muted by a moderator while on push to talk
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2020-10-21 16:07:32 +02:00
Joas Schilling ee9bd29aa2
Update info.xml 2020-10-21 14:56:30 +02:00
Daniel Calviño Sánchez d5c3797301
Merge pull request #4422 from nextcloud/fix-isolated-modules-in-files-app-sidebar
Fix isolated modules in Files app sidebar
2020-10-21 12:55:12 +02:00
Daniel Calviño Sánchez 592d99f19d Fix empty call view position in sidebar
When the call view is shown in the Files app or public share page
sidebar its direct children (the empty call view and the wrapper of
videos) are expected to have an absolute position. However, as the empty
call view had a relative position it was prepended before the call view
padding (which defines the call view height) instead of fully covering
it.

When the call view is shown in the main Talk UI or in the video
verification sidebar the call view has an explicit height attribute
(rather than using a padding), so in this case it does not matter if the
empty call view has a relative or absolute position.

However, when the empty call view is shown in the grid it must use a
relative position.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-10-21 12:13:10 +02:00
Joas Schilling de463046b0
Merge pull request #4424 from nextcloud/techdebt/noid/update-comments-manager-constructor
Update comments manager constructor
2020-10-21 09:19:49 +02:00
Joas Schilling ab443ee9f2
Update comments manager constructor
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 09:03:59 +02:00
Nextcloud bot 21122fa6a3
[tx-robot] updated from transifex 2020-10-21 03:09:49 +00:00
Daniel Calviño Sánchez 2992f7a666 Fix isolated modules in Files app sidebar
"mainFilesSidebar.js" and "mainFilesSidebarLoader.js" were both bundled
in separate files, and both files were loaded on their own. Due to this
each loaded file had its own instance of the JavaScript modules instead
of using a shared one, which for example caused conversations to not be
properly left when the sidebar of a folder was opened. Now both files
are bundled in a single file, so all the elements act on the same shared
state.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-10-20 17:23:35 +02:00
Joas Schilling 9f0608b55e
Merge pull request #4421 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.1.0
Bump webpack-cli from 3.3.12 to 4.1.0
2020-10-20 17:14:16 +02:00
dependabot-preview[bot] 3a92529e4e
Bump webpack-cli from 3.3.12 to 4.1.0
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.12 to 4.1.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 15:12:16 +00:00
Joas Schilling 526f72d0bf
Merge pull request #4400 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.12.1
Bump @babel/preset-env from 7.11.5 to 7.12.1
2020-10-20 17:11:30 +02:00
dependabot-preview[bot] f4b7c6ad56
Bump @babel/preset-env from 7.11.5 to 7.12.1
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.11.5 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-preset-env)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 15:10:16 +00:00
Joas Schilling ede73132f1
Merge pull request #4399 from nextcloud/dependabot/npm_and_yarn/webdav-3.6.1
Bump webdav from 3.5.0 to 3.6.1
2020-10-20 17:07:19 +02:00
Joas Schilling a016a87116
Merge pull request #4394 from nextcloud/dependabot/npm_and_yarn/babel/core-7.12.3
Bump @babel/core from 7.11.6 to 7.12.3
2020-10-20 17:07:04 +02:00
Joas Schilling 4396288f23
Merge pull request #4420 from nextcloud/dependabot/npm_and_yarn/vue/cli-service-4.5.8
Bump @vue/cli-service from 4.5.6 to 4.5.8
2020-10-20 17:06:43 +02:00
dependabot-preview[bot] a48c2db8f7
Bump @vue/cli-service from 4.5.6 to 4.5.8
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 4.5.6 to 4.5.8.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.8/packages/@vue/cli-service)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 15:02:32 +00:00
dependabot-preview[bot] 51c3d805c8
Bump webdav from 3.5.0 to 3.6.1
Bumps [webdav](https://github.com/perry-mitchell/webdav-client) from 3.5.0 to 3.6.1.
- [Release notes](https://github.com/perry-mitchell/webdav-client/releases)
- [Changelog](https://github.com/perry-mitchell/webdav-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/perry-mitchell/webdav-client/compare/v3.5.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 15:02:22 +00:00
Joas Schilling e1091d72ba
Merge pull request #4396 from nextcloud/dependabot/npm_and_yarn/vue-router-3.4.7
Bump vue-router from 3.4.6 to 3.4.7
2020-10-20 16:59:10 +02:00
dependabot-preview[bot] b552a99a27
Bump vue-router from 3.4.6 to 3.4.7
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.4.6 to 3.4.7.
- [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.4.6...v3.4.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 14:39:09 +00:00
dependabot-preview[bot] 18a7603830
Bump @babel/core from 7.11.6 to 7.12.3
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.11.6 to 7.12.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.3/packages/babel-core)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 14:38:57 +00:00
Joas Schilling d7cb3a724a
Merge pull request #4392 from nextcloud/dependabot/npm_and_yarn/babel/runtime-7.12.1
Bump @babel/runtime from 7.11.2 to 7.12.1
2020-10-20 16:35:51 +02:00
dependabot-preview[bot] 7ff59adf60
Bump @babel/runtime from 7.11.2 to 7.12.1
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.11.2 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 14:32:29 +00:00
Joas Schilling 20f5cfdc7a
Merge pull request #4391 from nextcloud/dependabot/npm_and_yarn/emoji-regex-9.1.1
Bump emoji-regex from 9.0.0 to 9.1.1
2020-10-20 16:29:16 +02:00
dependabot-preview[bot] 3ce9800278
Bump emoji-regex from 9.0.0 to 9.1.1
Bumps [emoji-regex](https://github.com/mathiasbynens/emoji-regex) from 9.0.0 to 9.1.1.
- [Release notes](https://github.com/mathiasbynens/emoji-regex/releases)
- [Commits](https://github.com/mathiasbynens/emoji-regex/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 13:25:43 +00:00
Joas Schilling 2d88fd1dcc
Merge pull request #4380 from nextcloud/bugfix/4378/message-list-doesnt-scroll-properly
Fix chat scrolling
2020-10-20 13:55:56 +02:00
marco 2248006292
Merge pull request #4416 from nextcloud/bugfix/4388/adjust-again-empty-call-background
Adjust empty call view colors
2020-10-20 10:20:39 +02:00
Vincent Petry 9ace691661
Adjust empty call view colors
Use hard-coded values instead of variables to keep it static regardless
of theme or dark mode.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-20 09:07:12 +02:00
Nextcloud bot b924de15eb
[tx-robot] updated from transifex 2020-10-20 03:08:59 +00:00
Daniel Calviño Sánchez b06647e4f2
Merge pull request #4359 from nextcloud/fix/4337/busybox-ps-syntax
Use generic syntax when calling 'ps' command
2020-10-19 21:46:38 +02:00
Vincent Petry f0e7a047c7
Merge pull request #4408 from nextcloud/bugfix/4388/fix-empty-call-background
Fix empty call background color
2020-10-19 18:25:03 +02:00
Vincent Petry 733421366f
Merge pull request #4363 from nextcloud/feature/4245/ui-hide-bottom-videos
Add ability to collapse the grid view
2020-10-19 18:24:49 +02:00
Vincent Petry 4e50dfe157
Fix empty call background color
Make the background grey and adjust text color to be readable.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:20:05 +02:00
Vincent Petry b047b638e9
Fix grid update when collapsed
When the stripe (internally a grid) is collapsed, it should not attempt
to rebuild itself.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:18:39 +02:00
Vincent Petry bbce043f6e
Fix slide animation for stripe
Make sure the top component fills the full height while running the
animation, to avoid showing some black background there.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:18:39 +02:00
Vincent Petry 8ee349134f
Adjust chevron button styles
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:18:38 +02:00
Vincent Petry 7bab87af03
Move one on one mode to transparent stripe
In order to keep the collapse logic and styles in a single location, the
one on one LocalVideo was removed and now the Grid view's stripe is
reused with a transparent background.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:18:38 +02:00
Vincent Petry b9437dd3df
Fix grid view
Add 100% height only when in grid view.
Added LocalMediaControls to LocalVideo for when in grid view, properly
centered.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:18:38 +02:00
Vincent Petry 2b031992e1
Move LocalMediaControls to CallView, fix sidebar mode
Moved LocalMediaControls to the CallView to make sure they are available
in any mode, including the sidebar one.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:18:38 +02:00
Vincent Petry bdcbadb3b4
Display local media controls also when collapsed
Moved LocalMediaControls to the Grid view to make sure it's always
visible even when the grid is collapsed.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-19 17:18:37 +02:00
Vincent Petry b885bddae6
Add ability to collapse the grid view
To be able to focus on the video / screen of the current presenter.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Co-authored-by: Marco Ambrosini <marcoambrosini@pm.me>
2020-10-19 17:18:34 +02:00
Joas Schilling eb0b351e25
Merge pull request #4410 from nextcloud/bugfix/4404/fix-ci-ignore-psalm-hook-issues
Skip psalm issues related to hook names
2020-10-19 17:15:03 +02:00