Benoit Marty
27e408fb0c
Fix bad merge conflict fix
2022-10-05 17:30:06 +02:00
Benoit Marty
cde088e315
Merge branch 'develop' into dependabot/gradle/epoxy-5.0.0
2022-10-05 17:29:17 +02:00
Benoit Marty
38ca3b6cdb
Version++
2022-10-05 17:20:05 +02:00
Benoit Marty
6e9bc7845d
Merge remote-tracking branch 'origin/develop' into develop
2022-10-05 17:18:39 +02:00
Benoit Marty
d4f7b7bea4
Merge branch 'release/1.5.2' into develop
2022-10-05 17:17:25 +02:00
Benoit Marty
b49585bde3
Fastlane
2022-10-05 17:17:08 +02:00
Benoit Marty
a6cb936ae6
Reorder changes
2022-10-05 17:08:19 +02:00
Benoit Marty
94fa3343b4
Run towncrier
2022-10-05 17:06:58 +02:00
Benoit Marty
c76945f9c6
Fix tests, there is a new item in the list
2022-10-05 16:46:15 +02:00
Benoit Marty
8934eabc99
Remove TODO, the string a11y_create_room
is actually used.
2022-10-05 16:33:05 +02:00
Benoit Marty
47457b39d0
Fix typo
2022-10-05 16:03:26 +02:00
Benoit Marty
3f27df81bd
Merge pull request #7298 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2022-10-05 15:57:19 +02:00
Florian Renaud
33c31fb2a0
Merge pull request #7268 from vector-im/dependabot/gradle/mavericks-3.0.1
...
Bump mavericks from 2.7.0 to 3.0.1
2022-10-05 15:55:04 +02:00
Weblate
5d8a8545f4
Merge branch 'origin/develop' into Weblate.
2022-10-05 13:54:54 +00:00
Florian Renaud
010f2c458c
Replace deprecated MvRxTestRule with MavericksTestRule
2022-10-05 14:48:59 +02:00
Valere
502b12a07e
Merge pull request #7290 from vector-im/feature/bca/hinder_verification
...
E2ee dos not hinder verification
2022-10-05 14:34:34 +02:00
Weblate
672ad3a5e5
Merge branch 'origin/develop' into Weblate.
2022-10-05 12:32:46 +00:00
Valere
ec7c8c8b31
Merge pull request #6726 from vector-im/feature/bca/block_unverified
...
Per room block unverified devices
2022-10-05 14:29:59 +02:00
Weblate
d13606bdcc
Merge branch 'origin/develop' into Weblate.
2022-10-05 12:28:06 +00:00
Nui Harime
111f77b017
Translated using Weblate (Russian)
...
Currently translated at 98.3% (2380 of 2419 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-10-05 12:27:54 +00:00
lvre
4de0f0a1e8
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (2419 of 2419 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2022-10-05 12:27:53 +00:00
Sveinn í Felli
c39e64dfc7
Translated using Weblate (Icelandic)
...
Currently translated at 84.5% (2046 of 2419 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-10-05 12:27:53 +00:00
Vri
d5f542095c
Translated using Weblate (German)
...
Currently translated at 100.0% (2419 of 2419 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-10-05 12:27:39 +00:00
dependabot[bot]
8c35a8cf6b
Bump mavericks from 2.7.0 to 3.0.1
...
Bumps `mavericks` from 2.7.0 to 3.0.1.
Updates `mavericks` from 2.7.0 to 3.0.1
- [Release notes](https://github.com/airbnb/mavericks/releases )
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md )
- [Commits](https://github.com/airbnb/mavericks/compare/2.7.0...v3.0.1 )
Updates `mavericks-testing` from 2.7.0 to 3.0.1
- [Release notes](https://github.com/airbnb/mavericks/releases )
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md )
- [Commits](https://github.com/airbnb/mavericks/compare/2.7.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: com.airbnb.android:mavericks-testing
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 12:23:36 +00:00
Amit Kumar
aad2eed396
Add initial Sentry setup for crashes and perf tracking ( #7141 )
...
* Add initial Sentry setup for crashes and perf tracking
* Fix failing analytics tests
* Reformat code to fix style issue
* Close sentry when user signs out
* Add initial unit tests for Sentry
* Remove unused import
* Exclude amitkma from signoff requirements for PRs
2022-10-05 16:49:14 +05:30
Benoit Marty
70976c355a
Merge pull request #7291 from vector-im/tech/fix-room-member-list-controller-test
...
Try to fix flaky RoomMemberListControllerTest
2022-10-05 11:04:00 +02:00
Benoit Marty
a036cc6d75
Merge pull request #7287 from vector-im/feature/bma/en-us
...
Use American English by default.
2022-10-05 11:02:58 +02:00
Benoit Marty
2cd78282d9
Fix typo
...
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2022-10-05 11:02:33 +02:00
Valere
fddeddacc7
fix outdated doc
2022-10-05 10:42:29 +02:00
Valere
37458d41f2
E2ee dos not hinder verification
2022-10-05 10:42:29 +02:00
Valere
b567fc5be6
remove commented code
2022-10-05 10:27:12 +02:00
Valere
68d4ac34c7
Move setting to room profile
2022-10-05 10:27:12 +02:00
Valere
8de2fe8917
Update library/ui-strings/src/main/res/values/strings.xml
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-05 10:27:12 +02:00
Valere
8c7e7a8f35
open global settings from room settings
2022-10-05 10:27:12 +02:00
Valere
f7d8356327
post rebase fix & cleaning
2022-10-05 10:27:12 +02:00
Valere
92a72cb1e9
cleaning
2022-10-05 10:27:12 +02:00
Valere
e9b33f6234
Per room block unverified devices
2022-10-05 10:27:12 +02:00
Jorge Martín
ed545c7e2b
Try to fix flaky RoomMemberListControllerTest
2022-10-05 08:50:12 +02:00
Jorge Martín
0b7e52e60b
Fix EventHtmlRendererTest
2022-10-05 07:46:05 +02:00
Benoit Marty
4974fdf905
Merge pull request #6633 from Benjiko99/feature/incognito-keyboard
...
Add privacy setting to disable personalized learning by the keyboard
2022-10-04 18:22:22 +02:00
SpiritCroc
af9548dfdd
Support inline images in the timeline ( #5877 )
...
* Support inline images in the timeline
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-04 17:59:52 +02:00
Benoit Marty
2cb16d9f11
Merge pull request #6215 from networkException/fix-animated-only-fetching-thumbnail
...
Fix animated images only autoplaying sometimes
2022-10-04 17:44:25 +02:00
Benoit Marty
ca6813b5d8
Merge pull request #6906 from bwi-de/develop
...
Clean up pin code key and biometrics key on logout
2022-10-04 16:19:03 +02:00
Benoit Marty
304fb09f57
Merge pull request #6757 from eidonia/bugfix/#5029-disbale-emoji-keyboard-not-applies-reply
...
[Bugfix #5029 ] disable emoji keyboard not applies to reply
2022-10-04 16:16:36 +02:00
Benoit Marty
8311138bf1
Merge pull request #6762 from rudmannn/develop
...
replace android:gravity for backward compatibility
2022-10-04 16:14:41 +02:00
Benoit Marty
00248404c0
Merge pull request #7188 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.2.1
...
Bump dependency-check-gradle from 7.2.0 to 7.2.1
2022-10-04 16:11:52 +02:00
Benoit Marty
5a7483eb38
Merge pull request #7203 from vector-im/dependabot/gradle/dagger-2.44
...
Bump dagger from 2.42 to 2.44
2022-10-04 16:09:12 +02:00
Benoit Marty
984995dcb9
Merge pull request #7265 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.7.20
...
Bump kotlin-gradle-plugin from 1.7.10 to 1.7.20
2022-10-04 16:06:58 +02:00
Benoit Marty
17cd2a3302
Merge pull request #7266 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.7.20
...
Bump kotlin-reflect from 1.7.10 to 1.7.20
2022-10-04 16:06:25 +02:00
Benoit Marty
90643510f2
Merge pull request #7269 from vector-im/dependabot/gradle/glide-4.14.1
...
Bump glide from 4.13.2 to 4.14.1
2022-10-04 15:53:26 +02:00