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

1241 Коммитов

Автор SHA1 Сообщение Дата
Ivan Sein a54f2769b0 Merge pull request #440 from nextcloud/sidebar-polishing
Sidebar polishing
2017-10-26 12:12:08 +02:00
Nextcloud bot 74f77bca14
[tx-robot] updated from transifex 2017-10-26 00:23:33 +00:00
Joas Schilling a4fbd70373 Merge pull request #429 from nextcloud/add-basic-backend-for-chat
Add basic backend for chat
2017-10-25 11:33:53 +02:00
Joas Schilling 6cfbaf8ab0 Merge pull request #448 from nextcloud/add-support-for-specifying-tab-order-in-the-right-sidebar
Add support for specifying tab order in the right sidebar
2017-10-25 11:32:45 +02:00
Nextcloud bot 409f7740d5
[tx-robot] updated from transifex 2017-10-25 00:24:19 +00:00
Daniel Calviño Sánchez 0abd362f74 Add support for specifying tab order in the right sidebar
When adding tabs to the right sidebar it is now possible to provide a
"priority" property to set the order of the tab header relative to the
other tab headers.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-24 11:26:56 +02:00
Nextcloud bot 7a7f35f0ee
[tx-robot] updated from transifex 2017-10-24 00:25:05 +00:00
Joas Schilling 24b2844427
Use the given short cuts
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-23 12:06:03 +02:00
Joas Schilling d1b85315bb
Move add participant to the sidebar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-23 12:04:28 +02:00
Nextcloud bot dbb8c5b931
[tx-robot] updated from transifex 2017-10-23 00:23:02 +00:00
Nextcloud bot 201c396062
[tx-robot] updated from transifex 2017-10-22 00:23:48 +00:00
Nextcloud bot a8d52589e7
[tx-robot] updated from transifex 2017-10-21 00:22:34 +00:00
Daniel Calviño Sánchez ce9155289b Fix password protected rooms in chat backend
Before, any user was able to send and receive messages to and from
public password protected rooms, even if they were not invited and they
had not joined it; guests were not able to send, but were able to
receive nevertheless. Now, only invited users or users/guests that have
joined a public password protected room can send and receive messages to
and from it.

As a side effect that change affects too to regular public rooms (not
password protected), but the new behaviour makes more sense than the old
one anyway.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-20 03:49:07 +02:00
Daniel Calviño Sánchez 943a85d869 Use the room ID instead of the token as the object ID of chat comments
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-20 03:49:07 +02:00
Daniel Calviño Sánchez 0e29c7b39e Fix storing a spreed-session as an actorId
The character limit for actorId is 64, but the spreed-session is 256
characters long, so it has to be hashed to get an ID that fits.

The sha1 algorithm is used as, from all the hash functions bundled with
PHP that are always available (the Hash extension can be disabled using
the "--disable-hash" switch, unlike those that are part of the string
functions), it generates the longest hashes (40 characters) that fit in
the actorId column of the database.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-20 03:49:07 +02:00
Daniel Calviño Sánchez 2e73166dad Add integration tests for the chat
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-20 03:49:07 +02:00
Daniel Calviño Sánchez 9eb3611db5 Add controller for chat messages
The ChatController uses a long-polling approach: if there are currently
no messages the response will not be sent immediately; instead, HTTP
connection will be kept open waiting for new messages to arrive and,
when they do, then the response will be sent.

The technique is simply based on the fact that ChatManager will wait
(hang) until there are some messages to be returned, or until the
timeout expires.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-20 03:49:07 +02:00
Daniel Calviño Sánchez 4f0a97896e Add basic polling chat manager
The chat manager handles sending and receiving chat messages. It uses
basic polling; "receiveMessages()" will repeteadly query the database
for new messages, waiting a little between each query, until messages
are found or the timeout expires.

The Comments API is used internally, but as this class is meant to be
used directly and only by a Controller, "receiveMessages()" returns an
array of IComments too instead of a custom interface to save the
conversion of objects.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-20 03:49:07 +02:00
Nextcloud bot 796b7e5e54
[tx-robot] updated from transifex 2017-10-20 00:23:23 +00:00
Daniel Calviño Sánchez d954bf137c Move "Add person" button from navigation bar to right sidebar
The ParticipantView was renamed to ParticipantListView and it is now a
subview of the new ParticipantView, which also contains the button to
add other participants to the room.

TODO: finish the actual movement of the button, as currently this commit
is just a skeleton with the changed views.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 17:43:45 +02:00
Ivan Sein 594b23cebd Merge pull request #445 from nextcloud/fix-contacts-menu-option
Fix infinite redirect when following the link in a contacts menu
2017-10-19 15:03:41 +02:00
Joas Schilling e5eb17a4a0
Fix infinite redirect when following the link in a contacts menu
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 14:57:04 +02:00
Nextcloud bot e16950b53e
[tx-robot] updated from transifex 2017-10-19 00:22:49 +00:00
Joas Schilling eb0950b7e1
Fix some language strings
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 12:22:30 +02:00
Joas Schilling 5f537006a3
Don't rerender when the user is typing
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 11:29:48 +02:00
Joas Schilling 3fb1314e41
Move password handling to the sidebar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 10:58:47 +02:00
Joas Schilling 369f6a4fae
Move rename option to the sidebar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 10:58:47 +02:00
Joas Schilling d94f84b58b
Move share link to the sidebar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 10:58:42 +02:00
Ivan Sein bbb40e21f2 Merge pull request #437 from nextcloud/fix-sidebar-overlap-after-call
Fix sidebar overlap in calls
2017-10-18 10:15:39 +02:00
Ivan Sein a3027dddf2 Merge pull request #438 from nextcloud/activities-for-calls
Activities for calls
2017-10-18 10:12:30 +02:00
Nextcloud bot 22b6e2ea24
[tx-robot] updated from transifex 2017-10-18 00:22:50 +00:00
Ivan Sein de594c9f35 Merge pull request #433 from nextcloud/ask-for-password-in-plain-mode
Don't use popup to ask for the password but the "blue screen"
2017-10-17 18:52:48 +02:00
Ivan Sein e89d044810 Merge pull request #442 from nextcloud/fix-removing-password
Allow to remove the password
2017-10-17 18:27:09 +02:00
Ivan Sein ac6b80dcc4 Fix eslint.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-10-17 18:22:29 +02:00
Joas Schilling 54902aff07
Allow to remove the password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-17 18:11:54 +02:00
Nextcloud bot bc9f08c31a
[tx-robot] updated from transifex 2017-10-17 00:22:39 +00:00
Joas Schilling 297742fef5 Merge pull request #439 from nextcloud/rework-right-sidebar
Rework right sidebar
2017-10-16 14:05:50 +02:00
Nextcloud bot 92e74f60ef
[tx-robot] updated from transifex 2017-10-15 00:22:28 +00:00
Nextcloud bot e13bb7f36f
[tx-robot] updated from transifex 2017-10-14 02:43:38 +00:00
Daniel Calviño Sánchez b5ce9061e6 Replace custom code with SidebarView
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez 936fe0a3f1 Add Marionette view for call info
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez c35a30475d Set the new room for ParticipantCollection when the active room changes
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez c516ddf513 Make ParticipantCollection to automatically fetch when its room changes
The ParticipantCollection provides the list of participants (including
guests) in a room. The Room model is synced through signaling and
provides some information about the registered users and the guests in a
room, so the ParticipantCollection can listen to changes in those
properties to automatically fetch its items again when needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez e26d1f17b9 Make ParticipantView to render automatically when its collection changes
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez 2f25d8abe8 Generalize ParticipantView CSS rules
Instead of being based on the "participantTabView" id the CSS rules used
by the ParticipantView were modified to be based on its class,
"participantWithList". This will make possible to change the parent
element of the ParticipantView and keep its style.

The rules for links were merged as those links that required a padding
due to being shown with an icon were also those shown inside the list
items.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez bfc9066137 Add content to the right sidebar
The right sidebar will contain a call info view and a tab view to which
different sections can be added as needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez 0fff33484b Add Marionette view for the right sidebar
The right sidebar is an area that can be shown or hidden from the right
border of the document. It is a core element from Nextcloud, and
SidebarView is a Marionette wrapper around it. Therefore, it has to be
used along an "#app-content" element that takes into account the
"with-app-sidebar" CSS class.

However, this right sidebar extends the standard right sidebar with an
icon shown on the right border of the screen that makes possible for the
user to show it when hidden (as there is no other element in the UI
suitable for that purpose).

That icon is just a right-pointing triangle created with a CSS trick (a
zero-sized div with width borders, but all of them transparent except
for the left one). However, as the icon will be shown on different
coloured backgrounds it can not have just a single colour; it must
provide a border on its own too, which is achieved with another triangle
slightly larger underneath. The triangle border is 2px instead of just
1px used in other UI elements (like in the sidebar itself) to make it
more noticeable on a white background.

The triangle used for the icon is a large one, with a width of 24px and
a height of 48px. Using this trick has an added benefit, as its
clickable area is larger than the triangle itself (48x48px), which
improves its usability on touchable screens (and does not negatively
affect the experience on other devices).

Currently the SidebarView is empty. The content will be added in
following commits.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Daniel Calviño Sánchez aa24728518 Add Marionette view for tabs
A TabView contains a set of tab headers and a content area. When a
header is selected its associated content view is shown in the content
area; otherwise its content is hidden (although the header is always
shown).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-13 17:13:59 +02:00
Nextcloud bot 23e32ebe24
[tx-robot] updated from transifex 2017-10-13 00:23:33 +00:00
Nextcloud bot 5e9828caac
[tx-robot] updated from transifex 2017-10-12 00:22:33 +00:00