mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-22 18:56:29 +03:00
Code Issues Projects Releases Packages Wiki Activity
3375 commits 161 branches 157 tags 267 MiB
Commit graph

370 commits

Author SHA1 Message Date
Benoit Marty
6d56220d98
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-15 15:00:34 +02:00
Benoit Marty
e26a0bc9ae Add Android SDK version 2020-04-15 12:57:15 +02:00
Benoit Marty
6dc517584f Fix merge issue 2020-04-15 12:56:33 +02:00
onurays
190fbb95ec Merge branch 'develop' into feature/target-sdk-29 
# Conflicts:
#	vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
 2020-04-14 13:59:54 +03:00
Valere
ccacd20428
Merge branch 'develop' into feature/verification_unified_emoji 2020-04-10 16:05:33 +02:00
Valere
68323057aa Update change log 2020-04-10 12:12:21 +02:00
Valere
a703574004 Uniform emoji representation for all platform 2020-04-10 11:02:33 +02:00
Christopher Rossbach
ef2abbfbd4
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-09 11:11:44 +02:00
Valere
34dec64d9c Fixes #1214 2020-04-08 17:56:12 +02:00
Valere
aec49fe542 Change log 2020-04-08 16:31:01 +02:00
Onuray Sahin
8a4a288074
Merge branch 'develop' into feature/target-sdk-29 2020-04-08 14:15:02 +03:00
Christopher Rossbach
3ff5952417
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-07 20:53:31 +02:00
Valere
b480eb3688 Update change log 2020-04-07 19:20:49 +02:00
Christopher Rossbach
5521c094f7
fix typing difference 2020-04-07 17:50:01 +02:00
Christopher Rossbach
222b72a014
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-07 17:46:23 +02:00
Valere
1a436f962f update change log 
cleaning
 2020-04-07 15:15:45 +02:00
Valere
153587bd82
Merge branch 'develop' into feature/crosssigning_bootstrap 2020-04-07 15:14:43 +02:00
Valere
42d61944b5
Merge pull request #1204 from vector-im/feature/increase_file_log_size 
Increase file logger size
 2020-04-03 16:40:18 +02:00
Valere
7ffb6113a4 Increase file logger size 2020-04-03 13:53:34 +02:00
Valere
156e6114c1 Updade change log 2020-04-03 13:43:40 +02:00
Valere
92bf3f1349 Update change log 
+ code quality
 2020-04-03 11:14:14 +02:00
Christopher Rossbach
dff89cb2e1 document changes 
Signed-off-by: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com>
 2020-03-27 14:41:48 +01:00
Onuray Sahin
443d45db6a
Merge branch 'develop' into feature/target-sdk-29 2020-03-27 12:21:39 +03:00
Valere
75e66a6550
Merge branch 'develop' into feature/update_shield_logic 2020-03-26 16:58:01 +01:00
Onuray Sahin
e2f7890bb8
Merge branch 'develop' into feature/target-sdk-29 2020-03-26 17:39:22 +03:00
Valere
5244612ef6 Update shield logic for DM 2020-03-26 14:26:34 +01:00
Valere
e51439ade0 updage change log 2020-03-26 14:10:19 +01:00
onurays
f7cbc01023 Replace deprecated PreferenceManager with androidx version. 2020-03-26 15:56:33 +03:00
onurays
12429d8091 Merge develop into the branch. 2020-03-26 14:39:50 +03:00
Valere
6721f337bd
Merge branch 'develop' into feature/ensure_olm_account_unicity 2020-03-26 12:11:00 +01:00
Valere
535cdf0ef5
Merge pull request #1162 from vector-im/feature/xs_detect_new_session 
Feature/xs detect new session
 2020-03-26 12:06:18 +01:00
Valere
4b3c5d5135 update change log 2020-03-26 10:35:43 +01:00
Valere
9a6fe1af4e Fixes #1174 2020-03-26 09:49:34 +01:00
Valere
e30c17eab7 Update Changes log 2020-03-24 18:09:54 +01:00
Valere
08cfe79625
Merge pull request #1153 from vector-im/feature/fix_841 
Fixes #841
 2020-03-18 14:50:56 +01:00
Valere
14acbb2b4d Update changes 2020-03-18 12:06:37 +01:00
Valere
286a5081ff Verif / handle concurrent start 
Fixes #794
 2020-03-18 10:07:57 +01:00
Valere
68151d838f Update changes 2020-03-17 15:10:27 +01:00
Valere
20dbe2dd0d version ++ 2020-03-17 14:18:08 +01:00
Valere
78d90c8f04 prepare release 0.18.1 2020-03-17 11:46:42 +01:00
Valere
b37600f536 QuickFix / key banner not clickable 2020-03-17 10:43:48 +01:00
Valere
067a22883c WorkAround / crash android 10 gif from keyboard 
fixes #1136
 2020-03-16 16:01:55 +01:00
Valere
18d82b1bea
Merge pull request #1138 from vector-im/feature/join_command 
Implementation of /join command (#12)
 2020-03-16 10:15:25 +01:00
Valere
3c9c2e61d7 missing change log entry 2020-03-13 17:19:00 +01:00
onurays
85a987ca8d Fix typo. 2020-03-13 14:02:42 +03:00
onurays
5cb7e455b1 Implementation of /join command. 2020-03-13 14:00:46 +03:00
Valere
54eca7525e Version ++ 2020-03-11 16:24:49 +01:00
Valere
d5cbcdd4e7 prepare release 0.18.0 2020-03-11 13:41:17 +01:00
Valere
49f2064439 Fix / Self verification mode 1 was not working 2020-03-11 11:43:23 +01:00
Benoit Marty
23862cb3d0
Merge branch 'develop' into feature/notif 2020-03-06 14:43:23 +01:00