Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-17 02:15:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,726 Commits 530 Branches 157 Tags 485 MiB
c049351130
Commit Graph

8000 Commits

Author SHA1 Message Date
ariskotsomitopoulos
c049351130 Fix kltint errors 2022-01-12 18:30:43 +02:00
ariskotsomitopoulos
9d48ecea2f Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	.github/workflows/integration.yml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
 2022-01-12 18:20:50 +02:00
Benoit Marty
f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement 
Trying to fix integration tests
 2022-01-12 17:11:16 +01:00
Benoit Marty
c194568b08
Merge pull request #4923 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.41 
Bump libphonenumber from 8.12.40 to 8.12.41
 2022-01-12 14:54:34 +01:00
Benoit Marty
ea6347b1c7 Add signing config for the release buildType. No secret added 
To be able to test the release build sooner during the release process.
 2022-01-12 14:07:51 +01:00
Benoit Marty
c1d89c5304 Version++ 2022-01-12 12:56:19 +01:00
Benoit Marty
8038d40195 Prepare for hotfix release 1.3.14 2022-01-12 12:28:16 +01:00
dependabot[bot]
1951130c43
Bump libphonenumber from 8.12.40 to 8.12.41 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.40 to 8.12.41.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.40...v8.12.41)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-11 23:07:26 +00:00
Benoit Marty
848a7f4062 Version++ 
Also add comment about the new versioning strategy
 2022-01-11 17:44:04 +01:00
ariskotsomitopoulos
4560d748d3 Display encrypted messages in thread summary and in thread list 2022-01-11 17:52:14 +02:00
Valere
6798492cc3 Quick fix warning nullable 2022-01-11 14:56:31 +01:00
Valere
aa7d284dd9 Post rebase fix 2022-01-11 14:56:31 +01:00
Valere
57b78a6223 code review 2022-01-11 14:56:31 +01:00
Valere
b10bc7000a Update room badge when e2e misconfigured 2022-01-11 14:56:31 +01:00
Valere
74dfddeeea missing resource 2022-01-11 14:56:31 +01:00
Valere
fca32da204 Code review 2022-01-11 14:56:31 +01:00
Valere
1fdb851845 open room profile for admin when clicked on notification area for e2e pb 2022-01-11 14:56:31 +01:00
Valere
38fbfad8d5 Code review 2022-01-11 14:56:31 +01:00
Valere
6b05e7a6bb Support misconfigured room encryption 2022-01-11 14:56:31 +01:00
ariskotsomitopoulos
753e3e7519 - fix ktlint format 
- Update Threads toolbar UI
 2022-01-11 15:31:21 +02:00
ariskotsomitopoulos
3bd21d04d8 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
 2022-01-11 14:09:49 +02:00
Benoit Marty
51c764c2f3 Remove unused strings 2022-01-11 12:41:37 +01:00
Benoit Marty
5b1de70742
Merge pull request #4902 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-01-11 12:26:23 +01:00
Benoit Marty
d2bad95044
Merge pull request #4904 from vector-im/feature/adm/ftue-copy-typo 
Typo in carousel title
 2022-01-11 12:15:59 +01:00
Adam Brown
d485e69062
Merge pull request #4740 from vector-im/feature/adm/automatic-splash-carousel-transitions 
Automatic carousel rotation
 2022-01-11 11:14:41 +00:00
Adam Brown
71eaac39aa fixing typo in carousel title 2022-01-11 11:06:29 +00:00
Weblate
7cbaf92690 Merge branch 'origin/develop' into Weblate. 2022-01-11 09:08:49 +00:00
Benoit Marty
6a1940cdd2
Merge pull request #4896 from vector-im/feature/bma/add_languages 
Add some missing languages in the change language screen
 2022-01-11 10:04:02 +01:00
Benoit Marty
f5291f4730 Add a comment about the workaround 2022-01-11 10:03:30 +01:00
Valere
bf447afa5a
Remove deprecated restricted lab option (#4889) 
Remove deprecated restricted lab option
 2022-01-11 09:01:37 +00:00
Benoit Marty
008034895b
Merge pull request #4893 from vector-im/feature/ons/fix_create_poll_recyclerview 
Workaround to not to reuse poll option cells
 2022-01-11 10:00:16 +01:00
Weblate
175b8cc78b Merge branch 'origin/develop' into Weblate. 2022-01-11 08:54:39 +00:00
Benoit Marty
75541e0296 Add some missing language in the change language screen 2022-01-10 18:22:30 +01:00
Onuray Sahin
5feafbdbf1 Workaround to not to reuse poll option cells. 2022-01-10 17:28:07 +03:00
Benoit Marty
f368ec15d8
Merge pull request #4892 from vector-im/feature/bma/analytics_opt_in 
Revert "Disable automatic opt-in screen display."
 2022-01-10 15:03:19 +01:00
Benoit Marty
d5968e442c Test: Fix test after change on OnBoarding screens 2022-01-10 14:31:29 +01:00
Benoit Marty
a552be040d Test: Analytics opt-in 2022-01-10 14:16:58 +01:00
Benoit Marty
67c2f9ac51 Cleanup 2022-01-10 14:16:03 +01:00
Benoit Marty
6f348813a2 Revert "Disable automatic opt-in screen display." 
This reverts commit 08def813cc.
 2022-01-10 13:45:02 +01:00
ariskotsomitopoulos
1b41a72e72 Fix Quote from within a thread 2022-01-10 14:14:11 +02:00
ariskotsomitopoulos
6503412928 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-10 13:26:57 +02:00
ariskotsomitopoulos
e541636802 Make TimelineSettings aware of rootThreadEventId and welcome a new Thread mode for the timeline creation 2022-01-10 11:20:31 +02:00
Valere
a047bcbabe restore deprecated lab preference 2022-01-10 09:46:11 +01:00
Valere
258d731102 Change autoUisi label + rename matching_issue 2022-01-10 09:41:51 +01:00
Valere
de08afdfad code review 2022-01-10 09:41:51 +01:00
Valere
aa89e721aa Fix enabling was broken 2022-01-10 09:41:51 +01:00
Valere
56dac76ca8 Simple rate limiting of RS sending 2022-01-10 09:41:51 +01:00
Valere
401e8e6712 use flow instead of reactivex 2022-01-10 09:41:51 +01:00
Valere
cf026b22b8 Fix UISIS preference listener 2022-01-10 09:41:51 +01:00
Valere
be119ea161 Support for lab auto rageshake UISI 2022-01-10 09:41:51 +01:00