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

950 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 6645107f1c
Merge pull request #2862 from nextcloud/bugfix/2861/fix-flow-notifications
Fix flow notifications
2020-01-30 09:01:56 +01:00
Joas Schilling 6d162dc025
Fix flow notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-29 09:37:22 +01:00
Joas Schilling 670ef340d2
Mark own messages immediatelly read
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-28 16:59:48 +01:00
Joas Schilling b2b8695330
Prevent ParticipantNotFound exception when the guest has no name set
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-23 15:26:21 +01:00
Joas Schilling 76709508b8
Fix adding members from circles
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-23 09:08:38 +01:00
Joas Schilling 8f49fae760
Check if circles is enabled
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-22 18:27:28 +01:00
Joas Schilling 62cd89cd8f
Merge pull request #2804 from nextcloud/bugfix/2785/add-most-important-features-to-changelog
Add most important features to changelog conversation
2020-01-21 14:45:31 +01:00
Joas Schilling 58757c7cab
Add most important features to changelog conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-20 16:46:32 +01:00
Joas Schilling d547cc6d0e
Fix redirect on "Talk to …" links
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-17 12:36:40 +01:00
Daniel Calviño Sánchez aae3c5be24 Add dummy Talk sidebar to public share page
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-01-16 18:33:38 +01:00
Joas Schilling 891792721b
Re-setup the filesystem in case a share message failed
This happens when your request is already waiting for new chat messages.
The filesystem is already set up, so the share will not be discovered
unless the mount points are initialised freshly

Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-01-16 00:35:53 +01:00
Daniel Calviño Sánchez 833d96a8f5 Add dummy Talk sidebar to public share auth page
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-01-14 19:06:24 +01:00
Daniel Calviño Sánchez 397bbd5500 Generalize names to encompass both the chat tab and the call view
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-01-09 21:45:22 +01:00
Daniel Kesselberg caaf375912 Use IProviderManager to register resource provider
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-12-20 15:16:36 +01:00
Joas Schilling f565bdb3e3
Only check local invited or regular users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:52:52 +01:00
Joas Schilling f0293227a9
Allow to add circles to existing conversations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:52:52 +01:00
Joas Schilling 6f19e9ddfd
Allow to start conversations with circles
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:52:52 +01:00
Daniel Calviño Sánchez ca03cff331 Unify new LoadSidebarListener with previous TemplateLoader
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-18 11:50:23 +01:00
Daniel Calviño Sánchez 9d78cfbaa7 Replace private OC_Util with OCP/Util
This makes the app compliant again.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-18 05:35:54 +01:00
Joas Schilling 32049dc1c3
Merge pull request #2487 from nextcloud/enh/2414/flow-operator
add post to conversation flow operator
2019-12-16 15:24:27 +01:00
Arthur Schiwon 2a87d67b7b
adjust to server changes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-16 13:08:06 +01:00
Joas Schilling 5e372c16b8
Fix signaling user
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-13 21:05:31 +01:00
Arthur Schiwon 28a3e31364
take a URL into consideration, if the entity provides one
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:04:51 +01:00
Arthur Schiwon 6258d21c7a
show a nice message, if the entity offers one
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:04:51 +01:00
Arthur Schiwon c49f7969bf
fix user mentions on uids without whitespace
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:04:51 +01:00
Arthur Schiwon f36f59f870
use acting user from Operation config
because the logged in user might not be the one who set up the flow, e.g.
a share recipient

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:04:50 +01:00
Arthur Schiwon 8e042b537e
catch Talk exceptions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:04:50 +01:00
Arthur Schiwon 34537dfcc4
prepare mention of the message
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:04:50 +01:00
Arthur Schiwon c6baf40fa1
add flow operation, frontend part
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:04:50 +01:00
Arthur Schiwon 8e81d703a2
add flow operation, backend part
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-12-13 16:02:34 +01:00
Marco Ambrosini e1ff175908 Add talk sidebar tab for files
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
2019-12-13 09:17:58 +01:00
Joas Schilling 5b72a671bc
Merge pull request #2502 from nextcloud/bugfix/noid/typed-events
Typed events
2019-12-06 11:52:16 +01:00
Joas Schilling 8426281399
Fix language in notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-05 20:11:31 +01:00
Joas Schilling 21114875c5
Correctly return parents for lookIntoFuture=1
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:37:26 +01:00
Joas Schilling eed4a254b8
Add a dedicated method to the model
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:37:26 +01:00
Joas Schilling 3496c7faaa
Add a flag to messages if they can be replied to
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:37:26 +01:00
Joas Schilling 5ae1107dfd
Group same listeners
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:36:59 +01:00
Joas Schilling 81db771748
Add constants for event names and use pattern
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:36:59 +01:00
Joas Schilling 0e1d2b39b9
Typed events for Talk
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:36:59 +01:00
Joas Schilling 59978d8e8b
Fix sharing integration tests and loading shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:35:41 +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 7d455d8de5
Update share provider with the missing method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-04 11:14:05 +01:00
Joas Schilling fa4cd9989d
Immediately add a new conversation to the list
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-23 15:45:24 +02:00
Daniel Calviño Sánchez 645c721581 Do not load Talk sidebar in public share page of folder shares
The Talk sidebar is only shown for file shares, so there is no need to
load it for folder shares. Moreover, this also prevents some of the
hacks used to show the Talk sidebar to mess with the layout used for
folders.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-22 13:15:17 +02:00
Joas Schilling 5ab5ff47b8
Add a setting to disable files and public sharing integration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-21 15:12:19 +02:00
Joas Schilling 1c950c6a93
Use DI for the middleware
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-17 10:09:37 +02:00
Joas Schilling ad1b6ffefa
Remove dead method (the code was merged into addParticipantToRoom already)
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-10 11:19:23 +02:00
Joas Schilling 1a3a6e85d0
Move GuestController to EnviromentAware
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-10 11:19:22 +02:00
Joas Schilling 8aa2aa2efe
Remove unwanted, undocumented and unused methods from Commands controller
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-10 11:19:22 +02:00
Joas Schilling 672409118a
Update the Webinar(y) controller to the latest
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-10 11:19:22 +02:00