Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,338 Commits 530 Branches 157 Tags 485 MiB
633b12f66d
Commit Graph

689 Commits

Author SHA1 Message Date
Tobias Preuss
04f0146afd Use Context#withStyledAttributes extension function. 
+ This function is more concise and ensures "recycle()" is always invoked.
+ Sources: https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-preference-release/core/core-ktx/src/main/java/androidx/core/content/Context.kt#52
 2020-07-04 19:36:17 +02:00
Benoit Marty
f74ab2dfd4
Merge branch 'develop' into feature/save_attachement_legacy 2020-07-04 12:16:50 +02:00
Benoit Marty
b853397c0a Re-activate Wellknown support with updated UI (#1614) 2020-07-04 12:10:17 +02:00
Benoit Marty
0cfd33fc8b Typo 2020-07-04 11:15:20 +02:00
Tulir Asokan
e9ba7342d5 Fix reply fallback format 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2020-07-03 23:12:32 +03:00
Benoit Marty
586b0fe6e2
Merge pull request #1602 from vector-im/feature/work_manager_init 
Work manager init
 2020-07-03 12:04:53 +02:00
Valere
bdfce35d9a Fix / save media on old android 
+ add numbers to file if needed
 2020-07-03 10:32:07 +02:00
Benoit Marty
b8f66a36d5
Merge branch 'develop' into feature/fix_crash_notification 2020-07-03 00:23:21 +02:00
Benoit Marty
15223ecfe4 Update changelog with the recent change 2020-07-02 21:31:39 +02:00
ganfra
5008bfd6a9 Update CHANGES 2020-07-02 16:17:00 +02:00
Benoit Marty
542d11d7f1 Upgrade build-tools from 3.5.3 to 3.6.6 and gradle from 5.4.1 to 5.6.4 2020-07-02 12:44:07 +02:00
Benoit Marty
1de819b0a3 Fix lint false-positive about WorkManger (#1012) 2020-07-02 12:21:23 +02:00
Benoit Marty
f4314ebdae Version++ 2020-07-01 21:58:58 +02:00
Benoit Marty
3e97e03ccc Prepare release Riot.imX v0.91.3 for the beta channel 2020-07-01 21:51:30 +02:00
Benoit Marty
a98bd0940f
Merge branch 'develop' into feature/new_home 2020-07-01 20:31:55 +02:00
Benoit Marty
fb1c01c37c Catchup tab is removed temporarily (#1565) 
Invites are displayed in the corresponding DM or Room tab
 2020-07-01 16:15:06 +02:00
Benoit Marty
f8e35da533 Render room avatar change (#1319) 2020-07-01 14:52:37 +02:00
Benoit Marty
53053d8f4a Fix layout overlap issue (#1407) 2020-07-01 14:03:30 +02:00
Benoit Marty
73ce38c6a9
Merge pull request #1583 from vector-im/feature/fix_search_case 
Fixes #1468 user search case
 2020-06-30 19:16:48 +02:00
Valere
4b74c7320b update change log 2020-06-30 18:49:15 +02:00
Valere
2932e05851 Fixes #1468 user search case 2020-06-30 18:38:46 +02:00
Benoit Marty
4bb804fbf7 Allow self-signed certificate (#1564) 
Accepted fingerprint before the migration to RiotX should still work after the migration.
The dialog to trust the certificate is displayed during the login flow.
For the moment, it is not displayed if the certificate change on the server once the user is logged in. This use case will be handled later.
 2020-06-30 18:25:36 +02:00
onurays
16bd642ae8 Implementation of updating user avatar. 
Fixes #1054
 2020-06-30 14:23:57 +02:00
onurays
05e848244e Room name and topic fields added to form. 2020-06-30 14:17:19 +02:00
Benoit Marty
5434c39453 Change 2020-06-29 16:36:32 +02:00
Benoit Marty
30774957ba Handle /nick command (#12) 2020-06-26 23:40:23 +02:00
Benoit Marty
8a1a772ab7 Handle /op and /deop commands (#12) 
Also when resetting power level, remove from list of user instead of setting the default value.
 2020-06-26 23:31:19 +02:00
Benoit Marty
1fb2569a39 Remove deviceId from /keys/upload/{deviceId} as not spec-compliant (#1502) 
FTR: 1b6a74fd93
 2020-06-26 15:54:50 +02:00
Benoit Marty
19ed5a2d3d Keys Backup API now use the unstable prefix (#1503) 2020-06-26 15:54:50 +02:00
onurays
4349331ee7 Support compressing images on Android 10 and above. 2020-06-25 16:14:54 +03:00
onurays
96d6a72b97 Compress images before sending (for devices below Android 10). 
Fixes #1333
 2020-06-25 10:09:08 +03:00
Benoit Marty
7b3fa501c6
Merge pull request #1545 from johnjohndoe/sharedpreferences 
Use SharedPreferences#edit extension function consistently.
 2020-06-24 21:47:07 +02:00
Benoit Marty
c0c300925d
Merge branch 'develop' into feature/fix_1543 2020-06-24 21:24:25 +02:00
Tobias Preuss
e24785015d Use SharedPreferences#edit extension function consistently. 
+ Add "androidx.core:core-ktx:1.1.0" to "matrix-sdk-android" module which
  was already used in "vector" module.
+ Sources: https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-preference-release/core/core-ktx/src/main/java/androidx/core/content/SharedPreferences.kt.
 2020-06-24 15:40:00 +02:00
Benoit Marty
dbb9dc4458
Merge pull request #1541 from johnjohndoe/random-housekeeping 
Random housekeeping indicated by Lint
 2020-06-24 14:56:23 +02:00
Benoit Marty
94b5e4e2f8 User could not redact messages that he has sent (#1543) 2020-06-24 14:21:45 +02:00
Benoit Marty
0d891b1c93 Use vendor prefix for non merged MSC (#1537) 2020-06-24 14:10:24 +02:00
Tobias Preuss
2f77deb0a8 Fix package name. 2020-06-24 10:58:47 +02:00
Benoit Marty
3f44056243
Merge pull request #1526 from johnjohndoe/retrofit2-call-awaitresponse 
Use retrofit2.Call.awaitResponse extension provided by Retrofit 2.
 2020-06-23 13:53:27 +02:00
Benoit Marty
9754e26e5f Add capability to change the display name (#1529) 2020-06-22 20:50:31 +02:00
Valere
55993aff04
Merge pull request #1416 from vector-im/feature/voip 
Call support with WebRTC
 2020-06-22 17:23:22 +02:00
Tobias Preuss
66c5a35f36 Use retrofit2.Call.awaitResponse extension provided by Retrofit 2. 
+ This extension is identical to the one used in this project and is
  available since Retrofit 2.6.0.
  See b761518aa1.
 2020-06-22 17:04:37 +02:00
Benoit Marty
3ced179fbb
Merge branch 'develop' into patch-1 2020-06-22 14:11:50 +02:00
Tobias Preuss
85fcc2eab7 Fix minor typo. 
+ Fix spelling of "remaining".
 2020-06-22 12:25:34 +02:00
Tobias Preuss
e7143b53d5 Fix self-assignment of callback. 2020-06-22 12:08:49 +02:00
Benoit Marty
057c21f7d0 Incomplete predicate in RealmCryptoStore#getOutgoingRoomKeyRequest (#1519) 2020-06-22 09:17:37 +02:00
Valere
464e99505b Update change log 2020-06-19 18:57:50 +02:00
Benoit Marty
d2f1488934
Merge pull request #1500 from vector-im/feature/api_21 
Min SDK level set to 21 (#405)
 2020-06-19 09:45:22 +02:00
Benoit Marty
f532d28fb3 Min SDK level set to 21 (#405) 2020-06-18 14:18:40 +02:00
Benoit Marty
86b4c9ac73 "Add Matrix app" menu is now always visible (#1495) 2020-06-17 18:13:09 +02:00
Benoit Marty
1df3b4e18f Fix dark theme issue on login screen (#1097) 2020-06-17 15:52:31 +02:00
Benoit Marty
ff39b22686 Add changelog entry for proguard 2020-06-16 11:18:33 +02:00
Benoit Marty
914bfb105c Version++ 2020-06-15 23:28:57 +02:00
Benoit Marty
840648b750 Prepare release 0.22.0 2020-06-15 23:27:10 +02:00
Benoit Marty
29fd4c4bd2 Fix issue on dark themes, after alert popup dismiss 2020-06-15 23:25:32 +02:00
Benoit Marty
2c1487d303
Merge pull request #1466 from vector-im/feature/toggle_favorite 
Add capability to add and remove a room from the favorites (#1217)
 2020-06-15 14:29:48 +02:00
ganfra
579d4f7a5b Merge branch 'develop' into feature/power_level 2020-06-10 17:21:04 +02:00
Benoit Marty
c35c94b7b7 Update link to Modular url from "https://modular.im/" to "https://modular.im/services/matrix-hosting-riot" and open it using ChromeCustomTab 2020-06-10 09:13:08 +02:00
Benoit Marty
d8317f7439 Add capability to add and remove a room from the favorites (#1217) 2020-06-10 00:42:14 +02:00
Benoit Marty
d402b49f07
Merge branch 'develop' into feature/fix_version 2020-06-08 18:16:42 +02:00
Benoit Marty
1ad19b5e93
Merge branch 'develop' into feature/fix 2020-06-08 18:09:57 +02:00
Benoit Marty
050407f7c7
Merge branch 'develop' into feature/fix_1444 2020-06-08 18:07:15 +02:00
ganfra
d2dba1826d Update CHANGES 2020-06-08 10:32:02 +02:00
Benoit Marty
d70b19fa93 SSO login is now performed in the default browser (#1400) - WIP 
Use ChromeCustomTabs to host the SSO web page
 2020-06-05 01:14:35 +02:00
Benoit Marty
ae7a52cecf Correctly handle SSO login redirection 2020-06-04 16:55:27 +02:00
Benoit Marty
2e244dd448
Merge pull request #1446 from vector-im/feature/various_fixes 
Hide left rooms in breadcrumbs (#766)
 2020-06-04 15:07:45 +02:00
Benoit Marty
3b256a708e Fix status bar icon contrast on API in [21,23[ 2020-06-04 12:55:27 +02:00
Benoit Marty
aea517515c Fix navigation bar icon contrast on API in [21,27[ (#1342) 2020-06-04 12:50:42 +02:00
Benoit Marty
f28889284d Wrong /query request (#1444) 2020-06-04 11:59:04 +02:00
Valere
05efd7423e
Merge branch 'develop' into feature/fix_1169 2020-06-04 11:44:32 +02:00
Benoit Marty
fce8a3bc18 changes.md 2020-06-04 11:43:54 +02:00
Valere
2adb5af051 update change log 2020-06-04 11:43:47 +02:00
Benoit Marty
8b7e5e527a Make Credentials.homeServer optional because it is deprecated (#1443) 
It is never used currently in RiotX, but if homeserver does not sent it, it would crash.
 2020-06-04 11:41:32 +02:00
Benoit Marty
a3fd49499b Hide left rooms in breadcrumbs (#766) 2020-06-04 08:59:01 +02:00
Benoit Marty
b29c2b2de4 Send plain text in the body 
According to https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes, the plain text version of the HTML should be provided in the body.

Also create MarkdownParser class to be able to unit test it.
 2020-06-03 18:44:35 +02:00
Benoit Marty
0fd50892af Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410) 2020-06-03 18:41:07 +02:00
Benoit Marty
55bd346cb2
Merge pull request #1425 from vector-im/feature/integration_manager 
Feature/integration manager
 2020-06-03 18:10:03 +02:00
ganfra
d8848a6062 Merge branch 'develop' into feature/integration_manager 2020-06-02 20:26:03 +02:00
ganfra
9da5061689
Update CHANGES.md 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2020-06-02 16:37:51 +02:00
Benoit Marty
3f1e5b9b1e Hide "X made no changes" event by default in timeline (#1430) 2020-06-02 15:54:01 +02:00
Benoit Marty
3bd2b24b10 Use "you" instead of display name when the current user has sent the event. 2020-06-02 13:15:03 +02:00
ganfra
440c21e9f3 Update CHANGES 2020-05-29 19:06:06 +02:00
Benoit Marty
86c9264ed9 Fix: Switch theme is not fully taken into account without restarting the app 2020-05-28 23:03:04 +02:00
Benoit Marty
b0a6eaaa96 Version++ 2020-05-28 10:45:58 +02:00
Benoit Marty
9a972b2f73 Prepare release 0.21.0 2020-05-28 10:43:40 +02:00
Benoit Marty
0eb36a607b
Merge pull request #1402 from vector-im/feature/rageshake_dialogs 
Feature/rageshake dialogs
 2020-05-26 00:04:33 +02:00
Benoit Marty
3d33018ffa
Merge pull request #1147 from unclejay80/http_proxy_init 
added network proxy configuration
 2020-05-25 23:43:11 +02:00
Benoit Marty
7a3dbecc08 Fixes #860 2020-05-25 17:05:17 +02:00
Benoit Marty
53c7ea2831 Kotlin: use orEmpty() for Maps 2020-05-25 15:42:30 +02:00
Benoit Marty
fa48e8cffa Change icon to magnifying-glass to filter room (#1384) 2020-05-25 10:57:14 +02:00
Benoit Marty
330a33a0e8 Render formatted_body for m.notice and m.emote (Fixes #1196) 2020-05-21 01:47:17 +02:00
Benoit Marty
e156a62e19 Enable markdown (if active) when sending emote (Fixes #734) 2020-05-21 00:27:19 +02:00
Benoit Marty
d49fcb80fc "Seen by" uses 12h time (Fixes #1378) 
DateUtils.FORMAT_SHOW_TIME has to be used for i18n to be effective on DateUtils.getRelativeDateTimeString(), do not ask me why.
Also internal switching of language does not have effect on this method, you'll have to restart the application.
 2020-05-20 23:52:41 +02:00
Benoit Marty
ca37895619
Merge pull request #1374 from vector-im/feature/sas_v2 
support new key agreement method for SAS
 2020-05-20 18:32:01 +02:00
ganfra
e1c6542e03
Merge branch 'develop' into feature/forward_pagination 2020-05-19 15:25:33 +02:00
Valere
861a7f791f Update change log 2020-05-19 09:57:54 +02:00
Benoit Marty
05a52164f3 Identity: Changelog and documentation 2020-05-18 17:23:33 +02:00
Benoit Marty
e542e4ba22 Add a setting to hide redacted events (#951) 2020-05-18 16:26:18 +02:00
Benoit Marty
4961bb0e08 FontSize: rework by creating FontScaleValue data class. 2020-05-18 16:21:47 +02:00
Benoit Marty
f45040c405 Locale: support locale change 2020-05-18 16:21:24 +02:00
Benoit Marty
3185b88fe5 Better connectivity lost indicator when airplane mode is on 2020-05-18 15:09:14 +02:00
Benoit Marty
48e58967b2 Version++ 2020-05-15 15:48:15 +02:00
Benoit Marty
03fa0e6ad6 Prepare release 0.20.0 2020-05-15 15:44:36 +02:00
Valere
040deea655 Fix crash on restore backup from ky 2020-05-13 16:59:55 +02:00
Valere
8d32c27ce0 Fix crash 1364 2020-05-13 16:57:57 +02:00
Valere
650b6bd9ea
Merge branch 'develop' into feature/crash_manual_verify 2020-05-13 16:35:28 +02:00
Benoit Marty
57fca80cbb Disable possibility to login using matrixId (waiting for design) 2020-05-13 13:33:12 +02:00
Benoit Marty
c9bc6f4a9e Support homeserver discovery from MXID - Wellknown (#476) 2020-05-13 12:42:08 +02:00
Benoit Marty
63c18e82c8
typo... 2020-05-13 00:34:33 +02:00
Benoit Marty
037b2e1d60
PR merged after a release, move 2 lines 2020-05-13 00:34:03 +02:00
Benoit Marty
aea9c958bf
Merge pull request #1307 from vector-im/feature/invite_members_to_room 
Invite members to an existing room
 2020-05-13 00:29:55 +02:00
Benoit Marty
7f185a729e
Merge pull request #1345 from emmaguy/direct-shortcuts 
Add direct shortcuts
 2020-05-13 00:25:58 +02:00
Emma Vanbrabant
d08b4e1ea0 PR feedback 2020-05-12 19:37:03 +01:00
Benoit Marty
25d224be6b
Merge branch 'develop' into develop 2020-05-11 22:27:16 +02:00
Emma Vanbrabant
f568553d21 Add to changes 2020-05-09 21:07:03 +01:00
Nolan Darilek
35ee7f0b40 Add changelog entry. 2020-05-07 15:38:28 +00:00
Valere
0afa7a706a Update change log 2020-05-06 18:20:43 +02:00
Valere
da68212255 Crashes when private key missing 2020-05-06 18:14:44 +02:00
Benoit Marty
86fba28313 After jump to unread, newer messages are never loaded (#1008) 2020-05-05 02:41:32 +02:00
Benoit Marty
6843ea113b Version++ 2020-05-04 16:06:41 +02:00
Benoit Marty
0b5e618c1c Update CHANGES.md 2020-05-04 16:03:01 +02:00
Onuray Sahin
d2f0957eba
Merge branch 'develop' into feature/invite_members_to_room 2020-04-30 16:11:52 +03:00
onurays
0aeb327062 Changelog added. 2020-04-30 15:40:02 +03:00
Valere
7b20db64a5
Merge branch 'develop' into feature/e2e_timeline_decoration 2020-04-30 12:01:44 +02:00
Valere
429c634ed9
Merge pull request #1308 from vector-im/feature/fix_dm_shield_logic 
Fix / Move DM shield rules to task
 2020-04-30 12:00:18 +02:00
Valere
6ea38c7eb0 Fix / Move DM shield rules to task 2020-04-30 10:55:25 +02:00
Valere
0d0af6906e Code review 2020-04-30 10:10:56 +02:00
Benoit Marty
87979ccadd
Merge pull request #1299 from vector-im/feature/emoji_perf 
Emoji completion for 🎉
 2020-04-28 23:41:02 +02:00
Benoit Marty
a4192a0761 Emoji completion 🎉 does not completes to 🎉 like on web (#1285) 2020-04-28 14:29:43 +02:00
Valere
2d6f0205a4 Update manage sessions screen 2020-04-28 13:20:30 +02:00
Valere
bdce71abfd Update change log 2020-04-24 16:50:56 +02:00
Benoit Marty
8daf72a4b0 Use correct URL for SSO connection (#1178) 2020-04-24 15:54:02 +02:00
Onuray Sahin
f0648ee52a
Merge branch 'develop' into feature/misleading_url_target 2020-04-24 11:24:39 +03:00
Valere
eac9133bb1 update change log 2020-04-23 21:16:46 +02:00
Valere
928149fe35
Merge branch 'develop' into feature/update_design_complete_secu 2020-04-23 21:13:53 +02:00
Onuray Sahin
a80181da9e
Merge branch 'develop' into feature/misleading_url_target 2020-04-23 20:18:44 +03:00
onurays
72de5d6adc Code review fixes. 2020-04-23 20:17:52 +03:00
Benoit Marty
4ee13b6fa1
Merge branch 'develop' into feature/unwedging 2020-04-23 18:20:09 +02:00
Benoit Marty
33fb1dd147
Merge pull request #1262 from vector-im/feature/fix_add_by_user_id 
Add user to direct chat by user id.
 2020-04-23 18:05:15 +02:00
Valere
736905edf8
Merge pull request #1269 from vector-im/feature/complete_security_hide_4s 
Hide Use recovery key when 4S is not setup
 2020-04-23 18:03:14 +02:00
Benoit Marty
e8a91eab88
Merge pull request #1265 from vector-im/feature/deactivate 
Deactivate account using password
 2020-04-23 17:30:08 +02:00
Valere
25d2c2e2c6 Update design wait for self verification 2020-04-23 15:45:21 +02:00
onurays
06a13d5c20 Show a warning dialog if the text of the clicked link does not match the link target 
Fixes #922
 2020-04-23 15:42:57 +03:00
Valere
7e0591ffee Hide Use recovery key when 4S is not setup 2020-04-23 11:14:20 +02:00
Benoit Marty
671c1259af
Merge pull request #1239 from waylon531/develop 
Use a bigger thread pool
 2020-04-22 18:23:37 +02:00
Benoit Marty
045e3d7bae Account deactivation (with password only) (#35) 2020-04-21 20:31:54 +02:00
onurays
3163bc8b80 Add user to direct chat by user id. 
Fixes #1065
 2020-04-21 15:25:48 +03:00
Valere
8a4f0a0c00 KeyBackup / Use 4S if key in quadS 2020-04-20 19:21:44 +02:00
Benoit Marty
a6368c473e Restart broken Olm sessions ([MSC1719](https://github.com/matrix-org/matrix-doc/pull/1719)) 2020-04-20 18:07:14 +02:00
Onuray Sahin
754f220596
Merge branch 'develop' into feature/save_media_to_gallery 2020-04-20 11:21:14 +03:00
Waylon Cude
68f93c6c31
Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop 
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-04-16 12:19:17 -07:00
Benoit Marty
e97c95f40a Fix issue with media path (Fixes #1227) 2020-04-16 16:41:45 +02:00
onurays
2b2e6dd6f8 Share menu item added to image media viewer. 2020-04-16 16:04:37 +03:00
Waylon Cude
d20cf484ff
Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop 
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-04-16 03:10:06 -07:00
Waylon Cude
ec4458e84a
Updated CHANGES.md 
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-04-16 02:50:58 -07:00
Valere
8ae2f06044 Add change log 2020-04-16 11:30:10 +02:00
Benoit Marty
1372192031
Merge pull request #1091 from vector-im/feature/secure 
Add a setting to prevent screenshot of the application, disabled by default (#1027)
 2020-04-16 11:27:59 +02:00
Benoit Marty
ea03f76847
Merge pull request #1129 from vector-im/feature/update_password 
Change password function implemented.
 2020-04-16 11:26:33 +02:00
Benoit Marty
17ece54cb0 mimetype field is optional 2020-04-16 10:28:23 +02:00
Benoit Marty
634c8947bd
Merge branch 'develop' into refresh-summary 2020-04-15 17:29:08 +02:00
Benoit Marty
6201a9b8ef
Merge branch 'develop' into feature/fix_download_file 2020-04-15 16:52:40 +02:00
Benoit Marty
1981d2e9ac
Merge pull request #1233 from vector-im/feature/fix_local_echo_no_update 
Fix / sending event not always updating
 2020-04-15 16:51:16 +02:00
onurays
f00db49bda Change password function implemented. 
Fixes #528
 2020-04-15 16:38:44 +02:00
Valere
c35d854776 Add shield in composer 2020-04-15 15:37:43 +02:00
Benoit Marty
c0fa259b40 Add a setting to prevent screenshot of the application, disabled by default (#1027) 2020-04-15 15:04:19 +02:00
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
Valere
68ca0e9d4b Fix / sending event not always updating 2020-04-14 17:35:11 +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
onurays
7242cbda40 Catch network errors during file downloading. 
Fixes #1229
 2020-04-13 17:48:19 +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