mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-22 17:20:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
8531 commits 160 branches 159 tags 271 MiB
Commit graph

8531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
ef648ce7ec
Merge pull request #3152 from vector-im/gradlew-update-7.0 
Update Gradle Wrapper from 6.8.3 to 7.0
 2021-04-12 10:46:33 +02:00
Benoit Marty
5ca71a10ec Changelog 2021-04-12 10:46:03 +02:00
Benoit Marty
d2c74f6fcd
Merge pull request #3104 from Dominaezzz/suspend_functions_1 
Convert RoomService to suspend functions
 2021-04-11 21:13:15 +02:00
Benoit Marty
984342a6dd Upgrade com.likethesalad.android:string-reference to 1.2.2 
Compatible with gradle7, see https://github.com/LikeTheSalad/android-string-reference/issues/11
 2021-04-11 21:07:08 +02:00
Dominic Fischer
35667db29c
Lint 2021-04-11 11:35:28 +01:00
Dominic Fischer
759528f19a Missed another spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-04-11 10:54:17 +01:00
Dominic Fischer
7ee87a0d4b Merge branch 'develop' into suspend_functions_1 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2021-04-10 16:50:30 +01:00
Dominic Fischer
66db67e857 Missed a spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-04-10 16:43:16 +01:00
Benoit Marty
a9ef58912f http -> https 
Fix the followinf error, since gradle 7: `Using insecure protocols with repositories, without explicit opt-in, is unsupported. Switch Maven repository 'maven2(http://dl.bintray.com/piasy/maven)' to redirect to a secure protocol (like HTTPS) or allow insecure protocols. See https://docs.gradle.org/7.0/dsl/org.gradle.api.artifacts.repositories.UrlArtifactRepository.html#org.gradle.api.artifacts.repositories.UrlArtifactRepository:allowInsecureProtocol for more details.`
 2021-04-10 08:45:27 +02:00
gradle-update-robot
e404589544 Update Gradle Wrapper from 6.8.3 to 7.0. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2021-04-10 01:06:51 +00:00
Benoit Marty
a1209c83bb New store descriptions 2021-04-09 19:58:29 +02:00
Benoit Marty
38b49916e2 Small cleanup 2021-04-09 17:05:09 +02:00
Benoit Marty
37226a1641 Small cleanup 2021-04-09 16:58:41 +02:00
Benoit Marty
6d46bfc260
Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0 
Bump firebase-messaging from 21.0.1 to 21.1.0
 2021-04-09 16:39:05 +02:00
Benoit Marty
d40f2ef463
Merge pull request #3139 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0 
Bump recyclerview from 1.2.0-rc01 to 1.2.0
 2021-04-09 16:38:53 +02:00
Benoit Marty
8d1b56d526
Merge pull request #3138 from vector-im/dependabot/gradle/androidx.media-media-1.3.0 
Bump media from 1.2.1 to 1.3.0
 2021-04-09 16:38:39 +02:00
Benoit Marty
388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34 
Bump daggerVersion from 2.33 to 2.34
 2021-04-09 16:38:25 +02:00
Benoit Marty
bec6cfc46d Version++ 2021-04-09 12:42:59 +02:00
Benoit Marty
0a326015ef Merge branch 'release/1.1.4' 2021-04-09 12:41:04 +02:00
Benoit Marty
08477cf581 Merge branch 'release/1.1.4' into develop 2021-04-09 12:41:02 +02:00
Benoit Marty
5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +02:00
Benoit Marty
93bc5abcb5 Update the Emoji source file 2021-04-09 10:32:11 +02:00
Benoit Marty
5311bacfff ktlint 2021-04-09 10:26:28 +02:00
Benoit Marty
da7c2e38f6
Merge pull request #3140 from vector-im/feature/bca/verification_as_per_web 
Fix EW-EA compatibility for verification
 2021-04-09 10:24:01 +02:00
Benoit Marty
0d9990b2e3
Merge pull request #3147 from oogm/develop 
Update import_emojis.py to retain keyword order
 2021-04-09 10:00:47 +02:00
dependabot[bot]
b5b651244b
Bump firebase-messaging from 21.0.1 to 21.1.0 
Bumps firebase-messaging from 21.0.1 to 21.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-09 07:25:53 +00:00
Benoit Marty
2d6fca9214
Merge pull request #3143 from vector-im/feature/bma/discovery_filtering 
Filter some other words when navigating into the room directory
 2021-04-09 08:52:32 +02:00
oogm
327e75e8e5 Update CHANGES.md 2021-04-08 22:26:31 +02:00
oogm
a4a3777722 Update import_emojis.py to retain keyword order 2021-04-08 22:14:41 +02:00
Benoit Marty
f1e280827d Ensure there is no dup and cleanup 2021-04-08 19:39:49 +02:00
Benoit Marty
7e605eb4d4
Merge pull request #3145 from vector-im/bma/merge_avail 
Small cleanup for #3084
 2021-04-08 19:36:35 +02:00
Matthew Hodgson
1233fde261
Update forbidden_terms.txt 2021-04-08 18:26:55 +01:00
Benoit Marty
ee3eb8e1d6 Cleanup 2021-04-08 18:52:53 +02:00
Benoit Marty
2a1e52745f Some cleanup after merge of #3084 2021-04-08 18:50:28 +02:00
Aleks
9d96f90e49 keyword-spacing fix + wildcard-imports fix 2021-04-08 18:50:28 +02:00
Aleks
4451b682b1 merge + register/available endpoint corrections 2021-04-08 18:50:28 +02:00
Aleks
9ce9d1e549 CHANGES.md updated 2021-04-08 18:50:28 +02:00
Aleks
2e9f8ae6ae registration availability endpoint added 2021-04-08 18:50:05 +02:00
Benoit Marty
65b4b2915f
Merge pull request #3142 from vector-im/feature/bma/global_retry 
Generic hanlding of rate limit eror by the SDK
 2021-04-08 18:23:52 +02:00
Benoit Marty
153d393bf1 Prevent searching for forbidden terms 2021-04-08 17:28:47 +02:00
Benoit Marty
1715143b85 Filter some other words 
Cannot filter canonical alias anymore, as we now use word boundaries
 2021-04-08 16:54:41 +02:00
Benoit Marty
7b1d313e8e Small cleanup 2021-04-08 12:46:55 +02:00
Benoit Marty
c6bd378104 Test is passing 2021-04-08 12:44:28 +02:00
Valere
760e14531f Fix EW-EA compatibility for verification 2021-04-08 12:09:35 +02:00
Benoit Marty
8dead986a5 Always try to retry Http requests in case of 429 (#1300) 2021-04-08 10:59:51 +02:00
Benoit Marty
9b5bc60fa9 Remove unused parameter and use same value than the JS SDK 2021-04-08 09:54:51 +02:00
dependabot[bot]
68efa63de4
Bump recyclerview from 1.2.0-rc01 to 1.2.0 
Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:33 +00:00
dependabot[bot]
3ca00969c5
Bump media from 1.2.1 to 1.3.0 
Bumps media from 1.2.1 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:02 +00:00
dependabot[bot]
505b01ad97
Bump daggerVersion from 2.33 to 2.34 
Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:19:20 +00:00
Benoit Marty
3b6234a9a2
Merge pull request #3133 from vector-im/feature/bma/wl_fixes 
Weblate fixes
 2021-04-07 19:11:16 +02:00