Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-29 15:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,902 Commits 531 Branches 158 Tags 486 MiB
388e35e828
Commit Graph

15902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivér Falvai
388e35e828 Remove even more deps 2022-05-18 14:19:11 +02:00
Olivér Falvai
aa64eb14b7 Merge remote-tracking branch 'fork/dependency-cleanup' into dependency-cleanup 
# Conflicts:
#	build.gradle
 2022-05-18 11:48:45 +02:00
Olivér Falvai
2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup 
# Conflicts:
#	build.gradle
#	dependencies.gradle
 2022-05-18 11:47:21 +02:00
Michael Kaye
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci 
Improve test handling in CI
 2022-05-18 09:51:17 +01:00
Benoit Marty
8f7789f269 Version++ 2022-05-17 21:28:11 +02:00
Benoit Marty
a1044763ec Merge branch 'release/1.4.16' into develop 2022-05-17 21:27:11 +02:00
Benoit Marty
1d70004165 Fastlane file 2022-05-17 21:26:54 +02:00
Benoit Marty
e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
Benoit Marty
86d808eb4f Rename folder for the PlayStore 2022-05-17 17:54:02 +02:00
Benoit Marty
b6c7a59afc
Merge pull request #6079 from vector-im/feature/bma/fix_strings 
Fix translation
 2022-05-17 17:41:29 +02:00
Benoit Marty
553f8aa37e Remove empty translations 2022-05-17 16:31:15 +02:00
Benoit Marty
ff46791df9 Let's keep this one even if not used. 2022-05-17 16:23:48 +02:00
Benoit Marty
b33d8fe5e1 Remove unused string location_share 2022-05-17 16:04:45 +02:00
Benoit Marty
23d86b55fe Remove unused string a11y_location_share_icon 2022-05-17 16:03:51 +02:00
Benoit Marty
d2ec615e2f Remove unused string settings_flair 2022-05-17 16:02:04 +02:00
Benoit Marty
c0c5d21d4f
Merge pull request #6075 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-17 15:59:37 +02:00
Benoit Marty
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
Weblate
52a1fcb397 Merge branch 'origin/develop' into Weblate. 2022-05-17 12:51:46 +00:00
Szimszon
bc567fd45c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-05-17 12:51:38 +00:00
Benoit Marty
5df0488cf2 Apply ouchadam's suggestion. It's only accessed by the main thread. 2022-05-17 14:44:43 +02:00
Benoit Marty
46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold 
Direction and track need to be set for hold/unhold
 2022-05-17 14:33:02 +02:00
Benoit Marty
32573881e4 Renames ids for clarity 2022-05-17 13:42:53 +02:00
Michael Kaye
868c33a8b4 Correct var -> val for @get:Rules 2022-05-17 12:12:49 +01:00
Aris Kotsomitopoulos
424fb5556d
Merge pull request #5959 from vector-im/feature/aris/threads_post_release_ui_improvements 
Feature/aris/threads post release improvements
 2022-05-17 13:24:19 +03:00
Benoit Marty
2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
ariskotsomitopoulos
324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
Benoit Marty
ea1607cf3f Improve preview of the layout in the IDE 2022-05-17 10:28:02 +02:00
Auri B. P
2f03526d37 Translated using Weblate (Catalan) 
Currently translated at 81.8% (1821 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-05-17 02:56:52 +00:00
John Doe
41edd88d03 Translated using Weblate (Spanish) 
Currently translated at 99.8% (2221 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-16 17:59:45 +00:00
Ihor Hordiichuk
baa5c1319d Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-05-16 17:59:44 +00:00
Michael Kaye
1f89cfbe44 Lint fixes 2022-05-16 16:55:36 +01:00
Michael Kaye
a19c1d6fbe Make test consistent wiht assert message. 2022-05-16 16:01:21 +01:00
Michael Kaye
096cf9272a Rather than ignore them, put tests on a retry loop. 
I'm reliably getting passing tests locally with just these ignores.
 2022-05-16 16:01:15 +01:00
Michael Kaye
8950aa38ea Address repeated initializatin of WorkManagerImpl in #5887 2022-05-16 16:01:09 +01:00
Michael Kaye
4ced6ca179 Fix linting error. 2022-05-16 15:59:41 +01:00
Michael Kaye
fa26e2a23e Revert "@Ignore all tests currently failing in CI" 
This reverts commit 8d234b4b65a7a899abdeed9c5167a8c09c9af3e0.
 2022-05-16 15:59:41 +01:00
Michael Kaye
70682b4931 Increase timeout. Log timeout. 2022-05-16 15:59:41 +01:00
Michael Kaye
78140af3f3 Crypto tests are failing due to slow initialSync. Increase timeout by 60s. 2022-05-16 15:59:41 +01:00
Michael Kaye
010be9184c Fix threading UI test failure by adding a sleep 30s. 2022-05-16 15:59:41 +01:00
Michael Kaye
012b20fca6 changelog.d 2022-05-16 15:59:41 +01:00
Michael Kaye
e06682dcda @Ignore all tests currently failing in CI 2022-05-16 15:59:41 +01:00
Benoit Marty
3674ae7e63
Merge pull request #6064 from vector-im/feature/bma/detekt_end_period 
Detekt: fix end period
 2022-05-16 14:24:55 +02:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
Benoit Marty
955f366690
Merge pull request #5887 from vector-im/feature/bma/Matrix 
Improve Matrix class
 2022-05-16 13:08:15 +02:00
Benoit Marty
dcbc85484c Remove ambiguity 2022-05-16 13:05:26 +02:00
ariskotsomitopoulos
72a945ac13 PR remarks 2022-05-16 13:32:30 +03:00
Benoit Marty
0ed647d379 Add missing end period. 2022-05-16 12:25:10 +02:00
Benoit Marty
5387c9101e Changelog 2022-05-16 12:23:10 +02:00
Benoit Marty
ebb9538372 Fix warning and typo 2022-05-16 12:23:10 +02:00
Benoit Marty
fce1552349 Fix link 2022-05-16 12:23:10 +02:00