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
094ebe6764
Fix ktlint on TestPermalinkService
2022-03-15 14:57:59 +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
Arnaud Ringenbach
ea4addf446
Fix TestPermalinkService header
2022-03-15 14:45:04 +01:00
Arnaud Ringenbach
5b04686827
Fix MarkdownParser unit tests
2022-03-15 14:27:17 +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
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
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
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
Onuray Sahin
a12f918dd5
Add poll test for users try to change their votes after poll is ended.
2022-03-11 19:19:20 +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
Onuray Sahin
7c6167ace9
Add poll test for ended polls.
2022-03-11 18:59:27 +03:00
Benoit Marty
fa104adefc
Fix all warnings in file E2eeSanityTests.kt
2022-03-11 15:35:21 +01:00
SpiritCroc
6ba02629ec
Fix ChunkEntity.isMoreRecentThan() if both chunks linked to last forward
...
Imagine scenario:
[this] -> [chunkToCheck] -> [lastForwardChunk]
Then, both `isLastForward` checks will not return, and also the `chunkToCheck.doesNextChunksVerifyCondition { it == this }` will return false.
Since both chunks are connected to the last forward chunk, `isMoreRecent()` will still return `true`, which is wrong in this case.
So do not only check if chunkToCheck has this as any of the next chunks, but also the other way round.
2022-03-11 11:27:05 +01:00
SpiritCroc
0564942b0c
isReadMarkerMoreRecent(): use helper to properly compare chunks
2022-03-11 11:21:59 +01:00
Onuray Sahin
8b08d3db25
Fix poll test for users vote different options.
2022-03-11 11:36:06 +03:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.44 to 8.12.45.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.44...v8.12.45 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-10 23:09:19 +00: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
f31b130b49
Fix unit tests
2022-03-10 19:11:14 +02: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
Onuray Sahin
cd29b1aa4b
Add poll test for users vote different options.
2022-03-10 17:40:16 +03: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
Onuray Sahin
a5441fdf22
Add poll test for someone else chose the same option.
2022-03-10 16:51:23 +03:00
ericdecanini
a5af4783cc
Renames mapToSpaceChildInfoList to mapSpaceChildren in DefaultSpaceService
2022-03-10 14:41:44 +01:00
Onuray Sahin
f029759f9a
Add poll test for changing previous answer.
2022-03-10 15:47:40 +03:00
Onuray Sahin
1b348401bd
Add poll test for a single vote.
2022-03-10 15:31:32 +03: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
Onuray Sahin
fd3e5128c7
Test initial poll event.
2022-03-10 14:30:03 +03:00