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

5177 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling c30eccdd15
Merge pull request #2620 from nextcloud/bugfix/noid/allow-moderators-to-call-while-lobby-is-active
Allow moderators to call while the lobby is active, not others
2019-12-20 16:43:59 +01:00
Joas Schilling 2a20a69b66
Merge pull request #2589 from nextcloud/bugfix/2565/sidebar-title-alignment
Fix sidebar's title alignment
2019-12-20 16:36:11 +01:00
Marco Ambrosini 7620c3c279 Fix sidebar's title alignment
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-20 15:57:01 +01:00
Daniel Calviño Sánchez e173350ef9
Merge pull request #2618 from nextcloud/bugfix/noid/fix-guests-in-participant-list
Fix guests (without a name) in the participant list
2019-12-20 15:52:22 +01:00
Joas Schilling 63f25d76c6
Allow moderators to call while the lobby is active, not others
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 15:39:43 +01:00
Joas Schilling e359215b99
Merge pull request #2611 from nextcloud/add-chat-tab-to-sidebar-in-files-app
Add chat tab to sidebar in Files app
2019-12-20 15:31:02 +01:00
Daniel Calviño Sánchez eb7aa7b493
Add placeholder for the call button
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 15:27:44 +01:00
Daniel Calviño Sánchez 99a2da7e8d
Force scroll bars in tab contents instead of in whole Files sidebar
Before, when the chat view was shown in the sidebar the sidebar height
grew to accomodate the full list of messages (or the chat view just
filled a section of the sidebar, depending on the browser). Instead of
that the chat view should grow to fill the available space in the tab
content, and the scroll bar should be provided by the list of messages
itself.

In order to do that it is necessary to modify the style of the tabs
content container to set "overflow: hidden". In Nextcloud 17 it was
possible to provide an additional set of CSS classes to be set in the
tabs content container when a tab was active with
"getTabsContainerExtraClasses", but unfortunately that is not currently
possible in Nextcloud 18. Therefore this needs to be done by explicitly
setting the desired CSS rules on the tabs content container when the
chat tab is the active tab (and removing it when it is no longer the
active tab).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 15:27:44 +01:00
Daniel Calviño Sánchez 921ffaa3f5
Show chat view in chat tab in Files app
When the Talk sidebar is supported for a file a message is shown to the
user to explicitly join the conversation, and once joined the chat view
is shown in the chat tab. If a different file is selected the previous
conversation is left (even if the conversation for the new file is not
joined).

The sidebar tabs are created again whenever the sidebar is opened, be it
when changing to a different file or even when opening the sidebar again
for the same file after closing it. As the file of the current
conversation needs to be known to leave the conversation or not when the
FileInfo changes (so it is left if it is opened in a different file, but
kept if opened in the same file) the file ID of the current conversation
needs to be stored outside of the view.

Finally, as the AdvancedInput in shown in the chat view but there is no
route in use "this.$route.name" needs to be guarded.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 15:27:43 +01:00
Daniel Calviño Sánchez 6a22657e74
Check whether the Talk sidebar is supported for a file or not
The Talk sidebar is supported for a file when it meets certain sharing
conditions. If the Talk sidebar is not supported then a message is shown
to the user in the tab to share the file first.

In some cases it is not possible to know if the Talk sidebar is
supported or not only from the FileInfo data and it is necessary to
query the server. In those cases a loading icon is shown until the
response from the server is received.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 15:27:43 +01:00
Marco Ambrosini e4ac56e7ea
Add method to get the token for the conversation of a file
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-20 15:27:43 +01:00
Daniel Calviño Sánchez 200ff80570
Show warning when opening the chat tab on a folder
This is just a temporary message; in the future the whole tab will be
hidden in that case, but it depends on a fix in server which was not
ready yet for beta 3.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 15:27:42 +01:00
Joas Schilling a9152c345b
Fix guests (without a name) in the participant list
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 15:21:52 +01:00
Joas Schilling 222521bb8a
Merge pull request #2613 from nextcloud/bugfix/2602/refresh-participant-list-on-signaling-notification
Update the participant list on signaling notification for a changed list
2019-12-20 14:45:35 +01:00
marco 25b971ab28
Merge pull request #2614 from nextcloud/bugfix/2567/fix-broken-scss-file
Fix broken scss file breaking the icon-reply
2019-12-20 14:06:59 +01:00
Joas Schilling d332bcc161
Fix broken scss file breaking the icon-reply
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 14:02:06 +01:00
marco aa4656b168
Merge pull request #2612 from nextcloud/bugfix/noid/remove-unneeded-debug
Remove unneeded debug
2019-12-20 13:49:39 +01:00
Joas Schilling c5929a321a
Update the participant list on signaling notification for a changed list
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 11:56:29 +01:00
Joas Schilling cddabd0592
Remove unneeded debug
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 11:27:15 +01:00
Joas Schilling 1e1e2c6520
Merge pull request #2518 from nextcloud/feature/noid/circles-support
Add support for circles
2019-12-20 11:23:12 +01:00
Joas Schilling 1e49d1247b
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:55:30 +01:00
Joas Schilling f565bdb3e3
Only check local invited or regular users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:52:52 +01:00
Joas Schilling f0293227a9
Allow to add circles to existing conversations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:52:52 +01:00
Joas Schilling 6f19e9ddfd
Allow to start conversations with circles
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:52:52 +01:00
marco cac8dc7193
Merge pull request #2600 from nextcloud/bugfix/2588/share-file-button-should-not-be-shown-to-guest-users
Bugfix/2588/share file button should not be shown to guest users
2019-12-20 10:11:24 +01:00
Joas Schilling 89d871ccd7
Use the userId as that is immediatelly available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:04:50 +01:00
marco 578f7c75df
Merge pull request #2610 from nextcloud/fix-isReplyable-not-set-for-temporary-messages
Fix "isReplyable" not set for temporary messages
2019-12-20 08:49:52 +01:00
marco 510f50447b
Merge pull request #2609 from nextcloud/replace-overflow-scroll-with-overflow-auto
Replace "overflow: scroll;" with "overflow: auto;"
2019-12-20 08:49:09 +01:00
Daniel Calviño Sánchez f994f7df0b Remove unneeded error log
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 02:25:49 +01:00
Daniel Calviño Sánchez b6ca85daf8 Fix "isReplyable" not set for temporary messages
The Message component expects that all messages have the "isReplyable"
property set. Although temporary messages are marked as not replyable as
soon as the message is received from the server the property will get
its real value.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 02:23:56 +01:00
Daniel Calviño Sánchez 43e82c1647 Replace "overflow: scroll;" with "overflow: auto;"
"overflow: scroll;" always* shows the scroll bars, even if they are not
needed; if the scroll bars should be shown only when needed "overflow:
auto;" should be used instead.

*In newer browsers "overflow: scroll;" behaves like "overflow: auto;",
so this change makes no difference in those cases, but older browsers
respect the expected behaviour.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-20 02:19:52 +01:00
Daniel Calviño Sánchez 8fa88f2d91
Merge pull request #2608 from nextcloud/fix-chatview-in-right-sidebar
Fix chat view in right sidebar
2019-12-19 19:51:38 +01:00
Daniel Calviño Sánchez 1dc4b61b25 Remove padding in chat tab to maximize space for chat view
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-19 17:38:38 +01:00
Daniel Calviño Sánchez cbad9718ce Force scroll bars in tab contents instead of in whole sidebar
Before, when the chat view was shown in the sidebar the sidebar height
grew to accomodate the full list of messages. Instead of that the chat
view should be limited to the available space in the tab content, and
the scroll bar should be provided by the list of messages itself.

In other tabs, like in the participants tab when there were a lot of
participants, something similar happened, and the conversation
information at the top of the sidebar as well as the tab headers were
scrolled when the participants were scrolled.

As the chat view tab has to provide its own scroll bars for consistency
now the scroll bars of all tabs are shown for their content instead of
for the whole sidebar. Note that if the tab provides some more specific
scroll bars (like done in the chat tab) those are the scroll bars shown
instead of the ones for the tab itself.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-19 17:38:17 +01:00
Daniel Calviño Sánchez f2ddcb4e60 Extract component for ChatView
The ChatView grows to fill the available space from its parent.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-19 16:53:02 +01:00
Marco Ambrosini dd0a3091d9 Don't display add file button if the current user is a guestt
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-19 16:43:13 +01:00
marco 1b1902d258
Merge pull request #2607 from nextcloud/bugfix/noid/fix-participant-actions-position
Fix participant actions position
2019-12-19 16:28:02 +01:00
Daniel Calviño Sánchez d6abadf7f0 Rename class of wrapper for ChatView and CallView to "mainView"
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-19 16:08:52 +01:00
Daniel Calviño Sánchez 9e41f48998
Merge pull request #2601 from nextcloud/bugfix/2584/show-moderation-menu-to-moderators-only
Bugfix/2584/show moderation menu to moderators only
2019-12-19 15:39:22 +01:00
Daniel Calviño Sánchez 1946ee35c1
Merge pull request #2599 from nextcloud/bugfix/2594/continuous-long-text-in-chat-messages-widens-the-chat-view
Align new message form input with messages
2019-12-19 13:19:47 +01:00
Daniel Calviño Sánchez 0bc628b973
Merge pull request #2587 from nextcloud/fix-joining-room-before-being-connected-to-the-external-signaling-server
Fix joining room before being connected to the external signaling server
2019-12-19 13:16:44 +01:00
Daniel Calviño Sánchez 5514e0e9b6
Merge pull request #2604 from nextcloud/bugfix/noid/fix-sidebar-icons
Fix sidebar icons color
2019-12-19 13:06:18 +01:00
Daniel Calviño Sánchez 8296dc9f2b
Merge pull request #2603 from nextcloud/fix-using-signaling-before-its-settings-are-fetched
Fix using signaling before its settings are fetched
2019-12-19 12:48:30 +01:00
Marco Ambrosini b164acff61 Fix sidebar icons color
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-19 11:57:39 +01:00
Marco Ambrosini f114edce85 Fix participant actions position
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-19 11:52:25 +01:00
Marco Ambrosini 14c8926cfc Hide moderation menu to non moderators
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-19 11:37:46 +01:00
Daniel Calviño Sánchez 60fbec3365
Merge pull request #2597 from nextcloud/unify-new-loadsidebarlistener-with-previous-templateloader
Unify new LoadSidebarListener with previous TemplateLoader
2019-12-19 10:31:19 +01:00
Nextcloud bot 4c528b0cd8
[tx-robot] updated from transifex 2019-12-19 03:25:38 +00:00
Daniel Calviño Sánchez 4dfde8f423 Fix using signaling before its settings are fetched
The signaling object is created after the signaling settings are
fetched. As the settings are fetched as soon as the application starts
it was assumed that the signaling object was always available when it
was going to be used, but that may not be the case if the request to
fetch the settings take longer than expected.

Now the signaling object is guarded behind an async function that
returns it if it is available or fetches the settings and then returns
the object once available. Also, if a new signaling object is tried to
be created while the settings are being fetched it will also wait until
the first request succeeded and return the same object in all cases.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-19 00:33:40 +01:00
Marco Ambrosini 1894cc9fd8 Fix message width in the new message form
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-18 15:09:57 +01:00