mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-24 16:53:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
14846 commits 7 branches 125 tags 235 MiB
Commit graph

9357 commits

Author SHA1 Message Date
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
cfriedlander
3ef2f824e8 add presence indicator online 2022-03-11 11:10:11 +01: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
6a59007eb5 Reverts debug isPollActive 2022-03-10 21:26:08 +01:00
ericdecanini
df6ae4b848 Fixes warning for debugging 2022-03-10 18:26:49 +01:00
ariskotsomitopoulos
34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Benoit Marty
26617988f2 Add colors for shield vector drawable 2022-03-10 17:15:19 +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
080844dc9d Removes event timestamp condition for sdk poll voting 2022-03-10 16:28:22 +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
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
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
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
03f293f216 Remove io.element.thread and add stable m.thread prefix 2022-03-10 12:06:02 +02: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
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
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
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
ariskotsomitopoulos
c24944b1f2 Fix reactions summary crash 2022-03-09 12:52:34 +02:00
Onuray Sahin
9b7e329000 Fix lint error. 2022-03-09 13:31:29 +03:00
Benoit Marty
e0914781fc
Merge pull request #5435 from vector-im/feature/nfe/space_menu_amend_copy 
Amend spaces menu to have consistent copy
 2022-03-09 11:13:46 +01:00
Adam Brown
662e9592a0
fixing overlapping room image and title (#5469) 
- the room title was missing constraints for the different types of leading icons
 2022-03-09 10:11:53 +00:00
Benoit Marty
67a24b38cb Avoid stable prefix 2022-03-09 10:48:35 +01:00
Benoit Marty
20c1886fed Support both unstable and stable prefixes. 
Author: Onuray
 2022-03-09 10:40:43 +01:00
Maxime Naturel
2bdafde965 Fix wrong click listener on the current available option 2022-03-09 09:46:52 +01:00
Maxime Naturel
89db867ab3 Fix attributes style id conflicts 2022-03-09 09:46:52 +01:00
Maxime Naturel
6515e457b5 Ignore unused strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel
046d906f97 Moving view attributes into uikit dedicated file 2022-03-09 09:46:52 +01:00
Maxime Naturel
9adb87bdb4 Renaming picker view method 2022-03-09 09:46:52 +01:00
Maxime Naturel
442d722980 Fix comment form in enum 2022-03-09 09:46:52 +01:00
Maxime Naturel
3aa1032a7a Rollback wrong sharing options 2022-03-09 09:46:52 +01:00
Maxime Naturel
82515cf095 Remove usage of strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel
9b6811c915 View extension methods to tint current background 2022-03-09 09:46:52 +01:00
Maxime Naturel
7cad30e6bb Use user color for pin background 2022-03-09 09:46:52 +01:00
Maxime Naturel
8f362d83cd Set option to user current location 2022-03-09 09:46:52 +01:00
Maxime Naturel
edc77b0c17 Fixing code syntax 2022-03-09 09:46:51 +01:00
Maxime Naturel
e4c9acde77 Setting colorSurface for background 2022-03-09 09:46:51 +01:00
Maxime Naturel
d36409d475 Renaming package to option 2022-03-09 09:46:51 +01:00
Maxime Naturel
b11f7f20e1 Adding user avatar and color for current location option 2022-03-09 09:46:51 +01:00
Maxime Naturel
42fca9bd6f Fixing ripple effect 2022-03-09 09:46:51 +01:00
Maxime Naturel
8bcc594320 Changing color of the live location icon 2022-03-09 09:46:47 +01:00
Maxime Naturel
fb764028c9 Adding dividers 2022-03-09 09:45:15 +01:00