Commit 55cc7362 authored 3 years ago by Benoit Marty

Merge branch 'release/1.3.18' into develop

parents 787bb776 2dac1ce0

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/SpaceOrderTest.kt 1 addition, 1 deletion

...st/java/org/matrix/android/sdk/ordering/SpaceOrderTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt 1 addition, 1 deletion

...t/java/org/matrix/android/sdk/ordering/StringOrderTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt 7 additions, 2 deletions

...dk/session/room/timeline/TimelineForwardPaginationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt 5 additions, 3 deletions

.../session/room/timeline/TimelinePreviousLastForwardTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt 4 additions, 3 deletions

...session/room/timeline/TimelineSimpleBackPaginationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt 8 additions, 0 deletions

.../sdk/session/room/timeline/TimelineWithManyMembersTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt 2 additions, 3 deletions

...g/matrix/android/sdk/session/search/SearchMessagesTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt 7 additions, 2 deletions

...org/matrix/android/sdk/session/space/SpaceCreationTest.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt 15 additions, 7 deletions

...rg/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt 8 additions, 3 deletions

...ain/java/org/matrix/android/sdk/api/failure/Extensions.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt 7 additions, 1 deletion

...g/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt 2 additions, 1 deletion

...c/main/java/org/matrix/android/sdk/api/session/Session.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt 5 additions, 2 deletions

...android/sdk/api/session/room/members/MembershipService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationAsset.kt 25 additions, 0 deletions

...droid/sdk/api/session/room/model/message/LocationAsset.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationAssetType.kt 26 additions, 0 deletions

...d/sdk/api/session/room/model/message/LocationAssetType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt 5 additions, 17 deletions

...ndroid/sdk/api/session/room/model/message/LocationInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt 24 additions, 6 deletions

.../api/session/room/model/message/MessageLocationContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/PollCreationInfo.kt 1 addition, 1 deletion

...id/sdk/api/session/room/model/message/PollCreationInfo.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/PollType.kt 35 additions, 0 deletions

...ix/android/sdk/api/session/room/model/message/PollType.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt 13 additions, 0 deletions

...id/sdk/api/session/room/model/relation/RelationService.kt

with 201 additions and 53 deletions

Please register or to comment