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

2036 Коммитов

Автор SHA1 Сообщение Дата
Nextcloud bot ba407c371c
[tx-robot] updated from transifex 2018-04-21 00:32:56 +00:00
Ivan Sein 1480c1aad2
Merge pull request #799 from nextcloud/add-acceptance-tests-for-chat-to-drone
Add acceptance tests for chat to Drone
2018-04-20 16:13:28 +02:00
Daniel Calviño Sánchez fbe96fdfe5 Add acceptance tests for chat to Drone
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-20 15:48:28 +02:00
Daniel Calviño Sánchez ffeac59ef7 Adjust chat message collection to changes in chat endpoint
The messages are now got based on the id of the last known message
instead of on an offset (the number of known messages) to adjust to the
changes in the chat endpoint.

The chat endpoint was modified too to, based on the value of the
"lookIntoFuture" parameter, either immediately return the history of
messages or wait for new messages to be received; in this later case,
however, the old behaviour was preserved, so it can still be used to get
the existing messages too besides the new ones.

The only difference with the old behaviour is that now the number of
received messages is limited by the "limit" parameter (100 by default).
However, when "lookIntoFuture" is enabled and there are existing
messages it returns immediately, so even if there is a long history it
will load chunks of 100 messages until all the existing messages are
received (which also makes the browser more responsive than loading
thousands of messages at once).

Note that when "lookIntoFuture" is enabled the chat endpoint provides
the messages sorted from oldest to newest, so it is no longer needed to
explicitly sort the models in the collection.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-20 14:39:51 +02:00
Joas Schilling 272d4d2e76
More
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-20 14:29:18 +02:00
Joas Schilling 1e230a26b7
Merge pull request #797 from nextcloud/password-popover-icon
Add lock icon to password popover.
2018-04-20 14:01:24 +02:00
Ivan Sein 4abbe710c9 Add lock icon to password popover.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-04-20 12:25:10 +02:00
Joas Schilling 342ef2f20d
Opsy
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-20 11:03:09 +02:00
Joas Schilling 531c2ff809
Fix injection
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-20 11:03:09 +02:00
Joas Schilling 1ad3720084
Start fixing integration tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-20 11:03:09 +02:00
Joas Schilling 628cd11b16
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-20 11:03:09 +02:00
Joas Schilling 2f4adcb9c1
Add proper chat message offset support
The offset now is based on the last known chat message instead of limit-offset,
so new messages don't mess up requests to get the history of a room

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-20 11:03:09 +02:00
Joas Schilling c874be537d
Merge pull request #587 from nextcloud/sidebar-toggle
Always show sidebar toggle, also when sidebar is open
2018-04-20 10:58:59 +02:00
Joas Schilling c22bff193b
Update changelog
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-20 10:49:45 +02:00
Nextcloud bot e0205e5de5
[tx-robot] updated from transifex 2018-04-20 00:33:50 +00:00
Nextcloud bot 6ef1a4ec0f
[tx-robot] updated from transifex 2018-04-19 00:34:08 +00:00
Joas Schilling 51d378af8b
Merge pull request #758 from nextcloud/bugfix/512/allow-to-join-without-camera-and-video
Allow to join without camera/mic
2018-04-18 15:58:49 +02:00
Ivan Sein fffd09d74c
Merge pull request #777 from nextcloud/feature/noid/icon-for-participants-in-call
Add an icon for participants which are in the call
2018-04-18 10:47:35 +02:00
Joas Schilling ac9a9494d4
Add an icon for participants which are in the call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-17 10:53:00 +02:00
Nextcloud bot 35c344d384
[tx-robot] updated from transifex 2018-04-17 00:39:38 +00:00
Ivan Sein add04f2341
Merge pull request #775 from nextcloud/add-acceptance-tests-for-chat
Add acceptance tests for chat
2018-04-16 14:15:57 +02:00
Ivan Sein 0d9a656e9f Keep video-disabled class for dark styled icon.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-04-16 14:08:36 +02:00
Nextcloud bot 393ac9e370
[tx-robot] updated from transifex 2018-04-16 00:34:22 +00:00
Daniel Calviño Sánchez f94e5637b8 Add acceptance tests for chat
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-13 17:04:22 +02:00
Ivan Sein be1b58795c Implement toggle function.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-04-13 11:03:57 +02:00
Ivan Sein 0c159d5b7f
Merge pull request #768 from nextcloud/add-acceptance-tests
Add acceptance tests
2018-04-13 10:34:34 +02:00
Morris Jobke dc57803052
Fix drone config
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-12 16:44:09 +02:00
Nextcloud bot b3c8930373
[tx-robot] updated from transifex 2018-04-12 00:42:26 +00:00
Daniel Calviño Sánchez 137e7c6727 Run the acceptance tests for conversations in Drone
The acceptance tests requires the grandparent directory of the root
directory of the app to be the root directory of the Nextcloud server.
Drone only clones the app repository, so the Nextcloud server repository
has to be explicitly cloned and the app moved to the "apps" directory
before the tests are run.

Besides that, as the acceptance tests need to be run on Apache,
"/var/www/html" has to be linked to the root directory of the Nextcloud
server.

Once all that is done the tests can be run in the same way that they are
run in Drone for the Nextcloud server but just specifying the acceptance
tests directory too.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-11 11:35:59 +02:00
Daniel Calviño Sánchez c23d9c2ad4 Add basic acceptance tests for conversations
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-11 11:35:59 +02:00
Joas Schilling 73869fa10f
Merge pull request #764 from nextcloud/bugfix/noid/fix-signaling-endpoints
Fix new multi-session signaling endpoints.
2018-04-10 10:58:27 +02:00
Nextcloud bot 815a1d8453
[tx-robot] updated from transifex 2018-04-10 00:34:10 +00:00
Daniel Calviño Sánchez 07b6b10f93 Run acceptance tests on the Apache web server
The Talk app requires a multi-threaded web server (due to its use of
long polling), so the configuration of the acceptance tests is changed
to use the Apache web server instead of the default PHP built-in web
server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 23:41:41 +02:00
Daniel Calviño Sánchez 7d2901fe67 Add base configuration for acceptance tests
This commits adds the base configuration needed to run acceptance tests
for the Talk app.

The script to run the acceptance tests simply calls the "run.sh" script
from the server acceptance tests specifying the directory of the
acceptance tests for the Talk app.

The installation script called before the acceptance tests are actually
run is extended from the one used in the acceptance tests for the server
to also enable the Talk app.

Due to Behat limitations, the Behat configuration used in the acceptance
tests for the server can not be extended; the configuration used is
exclusive for the Talk app. Due to that some parameters must be
duplicated from the Behat configuration for the server acceptance tests
(like the session definitions).

In any case, the core library and all the contexts for the server are
automatically available in the acceptance tests for apps; their path
does not need to be set in the "autoload" section, although the specific
contexts to be used have to be explicitly set; the ones included are
those needed (either directly or due to dependencies) to be able to use
the "I am logged in"/"I am logged in as the admin" steps, which are the
most basic steps needed by the acceptance tests for almost every app.

On the other hand, the paths to the features and the contexts from the
Talk app must be explicitly set in the configuration.

Finally, note that this commit does not include any test feature, so
calling "run.sh" would just end in a failure; some basic test features
will be added in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 23:02:05 +02:00
Joas Schilling 867b5f94b3
Make sure the token is not a reserved word
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-09 22:10:34 +02:00
Nextcloud bot 98d74ba6b8
[tx-robot] updated from transifex 2018-04-09 00:37:49 +00:00
Nextcloud bot 184be4f5ec
[tx-robot] updated from transifex 2018-04-08 00:34:38 +00:00
Nextcloud bot b9199cb29b
[tx-robot] updated from transifex 2018-04-07 00:34:10 +00:00
Nextcloud bot cb3e787eac
[tx-robot] updated from transifex 2018-04-06 00:36:43 +00:00
Jan-Christoph Borchardt ebd7d97e68 Fix wording and pixel alignment
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-04-05 13:52:14 +02:00
Jan-Christoph Borchardt f72ed2da78 Always show sidebar toggle, also when sidebar is open
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-04-05 13:48:32 +02:00
Ivan Sein 6fefbf8f97
Merge pull request #766 from nextcloud/chat-layout-improvements
Increase padding in chat view to leave enough space for side buttons.
2018-04-05 13:11:21 +02:00
Nextcloud bot b8690e8d18
[tx-robot] updated from transifex 2018-04-05 00:34:08 +00:00
Ivan Sein 895747c84f Increase padding in chat view to leave enough space for side buttons.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-04-04 16:35:39 +02:00
Ivan Sein 0c963c227b Change endpoints to /{token}/messages.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-04-04 10:30:51 +02:00
Nextcloud bot 9cd3bd0431
[tx-robot] updated from transifex 2018-04-04 00:35:40 +00:00
Ivan Sein 34b52f852c Fix new multi-session signaling endpoints.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2018-04-03 17:00:53 +02:00
Ivan Sein 9defbd91f0
Merge pull request #762 from nextcloud/comradekingu-patch-1
Spelling: stun server→ STUN server
2018-04-03 10:05:36 +02:00
Nextcloud bot 460c4b6024
[tx-robot] updated from transifex 2018-04-02 00:34:50 +00:00
Nextcloud bot f00ec6aadd
[tx-robot] updated from transifex 2018-04-01 00:32:46 +00:00