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

2036 Коммитов

Автор SHA1 Сообщение Дата
Ivan Sein 323d64eda2
Merge pull request #919 from nextcloud/calls-are-conversations
Calls are Conversations
2018-05-30 09:48:12 +02:00
Nextcloud bot 2abbf31ced
[tx-robot] updated from transifex 2018-05-30 00:37:42 +00:00
Ivan Sein 0f22c00dd1 Change notifications and activities strings.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-29 11:18:56 +02:00
Nextcloud bot 4abf626cab
[tx-robot] updated from transifex 2018-05-29 00:37:06 +00:00
Daniel Calviño Sánchez 7ba70a766f
Merge pull request #913 from nextcloud/feature/noid/client-links
Add client links to personal settings
2018-05-28 16:02:02 +02:00
Nextcloud bot c008681997
[tx-robot] updated from transifex 2018-05-26 00:40:30 +00:00
Nextcloud bot 0e40c75def
[tx-robot] updated from transifex 2018-05-25 00:42:27 +00:00
Julius Härtl ed864cf6ca
Fix order of settings in appinfo.xml
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 15:02:11 +02:00
Nextcloud bot a740a198c1
[tx-robot] updated from transifex 2018-05-24 00:41:37 +00:00
Nextcloud bot cf1ba7d58b
[tx-robot] updated from transifex 2018-05-23 00:42:17 +00:00
Julius Härtl 247b99739d
Add client links to personal settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-22 09:43:03 +02:00
Nextcloud bot 4f50d9cd54
[tx-robot] updated from transifex 2018-05-22 00:38:10 +00:00
Nextcloud bot d42badb4ef
[tx-robot] updated from transifex 2018-05-20 00:37:07 +00:00
Nextcloud bot 9807aa7dc4
[tx-robot] updated from transifex 2018-05-18 00:40:15 +00:00
Nextcloud bot b89b062e16
[tx-robot] updated from transifex 2018-05-17 00:41:00 +00:00
Nextcloud bot 5768b6ccbb
[tx-robot] updated from transifex 2018-05-14 00:36:39 +00:00
Nextcloud bot 8cd34e8c69
[tx-robot] updated from transifex 2018-05-12 00:36:39 +00:00
Joas Schilling 34514eef0c
Merge pull request #900 from nextcloud/changlog/3-2-1/fix-all-the-things
Add changelog for 3.2.1
2018-05-11 11:03:50 +02:00
Joas Schilling 19a8dcdad2
Add changelog for 3.2.1
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-11 10:48:33 +02:00
Joas Schilling 03c4e1879b
Merge pull request #896 from nextcloud/fix-scrolling-on-participants-list
Fix scrolling on participants list
2018-05-11 10:36:46 +02:00
Joas Schilling bef3f8111d
Merge pull request #893 from nextcloud/make-acceptance-test-for-two-users-chatting-more-robust
Make acceptance test for two users chatting more robust
2018-05-11 10:34:49 +02:00
Ivan Sein c177232bc6
Merge pull request #894 from nextcloud/fix-disconnect-media-leaving-call
Fix disconnect media after leaving a call.
2018-05-11 10:24:38 +02:00
Ivan Sein 39b94b1a7f
Make sure to always set the token on joining a room
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-11 09:06:31 +02:00
Daniel Calviño Sánchez b45f3ab6fc Fix scrolling on participants list
When using Firefox, the participants tab view requires its overflow to
be hidden to limit its size to the size of its parents. Otherwise, the
participants tab view grows to fit its children; if that happens then no
scroll bar is shown for the participants list, as the participants list
is tall enough to fit all its items (even if they are not visible
because they are in the overflow area). In Chromium, on the other hand,
the participants tab view size is always limited by its parents, no
matter if the overflow is hidden or not.

In a similar way, once the overflow is hidden the bottom padding added
to the participants list has to be added to its last item instead.
Firefox only takes into account the bottom padding in the participants
list when the list has not overflown the participants tab view; it needs
to be added to the last item to be taken into account also when the
participants list is taller than the participants tab view. Chromium, on
the other hand, always takes into account the padding, no matter if it
is added to the participants list or to its last item.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-11 04:21:46 +02:00
Nextcloud bot 0f1b2d0aaf
[tx-robot] updated from transifex 2018-05-11 00:35:10 +00:00
Nextcloud bot 2bdc925f85
[tx-robot] updated from transifex 2018-05-10 00:37:26 +00:00
Daniel Calviño Sánchez 7ecb3ffd81 Make acceptance test for two users chatting more robust
The chat between two users was tested by a sequence of one user sending
a message and immediately after that the other user sending another
message. Most of the time the messages were processed in the server in
the order in which they were sent, but sometimes it could happen that a
previous message took longer than usual to get to the server and then
the next message from the other user was processed before it; in those
cases the test failed due to the messages not matching the expected
order. Now each user waits for the last message of the other user to be
received before sending the next message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 18:23:02 +02:00
Joas Schilling 380971899e
Merge pull request #891 from nextcloud/change-delete-room-message
Change deleted room message.
2018-05-09 16:32:48 +02:00
Ivan Sein 64c53ffda5 Update acceptance test.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-09 14:56:39 +02:00
Ivan Sein 62bc6f75ff Change deleted room message.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-05-09 14:41:42 +02:00
Joas Schilling 2f367a8c30
Merge pull request #863 from nextcloud/bugfix/862/reset-audio-video-panel
Reset audio and video control panel.
2018-05-09 14:33:10 +02:00
Ivan Sein 90e028ac86
Merge pull request #874 from nextcloud/fix-ui-when-leaving-current-call
Stop ping and signaling when the room was deleted
2018-05-09 11:22:56 +02:00
Ivan Sein c322163d1f
Merge pull request #866 from nextcloud/bugfix/865/stop-refreshing-participant-list-when-a-guest-is-chatting
Stop refreshing participant list when a guest is chatting
2018-05-09 11:19:52 +02:00
Joas Schilling 391f32f3f0
Stop ping and signaling when the room was deleted
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 10:35:59 +02:00
Joas Schilling d53f01777c
Merge pull request #872 from nextcloud/fix-ui-when-leaving-current-call
Fix UI when leaving current call
2018-05-09 10:09:40 +02:00
Joachim Bauch 296082f42f
Merge pull request #869 from nextcloud/standalone-signaling-remove-sessions
Notify standalone signaling server about sessions to remove from room.
2018-05-09 10:08:02 +02:00
Ivan Sein d49060a9d0
Merge pull request #871 from nextcloud/fix-chat-view-when-leaving-current-room
Fix chat view when leaving current room
2018-05-09 09:54:17 +02:00
Daniel Calviño Sánchez 264b412a65 Fix UI when leaving current call
When the chat view is shown in the main view the call UI (videos and
screens) is hidden using a CSS trick. However, when there is no chat
view in the main view the elements for videos and screens were always
visible. Those elements are initially "empty", but once the user joins a
call they are filled with contents (like the icon to mute the own audio,
or the avatar of the speaking user). As the elements were always visible
the call UI was shown in the main view after a room was left (either
explicitly or implicitly, for example, if the moderator deleted the
room), as in those cases there is no chat view hidding them.

Besides that, the empty content element was hidden when joining a call
but never shown back again. Due to that when a room was left after
joining a call the empty content element was also missing.

Now the videos, screens and empty content are explicitly shown or hidden
as needed when the user joins a call, leaves a call, or leaves a room,
just like it is done with the chat view.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 05:00:27 +02:00
Daniel Calviño Sánchez 213bbeb0cb Add acceptance tests for leaving the current room
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 04:53:42 +02:00
Daniel Calviño Sánchez 4b97806e89 Check empty content text in addition to its visibility
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 04:52:11 +02:00
Daniel Calviño Sánchez 164333e053 Make looking for the active conversation list item more robust
In order to check if certain conversation is the active conversation
the element for the active conversation list item with the given name
was found and then it was verified that it was visible; waiting for the
element to be visible using the implicit wait made to find the element
is a valid approach if the element is always visible when it exists in
the DOM. However, during the lapse between removing/deleting the
conversation and getting the updated conversation list from the server
the element may be hidden but exist in the DOM. Due to that it has to be
explicitly waited for the element to be visible.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-09 01:23:14 +02:00
Ivan Sein a3bfff0827
Merge pull request #870 from nextcloud/initial-guest-name
Make sure user is in a room before the guest name is set.
2018-05-08 16:12:51 +02:00
Joachim Bauch 172cbd64cb
Make sure user is in a room before the guest name is set.
Depending on timings it could happen that the guest name was set before
the room token was known (resulting in `null` in the url) or before the
user has joined the room (so setting the name got rejected).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 15:40:52 +02:00
Joas Schilling baad12b270
hmm
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-08 14:43:39 +02:00
Joachim Bauch c12363fd9a
Notify standalone signaling server about sessions to remove from room.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 14:41:49 +02:00
Ivan Sein e21d86040f
Merge pull request #868 from nextcloud/own-event-participantlist-changed
Use dedicated event name to trigger when refreshing the participant list
2018-05-08 14:22:49 +02:00
Joas Schilling 7ab8302c81
Merge pull request #867 from nextcloud/unpromote-speaker-on-remove
Unpromote latest speaker if no users remain in call when removing video.
2018-05-08 14:02:06 +02:00
Joachim Bauch b1ee96b5e4
Use dedicated event name to trigger when refreshing the participant list.
This avoids a conflict (introduced by #864) with the existing ´usersChanged`
event which is triggered when the `inCall` status of a user has changed.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-05-08 13:49:53 +02:00
Joas Schilling 1af0e1e94c
Also set $dispatchEvent to false
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-08 13:23:59 +02:00
Daniel Calviño Sánchez 86d2d66eb0 Fix chat view when leaving current room
When explicitly leaving the current room through the room list view the
chat view was detached. However, as the internal state of the
Application object (which manages the placement of the chat view) was
not updated the chat view was always hidden from that point on until the
page was reloaded.

Moreover, as the chat view was detached only when explicitly leaving the
current room the chat view was not hidden for other users in the room if
it was deleted by a moderator.

As the "leaveCurrentRoom" event is triggered in the room channel when
the current room is left, either explicitly or implicitly, now the
Application object listens to that event and hides the chat view as
needed when it is received.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-08 13:23:23 +02:00