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

4817 Коммитов

Автор SHA1 Сообщение Дата
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
Marco Ambrosini 9cce74c3ba Temporary fix for sidebar's alinment issues
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-11-11 12:12:15 +01:00
Joas Schilling bc6c1fb8f7
Merge pull request #2445 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.7.1
Bump @babel/preset-env from 7.6.3 to 7.7.1
2019-11-11 10:33:15 +01:00
Joas Schilling b63a96e429
Merge pull request #2447 from nextcloud/dependabot/npm_and_yarn/stylelint-scss-3.12.1
Bump stylelint-scss from 3.12.0 to 3.12.1
2019-11-11 10:28:16 +01:00
dependabot-preview[bot] 53b26abd1d
Bump stylelint-scss from 3.12.0 to 3.12.1
Bumps [stylelint-scss](https://github.com/kristerkari/stylelint-scss) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/kristerkari/stylelint-scss/releases)
- [Changelog](https://github.com/kristerkari/stylelint-scss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kristerkari/stylelint-scss/compare/3.12.0...3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 09:09:01 +00:00
dependabot-preview[bot] ec7417d340
Bump @babel/preset-env from 7.6.3 to 7.7.1
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.3 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 09:08:04 +00:00
Joas Schilling bfa08558d1
Merge pull request #2446 from nextcloud/dependabot/npm_and_yarn/vue-loader-15.7.2
Bump vue-loader from 15.7.1 to 15.7.2
2019-11-11 10:06:56 +01:00
Joas Schilling 86eb5815d4
Merge pull request #2442 from nextcloud/dependabot/npm_and_yarn/babel/core-7.7.2
Bump @babel/core from 7.6.4 to 7.7.2
2019-11-11 10:06:00 +01:00
dependabot-preview[bot] 7c6787b830
Bump vue-loader from 15.7.1 to 15.7.2
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.7.1 to 15.7.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.7.1...v15.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-10 07:09:11 +00:00
dependabot-preview[bot] acfd887712
Merge pull request #2443 from nextcloud/dependabot/npm_and_yarn/webpack-cli-3.3.10 2019-11-10 07:07:17 +00:00
dependabot-preview[bot] e11f4246cd
Bump @babel/core from 7.6.4 to 7.7.2
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.4 to 7.7.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.4...v7.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-10 07:07:16 +00:00
dependabot-preview[bot] f4b292a2a0
Merge pull request #2444 from nextcloud/dependabot/npm_and_yarn/babel/runtime-7.7.2 2019-11-10 07:05:24 +00:00
dependabot-preview[bot] 17bfe822cb
Bump @babel/runtime from 7.7.1 to 7.7.2
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.1 to 7.7.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.7.2/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-10 02:14:36 +00:00
dependabot-preview[bot] 8b126f6e5f
Bump webpack-cli from 3.3.9 to 3.3.10
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.9 to 3.3.10.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.10/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.9...v3.3.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-10 02:13:27 +00:00
marco c3e750f84f
Merge pull request #2440 from nextcloud/feature/1744/make-single-emojis-bigger
Make single emojis bigger
2019-11-09 08:50:43 +01:00