2277 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Valere	935b3d7f3f	cleaning	2019-12-30 20:18:08 +01:00
Valere	3c4506cb58	merge madness ??	2019-12-30 19:52:48 +01:00
Valere	3eed9b5083	cleaning	2019-12-30 18:42:32 +01:00
Valere	6bf3a703df	BottomSheet UX	2019-12-30 18:01:06 +01:00
Valere	2152af8851	klint	2019-12-30 17:54:44 +01:00
Valere	5b33a42f8a	FIx / missing strings after merge	2019-12-30 17:36:33 +01:00
Valere	a73cd61b96	WIP	2019-12-30 15:16:11 +01:00
Valere	4edd5e3530	Added SAS do not match api	2019-12-30 14:32:58 +01:00
Valere	4c0cbca4cb	Support .verification.ready event	2019-12-30 14:32:58 +01:00
Valere	308b15b908	Fix / m.key.verification.key was not sent in toDevice mode	2019-12-30 14:32:04 +01:00
Valere	38906084d1	WIP	2019-12-30 14:32:04 +01:00
Valere	0997d9abf4	Merge branch 'develop' into cross_signing	2019-12-30 14:27:47 +01:00
Benoit Marty	90f2199eb7	Merge pull request #785 from vector-im/feature/initial_sync ... Feature/initial sync	2019-12-20 18:18:32 +01:00
Benoit Marty	63828bc159	Merge branch 'develop' into feature/initial_sync	2019-12-20 17:55:04 +01:00
Benoit Marty	35b4d90e0d	ktlint	2019-12-20 17:54:35 +01:00
Benoit Marty	4fe9c52737	Move permission to the main AndroidManifest	2019-12-20 17:54:02 +01:00
Benoit Marty	c54358831f	Group throwable extension together	2019-12-20 17:45:32 +01:00
Benoit Marty	fcdaf14b01	Merge pull request #786 from vector-im/feature/room_alias_rendering ... Autocompletion and pills for rooms and groups	2019-12-20 14:58:38 +01:00
ganfra	83126d5f55	Fix android tests not working	2019-12-20 11:54:59 +01:00
ganfra	e13281dc97	Update CHANGES and clean code	2019-12-20 11:27:26 +01:00
Benoit Marty	3cc65b1e71	ktlint	2019-12-20 11:05:54 +01:00
Benoit Marty	0ccb975d43	Disable MatrixLinkify	2019-12-20 11:04:06 +01:00
Benoit Marty	54f2ac0d8c	Better comment	2019-12-20 10:59:41 +01:00
Benoit Marty	3ee5a7f54d	Better code	2019-12-20 10:55:08 +01:00
Benoit Marty	3b0624ea40	Fix issue with "in reply to" link	2019-12-20 10:54:48 +01:00
Benoit Marty	c992d32afd	Improve algo	2019-12-20 10:23:45 +01:00
Benoit Marty	c5739abe32	Update changes.md	2019-12-20 10:16:17 +01:00
Benoit Marty	3ac473d945	Remove extra blank line	2019-12-20 10:15:53 +01:00
Benoit Marty	c79b35b089	Autocomplete item layout	2019-12-20 10:15:11 +01:00
Benoit Marty	8dce98c538	Autocompletion: group (including pills for groups)	2019-12-20 02:54:48 +01:00
Benoit Marty	543c07fd69	Render pills for room links	2019-12-20 01:23:45 +01:00
Benoit Marty	05a788453f	More generic name	2019-12-20 00:47:47 +01:00
Benoit Marty	c31b64771b	Autocompletion: disable animation on the recycler view items	2019-12-20 00:42:19 +01:00
Benoit Marty	92f43a591a	Autocompletion for room canonical alias	2019-12-20 00:38:42 +01:00
Benoit Marty	3a829bdfe8	Fix command truncation	2019-12-20 00:05:04 +01:00
Benoit Marty	237b22df59	Fix lots of trouble with the completion popup (resize, change mode, etc.) - next step	2019-12-19 20:31:36 +01:00
Benoit Marty	c18be94986	Fix lots of trouble with the completion popup (resize, change mode, etc.)	2019-12-19 20:03:10 +01:00
Benoit Marty	d342356f29	Add missing state events to the list (not sure about the side effects)	2019-12-19 19:48:30 +01:00
Benoit Marty	07817b69c2	Rename some event type	2019-12-19 19:46:09 +01:00
Benoit Marty	e73970d61b	Render aliases and canonical alias change in the timeline	2019-12-19 19:39:35 +01:00
ganfra	0eb0870d6c	AvatarRenderer: allow to pass GlideRequests too (fix home group avatar)	2019-12-19 18:29:46 +01:00
ganfra	55748a4af4	Merge branch 'develop' into feature/initial_sync	2019-12-19 17:49:45 +01:00
Benoit Marty	51d6b8828d	Version++	2019-12-19 16:46:01 +01:00
Benoit Marty	9a7cd3f270	Merge branch 'release/0.11.0' into develop	2019-12-19 16:44:27 +01:00
Benoit Marty	92315a4189	Prepare release 0.11.0	2019-12-19 16:44:14 +01:00
ganfra	a6afd2e904	Timeline: handle failure when navigating to an unknown event (+ clean some files)	2019-12-19 16:10:59 +01:00
Benoit Marty	156cc1aa4a	Import Strings from Riot	2019-12-19 15:50:18 +01:00
Benoit Marty	0d36e9d8a6	Merge pull request #779 from vector-im/feature/fix_some_crashes ... Fix some crashes and issues	2019-12-19 14:02:19 +01:00
Benoit Marty	13439769a1	Update wording	2019-12-19 14:01:58 +01:00
ganfra	7bb8cb0682	Permalink: fix nav to same room	2019-12-19 13:42:15 +01:00