SpiritCroc
|
47a01fbd80
|
Automatic upstream merge postprocessing
Change-Id: Ic8782cf421a932bd980a6a6ed3551d71fc17abec
|
2024-06-29 10:50:09 +02:00 |
|
SpiritCroc
|
21eec091f8
|
Merge tag 'v1.6.18' into sc
Change-Id: Ifc8466ddf92154fb9be05b372f234ffe26da47ba
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
|
2024-06-29 10:28:16 +02:00 |
|
SpiritCroc
|
93ddba8786
|
[TMP] Automatic upstream merge preparation
Change-Id: I905f36ccc1dda1fe266f24fe9384057c2c9c83d5
|
2024-06-29 10:25:17 +02:00 |
|
SpiritCroc
|
4010ba024d
|
Automatic revert to unchanged upstream strings, pt.1
Change-Id: Ic35aec65a8272b0d549b4c9a27a39d1855a42c34
|
2024-06-29 10:25:16 +02:00 |
|
Benoit Marty
|
026318304f
|
Merge branch 'release/1.6.18' into main
|
2024-06-25 15:13:30 +02:00 |
|
Benoit Marty
|
3f67bbf4e0
|
Adding fastlane file for version 1.6.18
|
2024-06-25 15:13:20 +02:00 |
|
Benoit Marty
|
4a261a88c5
|
Changelog for version 1.6.18
|
2024-06-25 15:12:55 +02:00 |
|
Benoit Marty
|
712b846f9f
|
Use BuildTools 35.0.0
|
2024-06-25 15:06:21 +02:00 |
|
Benoit Marty
|
b5758c5335
|
Merge pull request #8850 from element-hq/fix/jme/8894-ea-intercepts-mas-urls
Replace `*.element.io` deep link with actual hosts
|
2024-06-25 14:17:18 +02:00 |
|
Jorge Martín
|
0292749cc0
|
Add changelog
|
2024-06-25 11:56:15 +02:00 |
|
Jorge Martín
|
a1dd3ba1b5
|
Replace *.element.io deep link with actual hosts
This is done to avoid incorrectly intercepting links in other apps, as Element X Android.
|
2024-06-25 11:48:16 +02:00 |
|
Jorge Martin Espinosa
|
4d27c848e2
|
Merge pull request #8847 from element-hq/fix/jme/send-mentions-using-user-id-as-text
When sending user mentions, always send the user id as the fallback text
|
2024-06-21 12:33:35 +02:00 |
|
waclaw66
|
fd3ba16f43
|
Translated using Weblate (Czech)
Currently translated at 100.0% (180 of 180 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
|
2024-06-20 07:10:34 +00:00 |
|
Jorge Martín
|
f8345ab9ef
|
When sending user mentions, always send the user id as the fallback text
|
2024-06-19 16:56:47 +02:00 |
|
Valere
|
097d3923aa
|
Merge pull request #8842 from element-hq/feature/bca/send_to_dehydrated_devices
Fix | Share room keys with dehydrated devices
|
2024-06-12 14:59:30 +02:00 |
|
Valere
|
ad9f9fb193
|
Accept and pass any deviceKey payload to rust
|
2024-06-12 09:32:27 +02:00 |
|
Valere
|
90aafbc6bd
|
Add changelog
|
2024-06-12 09:32:27 +02:00 |
|
Valere
|
4aaf22832f
|
Fix | Share room keys with dehydrated devices
|
2024-06-12 09:32:27 +02:00 |
|
Valere
|
b116ce3ee1
|
Merge pull request #8844 from element-hq/feature/valere/fix_sonar_ci
Fix sonarqube CI error UnsupportedClassVersionError
|
2024-06-06 17:27:03 +02:00 |
|
Benoit Marty
|
cafb43bbd3
|
Merge pull request #8835 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.37.3
Bump io.element.android:wysiwyg from 2.35.0 to 2.37.3
|
2024-06-06 14:48:46 +02:00 |
|
Valere
|
b5dbb91c9c
|
Fix sonarqube UnsupportedClassVersionError
revert sonarqube version
try java sdk 17
put back sonarqube plugin version
|
2024-06-06 13:23:34 +02:00 |
|
ganfra
|
15a252b525
|
Merge pull request #8841 from element-hq/feature/fga/fix_redacted_collapse
Fix redacted events not grouped correctly
|
2024-06-03 11:53:44 +02:00 |
|
SpiritCroc
|
4cf3ff606e
|
Increment version
Change-Id: Ic498505da7a12b71dc084eed0127dcdd4d2240b3
|
2024-06-01 15:50:54 +02:00 |
|
ganfra
|
2158aa0913
|
Fix redacted events not grouped correctly when hidden events are inserted between #8840
|
2024-05-31 16:13:27 +02:00 |
|
Valere
|
47bb23a654
|
Merge pull request #8839 from element-hq/feature/bca/add_platformcode_to_posthog
Support reporting super properties to posthog (appPlatform)
|
2024-05-31 14:05:56 +02:00 |
|
SpiritCroc
|
0ead0a4750
|
Automatic SchildiChat string correction
Change-Id: I59be77dae0409b9d995b77cb5c7cba0462f3ab2c
|
2024-05-30 20:51:05 +02:00 |
|
SpiritCroc
|
0d7792572c
|
Automatic upstream merge postprocessing
Change-Id: I7596421cce0493c4eb54380733a01bc7c1f7e118
|
2024-05-30 20:51:03 +02:00 |
|
SpiritCroc
|
abdc558c07
|
Merge tag 'v1.6.16' into sc
Change-Id: I690d21f0bac84dfed5d6f87e9c1aa30c78c8d346
Conflicts:
dependencies_groups.gradle
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
|
2024-05-30 20:16:19 +02:00 |
|
SpiritCroc
|
a5834e7a42
|
[TMP] Automatic upstream merge preparation
Change-Id: I94191e03417544792638408abe98f7582ece72a1
|
2024-05-30 20:14:08 +02:00 |
|
SpiritCroc
|
72580ac08d
|
Automatic revert to unchanged upstream strings, pt.1
Change-Id: I394c8c4bbbdbb7e46dc7748f0fcf0d7616624c9f
|
2024-05-30 20:14:07 +02:00 |
|
Benoit Marty
|
7e41d731f6
|
Move getCryptoVersion from CryptoService to Matrix companion, it does not need a session to get the value.
This simplify a lot accessing this data.
|
2024-05-30 13:10:36 +02:00 |
|
Valere
|
28fa4ab784
|
improve tests
|
2024-05-29 17:49:02 +02:00 |
|
Valere
|
a363e392b4
|
Update to analytics events 0.23.0 and refactor
|
2024-05-29 17:39:16 +02:00 |
|
Valere
|
09c68f3421
|
Remove unused context in crypto service getCryptoVersion
|
2024-05-29 17:38:36 +02:00 |
|
ganfra
|
72575a2493
|
version++
|
2024-05-29 12:07:55 +02:00 |
|
ganfra
|
a227245a62
|
Merge branch 'main' into develop
|
2024-05-29 12:07:27 +02:00 |
|
ganfra
|
e3a878155b
|
Merge branch 'release/1.6.16' into main
|
2024-05-29 12:03:47 +02:00 |
|
ganfra
|
10d89f27fe
|
Adding fastlane file for version 1.6.16
|
2024-05-29 12:03:40 +02:00 |
|
ganfra
|
018f494337
|
Changelog for version 1.6.16
|
2024-05-29 12:02:59 +02:00 |
|
ganfra
|
22f69ec6b0
|
Merge pull request #8743 from element-hq/feature/bma/editorIssue
Fix Rich Text Editor issues: save formatted text in draft and keep formatting when switching between modes
|
2024-05-28 10:52:51 +02:00 |
|
Benoit Marty
|
204244bac4
|
Merge pull request #8838 from element-hq/feature/bca/bump_crypto_sdk_0.4.1
Bump rust sdk crypto to 0.4.1
|
2024-05-28 10:10:08 +02:00 |
|
Valere
|
ccd6eed45a
|
Add changelog
|
2024-05-28 09:27:43 +02:00 |
|
Valere
|
08c124e13b
|
Add super properties to posthog (plateformCode)
|
2024-05-28 09:25:24 +02:00 |
|
Benoit Marty
|
2395d72c93
|
Fix regression on send button visibility.
|
2024-05-27 10:35:02 +02:00 |
|
Valere
|
0bf3350436
|
Add change log
|
2024-05-27 10:30:21 +02:00 |
|
Valere
|
5ac70dac2b
|
Bump rust sdk crypto to 0.4.1
|
2024-05-27 09:48:30 +02:00 |
|
dependabot[bot]
|
056eebadc8
|
---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2024-05-21 23:24:28 +00:00 |
|
Benoit Marty
|
4acbe4e582
|
Merge pull request #8820 from element-hq/feature/bca/bump_posthog_version_3
Bump posthog version to 3.2.0
|
2024-05-16 14:41:15 +02:00 |
|
Benoit Marty
|
f9a84512ad
|
Merge pull request #8790 from element-hq/feature/bma/externalAnalyticsPlan
Add dependency on `com.github.matrix-org:matrix-analytics-events`
|
2024-05-16 14:39:03 +02:00 |
|
Benoit Marty
|
085bf8230e
|
Merge pull request #8817 from element-hq/hughns/qr-mscs-closed
Add note about MSC3886, MSC3903 and MSC3906 being closed
|
2024-05-16 14:32:38 +02:00 |
|