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

9715 commits

Author SHA1 Message Date
Benoit Marty
2d98cbd915 Rename now to more explicit currentTimeMillis 2022-05-04 17:48:36 +02:00
Benoit Marty
09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
Benoit Marty
9c558f1f15
Merge pull request #5928 from vector-im/bugfix/adm/login-in-other 
Fixing sign in via Other needing registration to be enabled
 2022-05-04 14:09:40 +02:00
Adam Brown
f42e6c0a3c fixing sign in needing registration to be enabled 
- caused by the sign in flow using the registration homeserver validation, fixed by posting the sign in mode event directly
 2022-05-04 11:36:36 +01:00
Adam Brown
76a285e655
Merge pull request #5926 from vector-im/bugfix/adm/konfetti-crash 
Crash - Konfetti API 21/22 crash
 2022-05-04 11:16:31 +01:00
Benoit Marty
5076b2cdbd
Merge pull request #5858 from vector-im/feature/bma/room_api 
Room now exposes methods to get the various Services
 2022-05-04 11:55:04 +02:00
Adam Brown
9fd56f0b5c fixes konfetti crashing api 21/22 devices due to the View lifecycle being different 
-  https://github.com/DanielMartinus/Konfetti/issues/297
 2022-05-04 10:31:33 +01:00
Benoit Marty
b5a0c944d1
Merge pull request #5869 from vector-im/feature/mna/PSF-884-live-location-aggregation 
[Live location sharing] Improve aggregation process of events
 2022-05-04 11:11:39 +02:00
Benoit Marty
70c1310794 Ensure space invite are not displayed twice and cannot be selected as current space 2022-05-04 10:07:08 +02:00
Benoit Marty
4889295361 Tentative fix for rageshake 37765 2022-05-04 10:07:08 +02:00
Benoit Marty
97702317dd Rename var 2022-05-04 10:07:08 +02:00
Benoit Marty
29dc114d1a Format the file 2022-05-04 10:07:08 +02:00
Benoit Marty
8602cbba7a Fix test 2022-05-03 17:43:00 +02:00
fedrunov
9f520d4e8a
track room open and room join analytics events (#5696) 2022-05-03 16:11:40 +02:00
Benoit Marty
cdcaf93fc7 Fix F-Droid build 2022-05-03 15:02:34 +02:00
Benoit Marty
40d3203297 Use Clock interface app side 2022-05-03 15:02:34 +02:00
Benoit Marty
45526c0e3a Use Clock (SDK API change) 2022-05-03 15:02:34 +02:00
Benoit Marty
8dd87321da
Merge pull request #5866 from vector-im/feature/bma/fix_sanity_test 
Fix sanity test
 2022-05-03 15:02:04 +02:00
Adam Brown
0325754d12
Merge pull request #5884 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-05-03 09:18:29 +01:00
Valere
f57e20c73c make grace period configurable and reduce test duration 2022-05-02 17:19:08 +02:00
Maxime NATUREL
a27569770b Renaming timestamp fields 2022-05-02 11:10:36 +02:00
Valere
d0bff5000c Fix UISIDetector grace period bug 2022-05-02 10:10:29 +02:00
bmarty
cd6807d9b2 Sync analytics plan 2022-05-02 00:03:56 +00:00
Maxime NATUREL
e82e79d7e2 Fixing code quality issues 2022-04-29 14:21:44 +02:00
Maxime NATUREL
1db0e71796 Moving beacon info structure into message package 2022-04-29 14:01:01 +02:00
Maxime NATUREL
444d2c6491 Renaming message contents 2022-04-29 13:59:47 +02:00
Benoit Marty
7fa1af3819 Looks like ktlint and Android Studio does not order imports with the same rules :/. Let's please ktlint for the CI :/ 2022-04-29 10:05:51 +02:00
Benoit Marty
2a8134af89 Ensure voice call menu item is visible to the user when there is only one room member. The video call menu item is already visible (for other previous reason). 2022-04-28 16:55:46 +02:00
Benoit Marty
f48be229c8 Fix issue with ignored users. Preference Category and Preference title have the same value. 2022-04-28 16:39:59 +02:00
Benoit Marty
f6fa794a18 Restore voice call test (was fixed in #5847) 2022-04-28 14:40:11 +02:00
Maxime NATUREL
b788a82d0d Adding live summary entity into annotation entity 2022-04-28 12:10:39 +02:00
Benoit Marty
c2993a2a04 Fix long line 2022-04-28 10:52:11 +02:00
Adam Brown
cd52df5d2e
Merge pull request #5785 from vector-im/feature/adm/ftue-step-ordering 
FTUE - Registration step ordering
 2022-04-28 09:33:08 +01:00
Benoit Marty
f4b7161db2 Room now exposes methods to get the various Services 2022-04-28 09:37:58 +02:00
Aris Kotsomitopoulos
3d190bb2ac
Merge pull request #5815 from vector-im/feature/aris/crypto_improve_UISI_exceptions 
Enhance crypto posthog errors with more details
 2022-04-27 17:10:19 +03:00
Eric Decanini
5ac0555c21
Merge pull request #5826 from vector-im/bugfix/eric/missing-suggested-tag 
Adds Suggested Tag in Explore Space
 2022-04-27 14:15:05 +02:00
ericdecanini
039c9c60fe Replaces elvis false if orFalse 2022-04-27 12:04:38 +02:00
ariskotsomitopoulos
1f9b9571fd Enhance code format 2022-04-27 12:42:23 +03:00
ariskotsomitopoulos
780f1ffc8c Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-27 12:15:36 +03:00
Benoit Marty
521fd1fcd7
Merge pull request #5847 from vector-im/bugfix/eric/missing-call-icons 
Fixes Missing Call Icons when threads are enabled
 2022-04-26 22:30:07 +02:00
ericdecanini
9c951687b0 Moves tools ignore AlwaysShowAction to root of menu_timeline 2022-04-26 21:56:56 +02:00
ericdecanini
6548c3cf6f Replaces call title with action_voice_call 2022-04-26 21:54:54 +02:00
ericdecanini
f6a03cdc63 Fixes missing call icons 2022-04-26 21:10:40 +02:00
Benoit Marty
6ee0b62272
Merge branch 'develop' into feature/bma/sdk_doc_update 2022-04-26 16:15:07 +02:00
Adam Brown
636f7fdc30
removing comment re-explains what the code is already doing 2022-04-26 15:14:58 +01:00
Benoit Marty
d4c0575f28 Merge remote-tracking branch 'origin/hotfix/1.4.13' into develop 2022-04-26 11:50:23 +02:00
ariskotsomitopoulos
ba99d5c028 Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-26 12:49:21 +03:00
Benoit Marty
b2f9d6778a Version hotfix 1.4.13 2022-04-26 11:29:40 +02:00
Maxime NATUREL
343322ef21
Merge pull request #5814 from vector-im/fix/mna/live-location-beacon-format 
[Live location sharing] - Removing BeaconInfo structure
 2022-04-26 09:57:46 +02:00
Benoit Marty
c542619525 We do not need to observe the user here 2022-04-25 18:31:30 +02:00