filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,300 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

14300 Commits

Author SHA1 Message Date
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
Onuray Sahin 1b348401bd Add poll test for a single vote. 2022-03-10 15:31:32 +03: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
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
Michael Kaye 70fbcec093 Update to latest setup-matrix-synapse 2022-03-10 11:31:44 +00:00
Onuray Sahin fd3e5128c7 Test initial poll event. 2022-03-10 14:30:03 +03: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 fbc3b15df4
Merge pull request #5492 from vector-im/gradlew-update-7.4.1 
Update Gradle Wrapper from 7.4 to 7.4.1
 2022-03-10 11:16:39 +01: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
Benoit Marty 0122d8f933 Make comment about ignoring UnusedResources more valuable 2022-03-10 10:23:18 +01:00
gradle-update-robot 89db6a065d Update Gradle Wrapper from 7.4 to 7.4.1. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2022-03-10 00:17:17 +00:00
Adam Brown d3fc3791bc Merge branch 'main' into develop 2022-03-09 21:33:16 +00:00
Adam Brown 9e8067dd19
Merge pull request #5484 from vector-im/feature/aris/fix_realm_crash_1_4_4 
Fix realm crash on v1.4.4
 2022-03-09 18:55:12 +00:00
Michael Kaye e9fe4630f1 Swap to using github action to configure server 2022-03-09 18:26:37 +00:00
ariskotsomitopoulos 92c1bc944d Fix realm crash on v1.4.4 2022-03-09 20:03:42 +02:00
ericdecanini 2f706d6fae Replaces children state event room id with space id 2022-03-09 18:42:35 +01:00
ericdecanini f76f73f8ad Refactors DefaultSpaceService querySpaceChildren 2022-03-09 18:36:56 +01:00
Adam Brown ecb49b3b27 Merge branch 'main' into develop 2022-03-09 16:13:15 +00:00
Adam Brown 60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
Adam Brown 8c36bdb0e9 Merge branch 'release/v1.4.4' 2022-03-09 15:59:56 +00:00
ericdecanini bbc6e8bbce Replaces caught Exception with HttpException 2022-03-09 16:41:18 +01: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
Adam Brown 1bf718f856 appending 1.4.4 changelog 2022-03-09 14:57:13 +00:00
Benoit Marty 3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Benoit Marty 7d78c8819c Ignore some other lint warnings 2022-03-09 14:40:59 +01:00
Adam Brown 57ffc56869
Merge pull request #5472 from vector-im/feature/aris/fix_5463_parcelising_reaction_crash 
Fix reactions summary crash
 2022-03-09 13:35:51 +00:00
Benoit Marty cbdc28dd9b
Merge pull request #5457 from vector-im/michaelk/ignore_flaky_test 
Ignore flaky VerificationTest
 2022-03-09 12:18:55 +01:00
ericdecanini 047e767f34 Adds coroutinesTest to matrix sdk gradle 2022-03-09 12:18:46 +01:00
ericdecanini e4ce4ab1ab Adds server side vote blocking for ended polls 2022-03-09 12:07:16 +01:00
ariskotsomitopoulos 84b3f63279 Format code 2022-03-09 12:55:25 +02:00