Eric Decanini
9c8f29e853
Merge branch 'develop' into bugfix/eric/voting-ended-poll
2022-03-17 12:07:45 +01:00
ariskotsomitopoulos
eee1ec1423
Merge branch 'develop' into feature/aris/threads_analytics
2022-03-16 13:19:08 +01: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
f495150b4e
Fixing asset type representation
2022-03-15 17:09:31 +01:00
Maxime Naturel
04405c7970
Distinguish user location and pinned location sharing
2022-03-15 17:09:30 +01:00
Arnaud Ringenbach
15e3f258f3
Fix wildcard imports
2022-03-15 16:55:24 +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
Arnaud Ringenbach
56760ecddc
Create SpanTemplateType and factorize template creation
2022-03-15 16:33:59 +01:00
Onuray Sahin
a47b589e72
Code review fixes.
2022-03-15 17:51:02 +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
Arnaud Ringenbach
a68471afe3
Fix documentation on PermalinkService
2022-03-15 14:54:24 +01:00
Arnaud Ringenbach
c7aab7a3f6
Remove useless imports on TextPillsUtils
2022-03-15 14:52:13 +01:00
Arnaud Ringenbach
55fbed1a81
Remove useless PermalinkFactory import
2022-03-15 14:49:55 +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
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
f4bdaf6151
Fix lint error.
2022-03-15 14:47:19 +03:00
Arnaud Ringenbach
df794ee41f
Move template creation to PermalinkService
2022-03-15 11:26:47 +01:00
Arnaud Ringenbach
4cf820cb12
Use client permalink base url on mentions if available
2022-03-15 10:34:04 +01:00
ariskotsomitopoulos
d7c486c55e
Add fallback support rendering proposed in MSC3676
2022-03-14 16:04:08 +01:00
ariskotsomitopoulos
d894d8598c
Format text
2022-03-14 12:44:25 +01:00
ariskotsomitopoulos
d215f03798
Merge branch 'develop' into feature/aris/thread_live_thread_list
2022-03-14 12:02:04 +01:00
ariskotsomitopoulos
c2ec7cfa0f
Add more clear documentation
2022-03-14 11:54:29 +01:00
Maxime Naturel
291d7d7627
Fix some doc comment
2022-03-14 11:15:19 +01:00
Maxime Naturel
3d27d9d2d2
Fix filtering use case
2022-03-14 11:15:18 +01:00
Maxime Naturel
b72c357dd1
Removing unused imports
2022-03-14 11:15:18 +01:00
Maxime Naturel
0aaa650ac3
Using flow to show items counter
2022-03-14 11:15:17 +01:00
Maxime Naturel
c7dae341c0
(DRAFT) Room counter flow
2022-03-14 11:15:17 +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
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
7226864cc9
Improves code formatting in ResolveSpaceInfoTask
2022-03-10 21:41:17 +01:00
ericdecanini
fe3c9cc09f
Reverts to fix by removing event timestamp condition
2022-03-10 19:15:12 +01:00
ariskotsomitopoulos
34cfdfb6fe
Merge branch 'develop' into feature/aris/thread_live_thread_list
2022-03-10 18:48:41 +02:00
Benoit Marty
becdd1ce29
Fix test compilation after method renaming
...
Also rename in the comment
2022-03-10 17:01:45 +01:00
ariskotsomitopoulos
a758ad71e6
Add is_falling_back support for rich thread replies
...
Enhance thread awareness handler so normal replies with thread disabled will be visible in te appropriate thread
Fix conflicts
2022-03-10 17:51:02 +02:00
ericdecanini
628a160c3a
Reverts timestamp condition but changes timing of setting closedTime
2022-03-10 16:32:42 +01:00
ericdecanini
080844dc9d
Removes event timestamp condition for sdk poll voting
2022-03-10 16:28:22 +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
ericdecanini
a5af4783cc
Renames mapToSpaceChildInfoList to mapSpaceChildren in DefaultSpaceService
2022-03-10 14:41:44 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
...
Remove unused resources
2022-03-10 13:03:27 +01:00
ericdecanini
a891f59397
Replaces lateinit var with passing params
2022-03-10 12:02:25 +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
ariskotsomitopoulos
fd30d38603
Fix line length
2022-03-10 12:51:40 +02:00
Benoit Marty
ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi
...
Refactoring for safer olm and megolm session usage
2022-03-10 11:13:07 +01:00
ariskotsomitopoulos
45ee9f85e5
Check if the server supports MSC3440 using the stable flag from /versions api
2022-03-10 12:07:05 +02:00
ariskotsomitopoulos
03f293f216
Remove io.element.thread and add stable m.thread prefix
2022-03-10 12:06:02 +02:00
Adam Brown
d3fc3791bc
Merge branch 'main' into develop
2022-03-09 21:33:16 +00:00
ariskotsomitopoulos
92c1bc944d
Fix realm crash on v1.4.4
2022-03-09 20:03:42 +02:00
