ericdecanini
86765c9020
Adds new line at the end of PollState
2022-03-13 20:22:03 +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
ericdecanini
610c67c208
Refactors buildPollItem in MessageItemFactory
2022-03-13 20:09:14 +01:00
Michael Kaye
acfeb7ff65
Merge pull request #5523 from vector-im/michaelk/concurrency_issue
...
Use different tags for unit tests and android test compilation.
2022-03-11 17:47:24 +00:00
Michael Kaye
9a532fc47f
Use different tags for unit tests and android test compilation.
...
Otherwise we will cancel one in favour of the other.
2022-03-11 16:47:40 +00:00
Onuray Sahin
635be17d46
Changelog added.
2022-03-11 19:23:41 +03: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
chagai95
f68d3f2b03
Merge branch 'vector-im:develop' into add-presence-indicator-online
2022-03-11 17:13:20 +01:00
chagai95
04aaed7210
Change log line
2022-03-11 17:12:58 +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
Onuray Sahin
7c6167ace9
Add poll test for ended polls.
2022-03-11 18:59:27 +03:00
Benoit Marty
c3ac054634
Merge pull request #5518 from vector-im/bmarty-patch-1
...
Add space between icon and name
2022-03-11 16:47:59 +01:00
Benoit Marty
97f30ef7c1
Merge pull request #5520 from vector-im/feature/bma/fix_test_warnings
...
Fix all warnings in file E2eeSanityTests.kt
2022-03-11 16:47:25 +01:00
Benoit Marty
fa104adefc
Fix all warnings in file E2eeSanityTests.kt
2022-03-11 15:35:21 +01:00
Benoit Marty
02ea1c0e7c
Add space between icon and name
...
Also remove extra space for the text_template
2022-03-11 14:39:38 +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
cfriedlander
3ef2f824e8
add presence indicator online
2022-03-11 11:10:11 +01:00
Benoit Marty
25cfc7e05f
Merge pull request #5506 from vector-im/michaelk/build_tests_on_pr
...
Compile tests on PR, to ensure we don't break the build when merging. Alert if we merge and the build fails.
2022-03-11 10:15:04 +01:00
Benoit Marty
d0a24afa5a
Merge pull request #5510 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.45
...
Bump libphonenumber from 8.12.44 to 8.12.45
2022-03-11 09:47:26 +01:00
Michael Kaye
9a112bb010
Remove confetti from build failed message.
...
(there will be red icons if the build has failed in the body anyway)
2022-03-11 08:45:27 +00:00
Michael Kaye
400a47c39b
Only run one gradlew build for all tests, do not split by project
2022-03-11 08:45:04 +00: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
6a59007eb5
Reverts debug isPollActive
2022-03-10 21:26:08 +01:00
Benoit Marty
eb7eb1aac8
Merge pull request #5505 from vector-im/feature/bma/must_be_tinted
...
Add colors for shield vector drawable
2022-03-10 20:39:29 +01:00
ericdecanini
6db1c377c4
Reverts to fix by removing event timestamp condition
2022-03-10 19:16:22 +01:00
ericdecanini
fe3c9cc09f
Reverts to fix by removing event timestamp condition
2022-03-10 19:15:12 +01:00
ericdecanini
df6ae4b848
Fixes warning for debugging
2022-03-10 18:26:49 +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
Michael Kaye
c57d22a72c
Additionally notify the matrix channel if these tests fail when run
...
after merge to develop or main.
2022-03-10 16:41:00 +00:00
Benoit Marty
26617988f2
Add colors for shield vector drawable
2022-03-10 17:15:19 +01:00
Benoit Marty
becdd1ce29
Fix test compilation after method renaming
...
Also rename in the comment
2022-03-10 17:01:45 +01:00
Michael Kaye
23f7f72e38
Compile tests on PR, to ensure we don't break the build when merging.
...
This was accidentally committed to develop and reverted there.
2022-03-10 15:58:00 +00:00
Michael Kaye
ed7c65d8d8
Revert "Compile tests on PR, to ensure we don't break the build when merging."
...
This reverts commit 9e5ff1785a
2022-03-10 15:57:05 +00: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
Michael Kaye
9e5ff1785a
Compile tests on PR, to ensure we don't break the build when merging.
2022-03-10 15:50:02 +00: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
Benoit Marty
dfc440b904
Merge pull request #5502 from vector-im/cgizard/ISSSUE-5501
...
Use ColorPrimary for attachmentGalleryButton tint
2022-03-10 15:02:08 +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
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
Michael Kaye
621df9d1b1
Merge pull request #5498 from vector-im/michaelk/setup-matrix-synapse
...
Swap to using github action to configure synapse server in CI builds
2022-03-10 12:50:50 +00:00
Onuray Sahin
f029759f9a
Add poll test for changing previous answer.
2022-03-10 15:47:40 +03:00
