Commit Graph

740 Commits

Author SHA1 Message Date
Eric Decanini
9c8f29e853 Merge branch 'develop' into bugfix/eric/voting-ended-poll 2022-03-17 12:07:45 +01:00
Aris Kotsomitopoulos
d1a77d2eca
Merge pull request #5378 from vector-im/feature/aris/threads_analytics
Feature/aris/threads analytics
2022-03-16 15:51:24 +01:00
ClaireG
d1bca78083
[Notification mode] Wrong mode is displayed when the mention only is selected on the web client 2022-03-16 14:51:10 +01:00
ariskotsomitopoulos
eee1ec1423 Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:19:08 +01:00
ariskotsomitopoulos
60db2e424e Merge branch 'develop' into feature/aris/threads_analytics 2022-03-16 13:01:09 +01:00
Adam Brown
17d363cf9a
Merge pull request #5389 from vector-im/feature/adm/personalisation-complete
FTUE - Personalisation complete
2022-03-15 17:33:29 +00:00
Maxime NATUREL
9ef235f3d7
Merge pull request #5479 from vector-im/feature/mna/PSF-735-pinned-location
#5417: Pinned location sharing
2022-03-15 17:40:21 +01:00
aringenbach
a7639f4424
Merge pull request #5544 from vector-im/aringenbach/5521_permalink_base_url_mention
Fix mentions using matrix.to rather than client defined permalink base url
2022-03-15 17:28:16 +01:00
Maxime Naturel
9864e51927 Adding changelog entry 2022-03-15 17:09:31 +01:00
Onuray Sahin
db0cfd4704
Merge pull request #5455 from vector-im/feature/ons/fix_poll_start_notifications
Show notification for poll start events but not for responses
2022-03-15 18:34:03 +03:00
Onuray Sahin
7fa43f0d1b Merge branch 'develop' into feature/ons/fix_poll_start_notifications
* develop: (163 commits)
  Fix lint error.
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  ...
2022-03-15 17:49:53 +03:00
ericdecanini
9806f1bf8f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
2022-03-15 15:48:17 +01:00
Aris Kotsomitopoulos
e0b93c2d2c
Merge pull request #5298 from vector-im/feature/aris/thread_live_thread_list
Live Threads
2022-03-15 15:14:26 +01:00
Arnaud Ringenbach
c80df6943b Add changelog 2022-03-15 14:32:08 +01:00
ariskotsomitopoulos
07eabf110d Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics
# Conflicts:
#	vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
2022-03-15 14:23:48 +01:00
ariskotsomitopoulos
8a862d006e Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-03-15 14:21:04 +01:00
Onuray Sahin
b4df6e1ae8 Merge branch 'develop' into feature/ons/poll_tests
* develop:
  Fix lint error.
  Fix lint error.
  Avoid stable prefix
  Support both unstable and stable prefixes.
2022-03-15 16:16:17 +03:00
Adam Brown
9c114f371e adding changelog entry 2022-03-15 13:07:22 +00:00
Onuray Sahin
1a76914828
Merge pull request #5345 from vector-im/feature/ons/fix_unstable_prefixes
Support both unstable and stable prefixes
2022-03-15 15:16:16 +03:00
Onuray Sahin
dd3178c36e Merge branch 'develop' into feature/ons/poll_tests
* develop: (150 commits)
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  extracting method for the handling of the profile picture selection
  ...
2022-03-15 14:39:51 +03:00
ClaireG
5de7873755
Merge pull request #5532 from vector-im/cgizard/ISSSUE-5514
Read receipt in wrong order
2022-03-14 17:39:30 +01:00
Adam Brown
82e1afdb72
Merge pull request #5375 from vector-im/feature/adm/display-personalisation-based-on-capabilities
FTUE - Capability based personalisation flow
2022-03-14 13:34:21 +00:00
Adam Brown
c06d3ff809 Updating changelog copy
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-03-14 11:54:42 +00:00
Adam Brown
7e79d7ed0e adding changelog entry 2022-03-14 11:54:42 +00:00
ariskotsomitopoulos
d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00
Maxime Naturel
134d7b2bf8 Adding changelog entry 2022-03-14 11:15:16 +01:00
Claire G
025dcc8d88 Fix bug: readReceipt in wrong order 2022-03-14 10:28:42 +01:00
ericdecanini
f24d8c2ada Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-13 20:13:03 +01:00
Onuray Sahin
635be17d46 Changelog added. 2022-03-11 19:23:41 +03:00
Benoit Marty
c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint
Changes room hierarchy endpoint to stable
2022-03-11 17:05:13 +01:00
ericdecanini
6db1c377c4 Reverts to fix by removing event timestamp condition 2022-03-10 19:16:22 +01:00
ariskotsomitopoulos
34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Benoit Marty
26617988f2 Add colors for shield vector drawable 2022-03-10 17:15:19 +01:00
Benoit Marty
66f76fbea3
Merge pull request #5450 from SpiritCroc/fix-5448
Fix missing messages when forward paging with chunks > 50 messages
2022-03-10 15:08:58 +01:00
Claire G
8f0d6a1adc use colorPrimary for tint 2022-03-10 14:30:15 +01:00
Benoit Marty
551b827753
Merge pull request #5384 from p1gp1g/bubble-space
Add padding before first own message
2022-03-10 14:09:23 +01:00
Benoit Marty
c339e10c07
Merge pull request #5436 from vector-im/feature/nfe/space_highlight
change selected space highlight
2022-03-10 13:28:08 +01:00
ariskotsomitopoulos
21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-03-10 12:55:13 +02:00
Adam Brown
ecb49b3b27 Merge branch 'main' into develop 2022-03-09 16:13:15 +00:00
Maxime NATUREL
f12afe0ef0
Merge pull request #5411 from vector-im/feature/mna/PSF-735-sharing-options-view
#5395: Location sharing options view
2022-03-09 16:10:46 +01:00
Onuray Sahin
9b7e329000 Fix lint error. 2022-03-09 13:31:29 +03:00
Benoit Marty
02ba09900f
Merge pull request #5434 from vector-im/feature/nfe/space_unread_count_dm
include dms number in space unread number badge
2022-03-09 11:16:07 +01:00
Benoit Marty
e0914781fc
Merge pull request #5435 from vector-im/feature/nfe/space_menu_amend_copy
Amend spaces menu to have consistent copy
2022-03-09 11:13:46 +01:00
Benoit Marty
20c1886fed Support both unstable and stable prefixes.
Author: Onuray
2022-03-09 10:40:43 +01:00
Maxime Naturel
1c6b31001f Adding changelog entry 2022-03-09 09:44:06 +01:00
sim
17d58f24d2 Add padding before our first message
Signed-off-by: sim <git@sgougeon.fr>
2022-03-08 17:26:23 +01:00
ericdecanini
510206aa8a Adds changelog file 2022-03-08 16:54:05 +01:00
Benoit Marty
b867e5f072 Iterate on badge / unread indicator color (#5332) 2022-03-08 14:52:10 +01:00
Onuray Sahin
83ff898ce5 Changelog added. 2022-03-08 14:14:45 +03:00
SpiritCroc
768262094c Fix missing messages when forward paging with chunks > 50 messages
- offsets() was not limiting in the right direction when loading
  messages forwards
- after fixing offsets(), more recent messages would not be loaded due
  to the isLastForward() check, so better prioritize the SUCCESS
  LoadMoreResult over the REACHED_END here
2022-03-08 10:54:27 +01:00