mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 05:31:21 +03:00
Code Issues Projects Releases Packages Wiki Activity
8120 commits 161 branches 158 tags 270 MiB
Commit graph

8120 commits

This branch
This branch
All branches
Author SHA1 Message Date
ganfra
2b93367165 Timeline: handle filtering in epoxy 2021-03-30 11:32:46 +02:00
ganfra
d6d4293ea8 Timeline : remove filtering from SDK 2021-03-29 16:50:12 +02:00
Benoit Marty
3e8370cdc7
Merge pull request #2998 from oogm/develop 
Update reactions to Unicode 13.1, improve backwards compatibility
 2021-03-29 14:11:45 +02:00
Benoit Marty
0e71dfa8e1
Merge pull request #3081 from Dominaezzz/suspend_functions_11 
Convert FileService to suspend functions
 2021-03-29 14:00:12 +02:00
Benoit Marty
c15e2e96b6
Merge pull request #3076 from Dominaezzz/suspend_functions_7 
Convert UserService to suspend functions
 2021-03-29 13:18:34 +02:00
Benoit Marty
9a512cbc32
Merge pull request #3072 from Dominaezzz/suspend_functions_3 
Convert VerificationService to suspend functions
 2021-03-29 12:25:03 +02:00
Dominic Fischer
b6f4be2894 Convert FileService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-03-28 13:52:16 +01:00
Dominic Fischer
b9b755e6e1 Convert UserService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-03-27 20:33:57 +00:00
Dominic Fischer
8f67511b22 Convert VerificationService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-03-27 19:20:16 +00:00
Benoit Marty
2045a164c1
Merge pull request #3049 from vector-im/feature/bma/various_fixew 
Be robust to Exception.
 2021-03-26 19:26:49 +01:00
oogm
86e23a5300
Merge branch 'develop' into develop 2021-03-26 17:25:57 +01:00
oogm
40929b9640 Update CHANGES.md for a release with 1.1.4 2021-03-26 17:21:33 +01:00
oogm
a40adb903a Update emoji import script to ease execution, output smaller .json files and capitalize emoji names 2021-03-26 17:21:02 +01:00
Benoit Marty
5c89179c47
Merge pull request #3064 from TR-SLimey/fix-path-traversal-file-save-api29 
When downloading a file in <= API 29, replace dangerous characters with underscores
 2021-03-26 15:34:03 +01:00
Benoit Marty
ebc2017fe0
Merge pull request #3062 from vector-im/feature/bma/enum 
Be more robust when parsing some enums
 2021-03-26 15:29:51 +01:00
oogm
7453509df4 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-26 14:09:21 +01:00
Benoit Marty
94220a24d1 cleanup 2021-03-26 13:58:34 +01:00
TR-SLimey
d75b7434cf
Replace dangerous characters in the filename with underscores 2021-03-26 12:45:22 +00:00
Benoit Marty
297fff1394 Cleanup some Enums 2021-03-26 13:41:10 +01:00
Benoit Marty
2e23fec82b Sadly fields cannot be private 2021-03-26 12:36:33 +01:00
Benoit Marty
ee265f71e6 Be more robust when parsing some enums - RoomJoinRules 2021-03-26 12:22:11 +01:00
Benoit Marty
5364d7fd03 Be more robust when parsing some enums - Guest Access 2021-03-26 12:18:36 +01:00
Benoit Marty
a7539d0f95 Be more robust when parsing some enums 2021-03-26 12:15:06 +01:00
Benoit Marty
0f22dc610d
Merge pull request #3043 from vector-im/dependabot/gradle/kotlin_version-1.4.32 
Bump kotlin_version from 1.4.31 to 1.4.32
 2021-03-25 13:57:50 +01:00
dependabot[bot]
081a904f8a
Bump kotlin_version from 1.4.31 to 1.4.32 
Bumps `kotlin_version` from 1.4.31 to 1.4.32.

Updates `kotlin-gradle-plugin` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib-jdk7` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 12:57:42 +00:00
Benoit Marty
11a56dacb6
Merge pull request #3054 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.2 
Bump fragment-ktx from 1.3.0 to 1.3.2
 2021-03-25 13:57:02 +01:00
Benoit Marty
68600c0538
Merge pull request #3053 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-rc01 
Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01
 2021-03-25 13:56:22 +01:00
Benoit Marty
0d10d388e1
Merge pull request #3056 from vector-im/feature/bma/displayVersion 
Add version details on the login screen, in debug or developer mode
 2021-03-25 13:55:37 +01:00
Benoit Marty
627e9a9543 Add version details on the login screen, in debug or developer mode 2021-03-25 11:18:26 +01:00
dependabot[bot]
ee1059f1db
Bump fragment-ktx from 1.3.0 to 1.3.2 
Bumps fragment-ktx from 1.3.0 to 1.3.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 06:33:50 +00:00
dependabot[bot]
30515492ca
Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01 
Bumps recyclerview from 1.2.0-beta02 to 1.2.0-rc01.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 06:31:57 +00:00
Benoit Marty
024dcf1f6c Be robust to Exception. 
And display details about it in the bottom sheet
 2021-03-23 21:11:32 +01:00
Benoit Marty
2b70a8450c
Merge pull request #3034 from vector-im/feature/bma/reply_image_preview 
Picture preview when replying.
 2021-03-22 20:49:40 +01:00
Benoit Marty
967b8f4afb
Merge branch 'develop' into feature/bma/reply_image_preview 2021-03-22 20:49:32 +01:00
Benoit Marty
1b2f529f7c
Merge pull request #2985 from vector-im/feature/ons/api_interceptor 
Api interceptor implementation to allow app developers to peek responses
 2021-03-22 20:48:51 +01:00
Benoit Marty
274aef8f24 Code qual 2021-03-22 19:15:06 +01:00
Benoit Marty
5136979352 Cleanup on unbinding 
Valere's review
 2021-03-22 18:33:06 +01:00
Benoit Marty
5cd86c685d Copyright 2021-03-22 18:29:06 +01:00
Benoit Marty
f106176752 Add missing synchronized 2021-03-22 18:26:29 +01:00
Benoit Marty
d85d44bf4b Add ApiInterceptor.removeListener() 2021-03-22 18:09:42 +01:00
Benoit Marty
f6e43a5305 Add Android test on ApiInterceptor 2021-03-22 17:13:16 +01:00
Benoit Marty
21cff9a749 Update after Ganfra's review, and kotlinification 2021-03-22 16:36:44 +01:00
Onuray Sahin
7db1d81eb6 Changelog added. 2021-03-22 16:19:51 +01:00
Onuray Sahin
9e7d4c901e Api interceptor implementation to allow app developers to peek responses. 2021-03-22 16:18:51 +01:00
Benoit Marty
a8fedfff53
Merge pull request #3021 from vector-im/feature/bma/filter_some_url_preview 
Disable URL preview for some domains (#2995)
 2021-03-22 15:41:22 +01:00
oogm
0fc102461c Update import_emojis.py to pull keywords from emojilib, update quick reactions 2021-03-19 22:24:43 +01:00
Benoit Marty
7b8ede03bc Picture preview when replying. Also add the image preview in the message detail bottomsheet (#2916) 2021-03-19 20:09:53 +01:00
Benoit Marty
fa37070884 Disable URL preview for some domains (#2995) 2021-03-19 17:23:19 +01:00
Benoit Marty
43fd9910e3
Merge pull request #3031 from vector-im/feature/bma/other_fixies 
Some fixies
 2021-03-19 17:06:54 +01:00
Benoit Marty
684c0332d5 Remove commented out code 2021-03-19 16:27:31 +01:00