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

3236 Коммитов

Автор SHA1 Сообщение Дата
Joachim Bauch 879b949481
Fix chrome version detection if at end of user agent.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-12-11 12:02:04 +01:00
Joachim Bauch 509126ee8a
Fix eslint error.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2018-12-11 12:00:22 +01:00
Daniel Calviño Sánchez 020202c8c5 Show working icon in call button while joining or leaving a call
To provide a stronger feedback that the action is still going on now a
working/loading icon is shown in the call button while joining or
leaving a call.

In the Files app the call button width depends on its text (in the
regular Talk UI it depends on the sidebar width), so the padding was
increased to always make room for the icon, even when hidden, to prevent
a sudden increase of the width when the icon is shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-11 11:23:07 +01:00
Daniel Calviño Sánchez 32cc5d0065 Disable call button while joining or leaving a call
Joining or leaving a call is not an immediate action; in some cases a
few seconds can pass before the action is finished, so during that time
the button should be disabled, both to prevent further actions from the
user and to give her feedback that the action is still going on.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-11 11:03:49 +01:00
Nextcloud bot 7e27c02ab9
[tx-robot] updated from transifex 2018-12-11 01:36:57 +00:00
Peter Edens 8a7c6a2dbf Fix screensharing support in Chrome 71 and Iridium. Signed-off-by: Peter Edens <petere@conceiva.com.com> 2018-12-11 11:22:44 +11:00
Daniel Calviño Sánchez ac2b053c1f Bump server version in the helper app for integration tests
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-10 17:12:48 +01:00
Daniel Calviño Sánchez 7bf78e1771 Fix "run-docker.sh" with PostgreSQL 10.5
In the original "fix" (spoiler alert: the fix was wrong) "POSTGRES_DB"
ended being empty due to "$DATABASE_NAME_dummy" being parsed as a full
variable name, instead of "$DATABASE_NAME" followed by the string
"_dummy".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-10 17:07:19 +01:00
Joas Schilling e14861637d
Merge pull request #1353 from nextcloud/bugfix/noid/fix-unit-tests
Fix unit tests
2018-12-10 13:19:41 +01:00
Joas Schilling b6661f8f2b
Merge pull request #1331 from nextcloud/16
Increase max-version to 16
2018-12-10 12:19:20 +01:00
Joas Schilling d39432d1af
Merge pull request #1346 from nextcloud/use-special-icons-for-rooms-associated-to-objects
Use special icons for rooms associated to objects
2018-12-10 12:13:58 +01:00
Daniel Calviño Sánchez c75dc7caa9
Use special icons for rooms associated to objects
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-10 12:13:40 +01:00
Daniel Calviño Sánchez a8908ab90a
Generalize CSS rules for room icons
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-10 12:13:15 +01:00
Daniel Calviño Sánchez e7ee5d1546
Set room icons in the template
"onRender" is always called after the template has been rendered, so
there is no need to remove the icons for other types of rooms; even if
the room type has changed the element will not use have any of the
previous CSS classes, it will be a new element as defined in the
template. Due to this the room icons can be set in the template itself
instead of in "onRender".

Avatars, on the other hand, are set using JavaScript, so they still need
to be set in "onRender"; the name of the called function has been
changed to better reflect is current purpose.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-10 12:13:15 +01:00
Daniel Calviño Sánchez 98f57a4c89
Remove dead code
Swapping the "public-room" and "private-room" CSS classes comes from the
time in which the share link was shown in the room list. However, since
the share link was moved to the sidebar the "public-room" and
"private-room" CSS classes are not set anywhere, so their switching code
as well as their CSS rules can be removed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-10 12:13:15 +01:00
Joas Schilling 6af08fd207
Fix unit tests, regression from #1344
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-10 12:10:51 +01:00
Daniel Calviño Sánchez 427116dde2 Adjust tests to check that updating a received share is forbidden
Updating a received share is no longer allowed by the server, so the
integration tests have to be adjusted to the new behaviour.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-10 11:45:01 +01:00
Joas Schilling 50a2367364
Merge pull request #1348 from nextcloud/tech/noid/improve-update-readme
Improve readme
2018-12-10 10:22:35 +01:00
Nextcloud bot dc91f68980
[tx-robot] updated from transifex 2018-12-10 01:36:50 +00:00
Nextcloud bot 69e0bfd731
[tx-robot] updated from transifex 2018-12-09 01:37:27 +00:00
Nextcloud bot 8df3c63aa2
[tx-robot] updated from transifex 2018-12-08 01:36:07 +00:00
Joas Schilling 128d4a4a63
Test against master again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-07 18:37:21 +01:00
Joas Schilling 9e98504872
Bump all versions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-07 18:36:28 +01:00
Jan-Christoph Borchardt 6d9529d962
Increase max-version to 16
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-12-07 18:36:09 +01:00
Joas Schilling 23ac01ccda
Update screenshot with the new features
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-07 18:29:18 +01:00
Joas Schilling 34725e0380
Improve the README with relevant information
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-07 18:06:48 +01:00
Joas Schilling dd96501026
Merge pull request #1335 from nextcloud/better-integration-testing
Better integration testing
2018-12-07 15:42:52 +01:00
Nextcloud bot 3d065c3a6f
[tx-robot] updated from transifex 2018-12-07 01:37:03 +00:00
Joas Schilling 2ecde1874e
Increase version for beta5
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:44:01 +01:00
Joas Schilling fa8b61b250
Add changelog
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:43:45 +01:00
Joas Schilling 54b7ea75b3
Prepare 4.0.1
**Added**
- Add an option to test the TURN configuration in the admin settings
  [#1294](https://github.com/nextcloud/spreed/pull/1294)

**Changed**
- Improve the notifications when a share password is requested
  [#1296](https://github.com/nextcloud/spreed/pull/1296)
- Do not show an error when a file is shared a second time into a conversation
  [#1295](https://github.com/nextcloud/spreed/pull/1295)

**Fixed**
- Custom Signaling, STUN and TURN configurations are not loaded for the user requesting the password for a share
  [#1297](https://github.com/nextcloud/spreed/pull/1297)
- Fix position of the contacts menu when clicking on the avatar of a chat author
  [#1293](https://github.com/nextcloud/spreed/pull/1293)
- Avatars in messages/mentions by guests show the guest avatar instead of the user
  [#1292](https://github.com/nextcloud/spreed/pull/1292)
- Information about user state in a call is bugged
  [#1291](https://github.com/nextcloud/spreed/pull/1291)
- Wrong conversation name of password requests in the details sidebar
  [#1290](https://github.com/nextcloud/spreed/pull/1290)
- Fix rendering, reloading and interaction with the participant list
  [#1222](https://github.com/nextcloud/spreed/pull/1222)
  [#1289](https://github.com/nextcloud/spreed/pull/1289)

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:26:16 +01:00
Joas Schilling b15c67f78d
Merge pull request #1344 from nextcloud/bugfix/1339/persistent-join-file-rooms
Persistent join file rooms
2018-12-06 18:20:54 +01:00
Joas Schilling 1856fc3094
"You" translation for leaving a conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:05:47 +01:00
Joas Schilling 1890687981
Also leave the room when the user tries to join and can not access the file anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:05:47 +01:00
Joas Schilling e5d580c1a4
Make clear that the user joined the room themselves
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:05:47 +01:00
Joas Schilling c7126eafe9
Also add a system notification for joining a file room
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:05:46 +01:00
Joas Schilling a215f726ac
Explicitly join the room when opening a file sidebar chat
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 18:05:46 +01:00
Joas Schilling 95b8f2a0de
Merge pull request #1345 from nextcloud/prevent-breaking-the-call-when-the-files-sidebar-is-closed-in-chromium
Prevent breaking the call when the Files sidebar is closed in Chromium
2018-12-06 17:44:24 +01:00
Daniel Calviño Sánchez f0a155657f Prevent breaking the call when the Files sidebar is closed in Chromium
Chromium seems to drop a stream when the element it is attached to is
detached or reparented. The sidebar in the Files app is open and closed
using a jQuery animation, which reparents the whole sidebar and then
restores it at the end of the animation, so closing the sidebar breaks
an ongoing call in Chromium. To prevent that, during a call the
functions to open and close the sidebar are replaced with custom
versions that do not use an animation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 17:07:45 +01:00
Joas Schilling 32d0b52c7d
Merge pull request #1343 from nextcloud/show-chat-tab-also-when-a-file-is-not-shared
Show "Chat" tab also when a file is not shared
2018-12-06 16:54:27 +01:00
Daniel Calviño Sánchez c981daeb42 Do not show the Talk UI in the sidebar if sharing is disabled
Rooms for files are available only for shared files; if the sharing API
is disabled the files can not be shared, and thus the Talk UI in the
sidebar does not provide any value.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 16:03:16 +01:00
Daniel Calviño Sánchez b641a281ff Show "Chat" tab also when a file is not shared
Before, the "Chat" tab was shown only when the file was shared. This
made the feature hard to discover if you did not know about it.
Moreover, after sharing the file the details view had to be closed and
opened again, which was cumbersome, as there were no events to listen to
and the visibility of tabs can not be updated once shown either (at
least, without some hacks).

Due to all this now the "Chat" tab is always shown for files (although
not for folders); if the file is already shared the previous UI (call
button and chat view) is shown, and if it is not a message to inform the
user that the file needs to be shared is shown instead. This is updated
every time the tab is opened again, so after sharing the file going back
to the "Chat" tab will show the call button and the chat view.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 16:03:16 +01:00
Joas Schilling 9ccb380a52
Merge pull request #1312 from nextcloud/add-support-for-video-calls-to-the-talk-sidebar-in-files-app
Add support for video calls to the talk sidebar in files app
2018-12-06 15:29:48 +01:00
Joas Schilling 0a39d9d0a4
Split up running of the integration tests so they don't timeout
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-12-06 14:49:26 +01:00
Daniel Calviño Sánchez e213c6de93 Show message in the sidebar while waiting for others to join the call
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 13:08:53 +01:00
Daniel Calviño Sánchez 7437d90687 Move call button from main file details to chat tab
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 13:08:53 +01:00
Daniel Calviño Sánchez b6819e22a5 Add local video and media controls
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 13:08:53 +01:00
Daniel Calviño Sánchez ecd0e74a4f Guard condition against element not found
Although in the main Talk UI there will be always a "#screen" element
this may not be the case when embedded in the Files app, for example,
when changing to an unshared file while in a call in a different file.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 13:08:25 +01:00
Daniel Calviño Sánchez fa2def677c Add support for video calls to the Talk sidebar in Files app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 13:05:27 +01:00
Daniel Calviño Sánchez 391bac61b6 Delay reload of the message list
When "setFileInfo" is called the tab is not visible yet, so reloading
the message list does nothing; the reload needs to be delayed until the
next event loop to ensure that the tab will be visible.

Even without this fix the list was being shown as expected due to
joining the room causing the messages to be fetched and thus the list
being reloaded when received. However, joining to the room before
showing the tab would reveal the problem (as will happen once the call
button is added).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-06 13:00:52 +01:00