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

4881 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 10bca35813
Merge pull request #2472 from nextcloud/dependabot/composer/tests/integration/behat/behat-3.5.0
Bump behat/behat from 3.3.1 to 3.5.0 in /tests/integration
2019-11-18 20:21:57 +01:00
dependabot-preview[bot] 6ec55bcb58
Bump behat/behat from 3.3.1 to 3.5.0 in /tests/integration
Bumps [behat/behat](https://github.com/Behat/Behat) from 3.3.1 to 3.5.0.
- [Release notes](https://github.com/Behat/Behat/releases)
- [Changelog](https://github.com/Behat/Behat/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Behat/Behat/compare/v3.3.1...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 17:49:39 +00:00
Joas Schilling 42acfbedb2 Lint fixes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-18 15:18:28 +01:00
Marco Ambrosini 45a038d49c Filter out already added users and groups
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-18 15:18:28 +01:00
Marco Ambrosini 8c0fb2a59b Refresh participants list after adding one
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-18 15:18:28 +01:00
Marco Ambrosini 47dc885239 Make post request to add participants
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-18 15:18:28 +01:00
Marco Ambrosini a517e34a09 Create Participants component
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-18 15:18:28 +01:00
Marco Ambrosini 03d57c7fa3 Reset search text when leaving a conversation
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-18 15:18:28 +01:00
Marco Ambrosini 8c4349a356 Show and hide searchbox depending on the conversation type
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-18 15:18:28 +01:00
Nextcloud bot e855b2beff
[tx-robot] updated from transifex 2019-11-18 02:50:04 +00:00
dependabot-preview[bot] 0054db70c9
Merge pull request #2471 from nextcloud/dependabot/npm_and_yarn/vuex-3.1.2 2019-11-17 15:42:47 +00:00
Nextcloud bot 6cf72a4c66
[tx-robot] updated from transifex 2019-11-17 02:52:12 +00:00
dependabot-preview[bot] fa7ca031d0
Bump vuex from 3.1.1 to 3.1.2
Bumps [vuex](https://github.com/vuejs/vuex) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/vuejs/vuex/releases)
- [Commits](https://github.com/vuejs/vuex/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-17 02:15:27 +00:00
Nextcloud bot 356e58329b
[tx-robot] updated from transifex 2019-11-16 02:49:46 +00:00
marco 022f1490c1
Merge pull request #2467 from nextcloud/bugfix/2348/fix-reply-bugs
Fix reply bugs
2019-11-15 10:40:13 +01:00
Joas Schilling 50a476d5f5
Merge pull request #2465 from nextcloud/feature/vuejs/call-button
Add a CallButton with dummy methods
2019-11-15 10:18:27 +01:00
Joas Schilling 2204ec7115
Deleting is not an option at the moment
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-15 10:17:38 +01:00
Joas Schilling 23a460c928
System messages are also excluded
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-15 10:17:38 +01:00
marco 4375852ed7
Merge pull request #2466 from nextcloud/bugfix/2388/fix-new-lines-in-message
Correctly render newlines in text
2019-11-15 09:50:12 +01:00
Joas Schilling de51c484f8
Cut the quote after 2 newlines or max. 200 chars
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-15 00:50:37 +01:00
Joas Schilling ed3b02cd99
Merge potential existing objects so we dont loose info
Before after you replied to a reply, the parent would loose
its own parent information when it was also a reply already.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-15 00:37:32 +01:00
Joas Schilling a2557a929e
Only allow replying to chat messages for now
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-15 00:37:32 +01:00
Joas Schilling 0f1cc4067b
Correctly render newlines in text
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-14 23:26:52 +01:00
Joas Schilling d81a6d8aa6
Merge pull request #2460 from nextcloud/bugfix/noid/avatar-of-deleted-users
Fix the avatar of deleted users
2019-11-14 21:08:54 +01:00
Joas Schilling 4ad85d0857
Merge pull request #2464 from nextcloud/bugfix/2462/prevent-lookfornewmessages-call-infinite-loop
Prevent lookForNewMessage call infinite loop
2019-11-14 21:05:07 +01:00
Joas Schilling 0952e66602
Add a CallButton with dummy methods
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-14 21:03:37 +01:00
Marco Ambrosini eeebbcee84
Prevent lookForNewMessage call infinite loop
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-14 20:18:54 +01:00
marco 513f332d09
Merge pull request #2459 from nextcloud/bugfix/noid/date-header-on-temporary-message
Fix the date-header of temporary messages
2019-11-14 09:46:23 +01:00
Nextcloud bot 2dba362482
[tx-robot] updated from transifex 2019-11-14 02:50:23 +00:00
Joas Schilling 6198aa7e4c
Fix the avatar of deleted users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 16:15:08 +01:00
Joas Schilling 69fbe73b45
Fix the date-header of temporary messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 16:08:44 +01:00
Joas Schilling 0a3724891e
Merge pull request #2458 from nextcloud/feature/noid/guest-support
Guest support
2019-11-13 16:01:23 +01:00
Joas Schilling 3b7ce180b2
Correctly set the actorId for logged in users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 15:56:54 +01:00
Joas Schilling c1b42df5a2
Always set the user when there is one
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 14:56:03 +01:00
Joas Schilling a26eb5fc73
Add a short explanation about the store
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 14:31:36 +01:00
Joas Schilling 7cd1be6fdf
Load the conversation for guests manually and update the actorStore accordingly
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 13:26:45 +01:00
Joas Schilling 693939d092
Set the current user in the actorStore and use that one everywhere
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 12:45:45 +01:00
Joas Schilling a649f269da
Use the same template for both cases
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 12:34:14 +01:00
Joas Schilling 20c3e90712
Add a store for the current actor
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-13 12:33:54 +01:00
Joas Schilling 16cc88967a
Merge pull request #2455 from nextcloud/bugfix/noissue/remove-unused-buttons
Remove unused buttons
2019-11-13 10:53:18 +01:00
Nextcloud bot 415807392b
[tx-robot] updated from transifex 2019-11-13 02:49:56 +00:00
Joas Schilling f50bea975f
Add changelog for v7.0.2
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 13:47:33 +01:00
Marco Ambrosini 428747146d Remove unused buttons
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-12 10:37:03 +01:00
marco 8746d479da
Merge pull request #2449 from nextcloud/bugfix/noid/date-separator-between-messages
Add a date separator between messages
2019-11-12 09:02:57 +01:00
Nextcloud bot edf91f39fa
[tx-robot] updated from transifex 2019-11-12 02:51:44 +00:00
marco 6a22b4b1c5
Merge pull request #2438 from nextcloud/bugfix/798/add-an-asterix-for-unread-messages-to-the-header
Add * to the header for unread messages
2019-11-11 15:50:54 +01:00
Joas Schilling 8cfc1afde3
Add * to the header for unread messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-11 15:04:41 +01:00
Joas Schilling 96a16df589
Add a date separator between messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-11 13:43:38 +01:00
marco 968872cca6
Merge pull request #2428 from nextcloud/feature/vuejs/conversation-settings
Conversation settings
2019-11-11 12:17:13 +01:00
marco 54e2ebf44e
Merge pull request #2439 from nextcloud/bugfix/noid/only-blue-counter-on-mentions
Only make the counter blue on mentions
2019-11-11 12:17:02 +01:00