22f30a4410
[TMP] Automatic upstream merge preparation
...
Change-Id: I237b769b60f222f9abd425dda3445c49b1c1d3a9
2023-06-27 15:19:36 +02:00
97d3c2ce77
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: Ia1954e45223b8a4666903c1ca38f4d250d90be6b
2023-06-27 15:19:36 +02:00
de9d938012
Translated using Weblate (Czech)
...
Currently translated at 100.0% (177 of 177 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
2023-06-22 10:34:02 +00:00
7e318f7d61
FEATURES.md: MSC4027-compatible
...
Change-Id: I9186f5fb3c095cd09b3602d334e302f16d67212f
2023-06-12 17:23:23 +02:00
4659b90589
Merge remote-tracking branch 'origin/sc' into sc
...
Change-Id: I4ad3c5c76734a96e5a90c2044016fc419d7bbd43
2023-06-12 17:22:17 +02:00
34826d76ab
Translated using Weblate (Vietnamese)
...
Currently translated at 62.7% (111 of 177 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/vi/
2023-06-09 01:11:39 +00:00
1f23496048
Automatic SchildiChat string correction
...
Change-Id: I16bbc152a7872b98b5de41ce76fbecb67396a237
2023-06-05 15:03:33 +02:00
ca2cfbfd5c
Automatic upstream merge postprocessing
...
Change-Id: I49255442b53125bd6e94187df24225efa4d2c866
2023-06-05 15:03:31 +02:00
f440628208
Merge tag 'v1.6.2' into sc
...
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
2023-06-05 14:59:06 +02:00
b9752b2adf
[TMP] Automatic upstream merge preparation
...
Change-Id: Ided3e8213f46a4ab12baff083394edda3c12f998
2023-06-05 14:43:30 +02:00
0d399b23f7
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: Iff97921f1bcc03e387c4ef7c875f863ae6a51ad6
2023-06-05 14:43:29 +02:00
f37afeee03
Merge remote-tracking branch 'origin/sc' into sc
...
Change-Id: If92caa52267fa199004fd9fd51d73b2fc2725c6f
2023-06-05 14:43:02 +02:00
9f797e49e9
Merge branch 'release/1.6.2' into main
2023-06-02 18:02:45 +02:00
632f316f8e
Adding fastlane file for version 1.6.2
2023-06-02 18:02:01 +02:00
1e4f47bc52
Changelog for version 1.6.2
2023-06-02 18:01:49 +02:00
56ea316a22
Merge pull request #8488 from vector-im/feature/bca/bump_crypto_sdk_0.3.8
...
bump crypto sdk to 0.3.9
2023-06-02 15:32:45 +02:00
91f507e6c4
revert sonarqube gradle plugin version
2023-06-02 14:27:57 +02:00
7f8a19f194
Bump org.checkerframework:checker from 3.34.0 to 3.35.0 ( #8497 )
2023-06-02 09:59:16 +00:00
ada8539898
Fix remove deprecated isReady() call
2023-06-02 11:28:53 +02:00
688ae7d259
update change log
2023-06-02 11:28:53 +02:00
be8f226948
bump to 0.3.9
2023-06-02 11:28:53 +02:00
99b6c887d2
Add change log
2023-06-02 11:28:53 +02:00
1eda087233
bump crypto sdk to 0.3.8
2023-06-02 11:28:53 +02:00
61d4e468cb
Support for stable MSC3882 ( #8299 )
2023-06-01 18:15:01 +02:00
2f1a7b76ad
Merge pull request #8485 from vector-im/feature/bca/fix_anrs
...
Make cryptoDevice calls suspendable
2023-06-01 16:36:29 +02:00
f741c4e7d9
Merge pull request #8463 from vector-im/dla/feature/always_allow_signout
...
Always allow users sign out
2023-06-01 14:55:39 +02:00
cb0fb63fe6
Bump org.sonarsource.scanner.gradle:sonarqube-gradle-plugin ( #8490 )
2023-06-01 11:21:27 +00:00
7253f77204
Translated using Weblate (Vietnamese)
...
Currently translated at 57.0% (101 of 177 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/vi/
2023-05-31 14:02:40 +00:00
7e6376bf90
remove log
2023-05-31 15:14:28 +02:00
8c1938987b
Code review
2023-05-31 12:18:27 +02:00
dc969f502a
ktlint
2023-05-31 10:55:56 +02:00
2d335c1307
fix unit test
2023-05-31 10:42:46 +02:00
b59068b463
missing suspend
2023-05-31 09:52:43 +02:00
268cbb83cd
Make cryptoDevice calls suspendable
2023-05-30 23:47:50 +02:00
7e1659b1f9
Bump androidx.activity:activity-ktx from 1.7.1 to 1.7.2 ( #8465 )
2023-05-30 12:40:02 +00:00
83795344ed
Merge pull request #8470 from vector-im/feature/bca/extract_common_crypto
...
Extract common crypto interface for all flavors
2023-05-30 09:09:30 +02:00
b37eca4520
fix rust crypto still need CryptoMetadataEntity for global pref
2023-05-26 18:22:47 +02:00
24b18847b5
Fix animated webp playback ( #8120 )
...
* fix: add webp as playable image type
* fix: make glide transformations optional to prevent rendering webp throwing exception
* fix: stop marking webp as playable by default
* fix: play animated Webp in attachment view
* feat: autoplay webp if autoplay is enabled
---------
Signed-off-by: Alex Maras <dev@alexmaras.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
2023-05-26 17:03:24 +02:00
ac916078bc
fix test compilation
2023-05-26 16:04:25 +02:00
a2ef95584f
Add changelog
2023-05-26 10:17:48 +02:00
3bf5c0cc1b
Extract common crypto interface for all flavors
2023-05-26 09:50:15 +02:00
bae30bf0c0
Translated using Weblate (Italian)
...
Currently translated at 26.5% (47 of 177 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/it/
2023-05-25 17:01:52 +00:00
e8b50941ba
Automatic SchildiChat string correction
...
Change-Id: I3923e7be57b7ee80c4aaa117cfd22545ec937327
2023-05-25 12:04:03 +02:00
74f800ed23
Automatic upstream merge postprocessing
...
Change-Id: I8601f26a2925acb03824224ef56a4f58a64fad9d
2023-05-25 12:04:02 +02:00
9614f5994d
Merge tag 'v1.6.1' into sc
...
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
2023-05-25 12:03:56 +02:00
4cdc4f1341
[TMP] Automatic upstream merge preparation
...
Change-Id: Id97218e185f871ca5936f8773ce5f5b34d432e50
2023-05-25 11:51:31 +02:00
2af92abb38
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: Iee117c31686e6bc899ee6568e8aa3e6a5445e60d
2023-05-25 11:51:31 +02:00
349fbe0f23
pre_merge.sh: ignore failure during git tag
...
Do not fail if tag already exists
Change-Id: I8c54fe85879e8bd1866ee96951aca406a03862ed
2023-05-25 11:50:25 +02:00
8f69e411d7
version++
2023-05-25 11:22:07 +02:00
e961a8ccb5
Merge tag 'v1.6.1' into develop
...
tag
2023-05-25 11:20:39 +02:00
SpiritCroc
waclaw66
Someone
Valere
Valere
dependabot[bot]
Hugh Nimmo-Smith
Benoit Marty
Alex Maras
Nekothegamer
Benoit Marty