Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-25 15:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,402 Commits 530 Branches 158 Tags 486 MiB
f086f0e083
Commit Graph

8402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoit Marty
f086f0e083 Reduce usage of rxSingle when it's easy to do it - case 2 2021-04-20 17:13:48 +02:00
Benoit Marty
5862c8cb60 Reduce usage of rxSingle when it's easy to do it 2021-04-20 17:08:17 +02:00
Benoit Marty
187d6136fd
Merge pull request #3206 from vector-im/feature/bma/cleanup_register 
RegistrationWizard.createAccount() parameters are now all optional
 2021-04-20 16:09:14 +02:00
Benoit Marty
f8be814079 RegistrationWizard.createAccount() parameters are now all optional, following Matrix spec (#3205) 2021-04-20 12:32:03 +02:00
Benoit Marty
19427fbfec merge hotfix to develop 2021-04-16 14:36:15 +02:00
Benoit Marty
72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
Benoit Marty
9fc00fe6ff App crashes on "troubleshoot notifications" button (#3187) 2021-04-16 14:33:00 +02:00
Benoit Marty
c08868bc3c Protect call to suspend fun 2021-04-16 13:22:16 +02:00
Benoit Marty
18cef243a1 Merge branch 'hotfix/1.1.4_fixes' 2021-04-15 11:10:24 +02:00
Benoit Marty
9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty
ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
Benoit Marty
e4375522ff Fix crash when playing video (#3179) 2021-04-14 22:35:30 +02:00
Benoit Marty
59637c4a6b Revert to Realm 10.3.1 to fix issue with migration 
Waiting for https://github.com/realm/realm-java/issues/7402
 2021-04-14 21:54:07 +02:00
Benoit Marty
3034d1d831
Merge pull request #3176 from vector-im/feature/bma/login_fixes 
Small fixes on the current sign in sign up flow
 2021-04-14 20:13:12 +02:00
Benoit Marty
057295c155 Cleanup 2021-04-14 20:12:57 +02:00
Benoit Marty
e612a7e51d
Merge pull request #3170 from vector-im/feature/ons/fix_send_state_ui 
Fix send state image color on dark theme
 2021-04-14 13:59:58 +02:00
Benoit Marty
877e0ca5c6 compact code 2021-04-14 12:48:33 +02:00
Benoit Marty
89c2662e09 Fix social login button rendering on old OS 2021-04-14 12:44:48 +02:00
Benoit Marty
699b1429b7 Simplify LoginFlowResult model 2021-04-14 12:42:47 +02:00
Onuray Sahin
ce7e00a499 Fix send state image color on dark theme. 2021-04-13 11:48:12 +03:00
Benoit Marty
288aed3252
Merge pull request #3151 from vector-im/feature/bma/cleanup_resources 
Store description update
 2021-04-12 10:47:18 +02:00
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