Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,415 Commits 530 Branches 157 Tags 485 MiB
7e2f892904
Commit Graph

7415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximillian Bensch
7e2f892904 CHANGES.md: fix typos 
- it's 2021

Signed-off-by: Maximillian Bensch <lorddavidiii@qi0.de>
 2021-02-10 23:36:20 +01:00
Benoit Marty
1b210d42ed
Merge pull request #2480 from vector-im/feature/fga/voip_v1_start 
VoIP v1 implementation
 2021-02-10 11:18:38 +01:00
Benoit Marty
aaeca96336 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-09 21:23:55 +01:00
Benoit Marty
4e32120a41 Just some formatting 2021-02-09 21:21:40 +01:00
Benoit Marty
08b65b57e4 Version++ 2021-02-09 21:08:46 +01:00
Benoit Marty
9297c1d191 Merge branch 'release/1.0.17' into develop 2021-02-09 21:07:35 +01:00
Benoit Marty
a8086ceb43 Prepare release 1.0.17 2021-02-09 21:07:25 +01:00
ganfra
370b9dabff VoIP: made some minor changes after review 2021-02-09 19:42:05 +01:00
Benoit Marty
2cbce016bc Add missing case in a (not used) fun 2021-02-09 12:59:23 +01:00
Benoit Marty
70513b279b Filter more call events from timeline in e2e rooms 2021-02-09 12:52:14 +01:00
Benoit Marty
b77c10d3fb Fix compilation issue after merge of develop 2021-02-09 12:19:40 +01:00
Benoit Marty
f78c72db59 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-09 11:52:18 +01:00
Benoit Marty
39332e153e
Merge pull request #2790 from vector-im/feature/bma/jitsi_in_timeline 
Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference)
 2021-02-09 10:58:22 +01:00
ganfra
5c4cf3f7c9 VoIP: PR review remarks 2021-02-08 18:43:50 +01:00
Benoit Marty
fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline 2021-02-08 17:43:49 +01:00
Benoit Marty
4d3262ce41 Ganfra's review 2021-02-08 17:43:11 +01:00
ganfra
0ed327646a Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-08 16:45:15 +01:00
Benoit Marty
eecb789603
Merge pull request #2765 from vector-im/feature/bma/big_e2e_rooms 
[DANGEROUS PR] Properly delete all objects from Realm, avoid orphaned
 2021-02-08 15:44:43 +01:00
Benoit Marty
28fad01be7
Merge pull request #2793 from vector-im/feature/bma/url_preview_fixes 
Url preview fixes
 2021-02-08 14:33:05 +01:00
Benoit Marty
d2c912e5c4
Merge branch 'develop' into feature/bma/url_preview_fixes 2021-02-08 14:32:55 +01:00
Benoit Marty
55f410636f
Merge pull request #2797 from vector-im/feature/bma/app_name 
Change app name from "Element (Riot.im)" to "Element"
 2021-02-08 14:26:25 +01:00
Benoit Marty
f2619df13d Import and cleanup 2021-02-08 14:25:33 +01:00
Benoit Marty
1212bb8d70 Change app name from "Element (Riot.im)" to "Element" 2021-02-08 12:39:35 +01:00
Benoit Marty
30be440774 Sugar: defined extensions fo deleteOnCascade() methods, as they have to be called in a transaction 2021-02-08 12:37:38 +01:00
Benoit Marty
93890343b6
Merge pull request #2786 from vector-im/feature/bma/rtl 
Feature/bma/rtl
 2021-02-08 11:52:06 +01:00
Benoit Marty
8363eba32e Better test of a reply 2021-02-08 10:12:01 +01:00
Benoit Marty
b0e5d5d3e5 Copyright 2021-02-07 20:21:31 +01:00
Benoit Marty
af30ff50f0 Naming convention 2021-02-07 15:28:07 +01:00
Benoit Marty
07220d7a59 URL preview on reply fallback (#2756) 2021-02-07 15:28:07 +01:00
Benoit Marty
ed99b503f5 Open image from URL Preview (#2705) 2021-02-07 15:00:07 +01:00
Benoit Marty
f6ad67f1c8 Use the navigator facility 2021-02-07 14:29:27 +01:00
Benoit Marty
6ee6b0cad9 Ensure no invisible displayName will be used 2021-02-07 12:00:33 +01:00
Benoit Marty
d47ba6bd11 Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference) 2021-02-06 16:52:46 +01:00
Benoit Marty
7984d021f6
Merge pull request #2788 from vector-im/gradlew-update-6.8.2 
Update Gradle Wrapper from 6.8.1 to 6.8.2
 2021-02-06 11:19:54 +01:00
Benoit Marty
57cb45d31e
Merge pull request #2781 from vector-im/feature/bma/widget_url_robustness 
Fix a bunch of bugs and feature parity for Widget
 2021-02-06 11:19:31 +01:00
Benoit Marty
d903dfb40b
Merge branch 'develop' into feature/bma/widget_url_robustness 2021-02-06 11:19:15 +01:00
Benoit Marty
99f5949ee1 Improve layout preview and format file 2021-02-06 11:11:35 +01:00
Benoit Marty
4a2557dbcd Apparently EW still provide confId in the URL, I can't figure out where in the react SDK, but do the same, maybe not to break EI 2021-02-06 11:03:55 +01:00
gradle-update-robot
426729b34c Update Gradle Wrapper from 6.8.1 to 6.8.2. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2021-02-06 00:46:22 +00:00
Benoit Marty
41e4e823fb HTML unescaping for URL preview (#2766) 2021-02-05 20:40:57 +01:00
Benoit Marty
5e2e6dcfc3 Fix another RTL issue 2021-02-05 20:01:24 +01:00
Benoit Marty
407134a89f RTL: some arrows should be rotated in RTL (#2757) 2021-02-05 19:56:39 +01:00
Benoit Marty
60f221dc37
Merge pull request #2777 from vector-im/feature/bca/fix_duplicate_thumbs 
Fix duplicate thumbs reactions
 2021-02-05 18:49:03 +01:00
Benoit Marty
627d3b5b79
Merge branch 'develop' into feature/bca/fix_duplicate_thumbs 2021-02-05 18:48:56 +01:00
Benoit Marty
ad187f99bf
Merge pull request #2779 from vector-im/feature/bca/fix_join_by_alias_deferation 
Join room other federation via alias error
 2021-02-05 18:48:23 +01:00
Benoit Marty
2fdd3a78eb Clean 2021-02-05 18:47:01 +01:00
Benoit Marty
d949e0cced Do not finish the Activity if there is an error, Jitsi is probably displaying a popup to the user (#2729) 2021-02-05 18:40:11 +01:00
Benoit Marty
e27c5c4507 Robustness 2021-02-05 13:56:11 +01:00
Benoit Marty
bfd974f698 URL Decode 2021-02-05 13:53:58 +01:00
Benoit Marty
dbe14ce0bb ElementWeb does not pass confId as a URL parameter anymore (and so does Element Android) 2021-02-05 13:50:13 +01:00