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

12726 Commits

This Branch
This Branch
All Branches
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
ae33911eef
Merge pull request #4926 from vector-im/feature/bma/release_signing_config 
Add signing config for the release. No secret added
 2022-01-12 14:54:13 +01:00
Benoit Marty
53531bb2f3 Dummy values for signing secrets 2022-01-12 14:21:14 +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
d330f8a9e9 Merge branch 'release/1.3.14' into develop 2022-01-12 12:54:54 +01:00
Benoit Marty
ed5e7d0cb6 fastlane 2022-01-12 12:50:02 +01:00
Benoit Marty
7eb7d51759 changelog 2022-01-12 12:48:13 +01:00
Benoit Marty
8038d40195 Prepare for hotfix release 1.3.14 2022-01-12 12:28:16 +01:00
Benoit Marty
1bde257a96
Merge pull request #4924 from vector-im/feature/bca/fix_broken_crypto 
Ensure algorithm instance is created and stored
 2022-01-12 12:26:17 +01:00
Benoit Marty
a35fec245d Add changelog 2022-01-12 12:13:11 +01:00
Valere
7839f18f58 prevent OrderedRealmCollection to throw when using first() 2022-01-12 11:37:02 +01:00
Valere
f4c891abe6 Ensure algorithm instance is created and stored 2022-01-12 10:36:56 +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
Benoit Marty
fef40cac96 Merge branch 'release/1.3.13' into develop 2022-01-11 17:40:09 +01:00
Benoit Marty
8db8f5ba5d Fastlane 2022-01-11 17:24:35 +01:00
Benoit Marty
12018aaee5 Changelog 2022-01-11 17:22:06 +01:00
ariskotsomitopoulos
4560d748d3 Display encrypted messages in thread summary and in thread list 2022-01-11 17:52:14 +02:00
Benoit Marty
67bdf4b226
Merge pull request #4726 from vector-im/feature/bca/proper_encryption_state 
Support misconfigured room encryption
 2022-01-11 16:47:36 +01:00
Aris Kotsomitopoulos
a954a412c7
Merge pull request #4909 from vector-im/revert-4900-dependabot/github_actions/actions/github-script-5.1.0 
Revert "Bump actions/github-script from 3 to 5.1.0"
 2022-01-11 17:46:46 +02:00
Aris Kotsomitopoulos
24a1afddd9
Revert "Bump actions/github-script from 3 to 5.1.0" 2022-01-11 16:31:24 +02:00
ariskotsomitopoulos
1e2fb88783 - fix lint error 2022-01-11 16:30:29 +02:00
Valere
60ae416b36 Split this PR db change in a separate migration 2022-01-11 15:14:45 +01:00
ariskotsomitopoulos
8adeab0ddd - fix lint error 2022-01-11 16:14:26 +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
1a92d75a54 Fix bad copyright 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
Benoit Marty
3251463410
Merge pull request #4905 from vector-im/feature/bma/strings_cleanup 
Remove unused strings
 2022-01-11 14:23:20 +01: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
ariskotsomitopoulos
37ec3fdf84 Refactor threads to support the new timeline implementation 2022-01-11 12:13:53 +02: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