Commit graph

25631 commits

Author SHA1 Message Date
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
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
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
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
Benoit Marty
0e94a499c9
Merge pull request #8810 from yostyle/yostyle/fix_file_permission
fix: update local file access permission
2024-05-16 14:31:41 +02:00
Benoit Marty
2362fcde16
TODO must not be followed by : 2024-05-16 14:02:15 +02:00
roundabout-host.com
d92d66993e Translated using Weblate (Romanian)
Currently translated at 60.0% (108 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ro/
2024-05-11 12:10:35 +00:00
Valere
d100b62e54 Fix posthog tests 2024-05-06 10:31:45 +02:00
Valere
69bb98f29d Add change log 2024-05-06 09:32:34 +02:00
Valere
443db6ce8e Bump posthog version to 3.2.0 2024-05-06 09:28:53 +02:00
Hugh Nimmo-Smith
a8a9c61a69 Add note about MSC3886, MSC3903 and MSC3906 being closed 2024-05-03 13:16:31 +01:00
roundabout-host.com
e7efa7d0e3 Translated using Weblate (Romanian)
Currently translated at 57.7% (104 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ro/
2024-05-03 06:04:08 +00:00
Benoit Marty
305372cafc
Merge pull request #6225 from element-hq/feature/adm/android-12-deeplinks
Fixing Android 12 url deeplinks
2024-05-02 16:58:10 +02:00
Programutox
64d6759ecb Translated using Weblate (French)
Currently translated at 62.2% (112 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/fr/
2024-04-29 21:47:44 +00:00
yostyle
33d09ecf40 fix: update local file access permission 2024-04-18 16:29:02 +02:00
Valere
a1823b0f62
Merge pull request #8801 from element-hq/feature/bca/stop_double_reporting_utds
Analyics: stop double reporting posthog utds
2024-04-05 11:06:55 +02:00
Valere
0a284bbeea Analyics: stop double reporting posthog utds 2024-04-04 13:09:10 +02:00
Benoit Marty
5ccc486b7c
Merge pull request #8795 from element-hq/sync-emojis
Sync Emojis
2024-04-02 22:19:17 +02:00
Benoit Marty
9b4394bbe6
Merge pull request #8798 from element-hq/feature/bma/reportUserStateEvent
When reporting a user, use the membership state eventId for the eventId.
2024-04-02 22:18:54 +02:00
Benoit Marty
6cd9e6eedd When reporting a user, use the membership state eventId for the eventId. 2024-04-02 20:47:45 +02:00
SpiritCroc
92dd902d20 Automatic SchildiChat string correction
Change-Id: I945ab601be90c2e2e0fb06e26ec232e3bc25600f
2024-04-02 19:52:09 +02:00
SpiritCroc
34d7a438cd Automatic upstream merge postprocessing
Change-Id: I53dd1b1e20ad37d74ea8d7fc3d76cc278c97e713
2024-04-02 19:52:07 +02:00
SpiritCroc
38b0b246e2 Merge tag 'v1.6.14' into sc
tag

Change-Id: I87dca48559687c9210fec8bebb031305d8d5578c
2024-04-02 19:51:29 +02:00
SpiritCroc
9980d42083 [TMP] Automatic upstream merge preparation
Change-Id: Id9c6582fd9d0b14c07d796d092706c9499e2045a
2024-04-02 19:51:22 +02:00
SpiritCroc
a17c14f5a7 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Ib022dff1434381cab5f047dc9e935d3f5a4d70c7
2024-04-02 19:51:22 +02:00
Benoit Marty
c2b46a1c1e version++ 2024-04-02 18:16:38 +02:00
Benoit Marty
479cb1a8f4 Merge tag 'v1.6.14' into develop
tag
2024-04-02 18:15:46 +02:00
Benoit Marty
310cecf5cb Merge branch 'release/1.6.14' into main 2024-04-02 18:15:34 +02:00
Benoit Marty
f7095d8f6b Adding fastlane file for version 1.6.14 2024-04-02 18:15:27 +02:00
Benoit Marty
ea9751ea8f Changelog for version 1.6.14 2024-04-02 18:15:02 +02:00
Benoit Marty
9aaf29d4cf
Merge pull request #8797 from element-hq/feature/bma/reportUser
Report user
2024-04-02 18:08:44 +02:00
Benoit Marty
5ce0801006 towncrier. 2024-04-02 15:56:28 +02:00
Benoit Marty
b14cb81ece Add action to report a user form the user profile view. EventId is not relevant, but requested by the API. 2024-04-02 15:44:25 +02:00
Benoit Marty
99ec61e120 Add action to report a user form the message detail bottom sheet. #8796 2024-04-02 15:11:27 +02:00
Valere
0f3ff2ed45
Merge pull request #8780 from element-hq/valere/utd_posthog_more_properties
UTD posthog reporting add more properties to captured event
2024-04-02 15:03:14 +02:00
Valere
752c884eaa Analytics | if no property use null instead of empty map 2024-04-02 11:44:05 +02:00
Valere
2bbb49bdd3 Fix: should remember already reported events 2024-04-02 09:33:10 +02:00
Jorge Martin Espinosa
237580c7f4
Merge pull request #8792 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.35.0
Bump io.element.android:wysiwyg from 2.34.0 to 2.35.0
2024-04-01 10:05:44 +02:00