17476 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericdecanini	b437996208	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-01 15:47:30 +01:00
Valere	d281f9dde5	use XXX not TODO	2022-07-01 16:07:03 +02:00
Maxime NATUREL	d5b375e82b	Merge pull request #6414 from vector-im/feature/mna/reply-to-lls ... [Location sharing] - Reply action on a live message (PSG-343)	2022-07-01 16:03:02 +02:00
Valere	6fd99dc302	resist ConnectivityManager$TooManyRequestsException	2022-07-01 15:56:03 +02:00
ericdecanini	ed3a201f0b	Changes directParentName to a list	2022-07-01 13:34:55 +01:00
Valere	90a4e71b06	update flacky test	2022-07-01 14:30:21 +02:00
Maxime NATUREL	f5e33ca980	Fix unit tests	2022-07-01 14:27:10 +02:00
Adam Brown	82feda476d	removing unused imports	2022-07-01 13:18:09 +01:00
Adam Brown	5e9e65e10f	using clear error on change extension	2022-07-01 13:05:26 +01:00
Adam Brown	be3d419290	adding phone number confirmation resending	2022-07-01 12:14:34 +01:00
Adam Brown	e6e079a071	adding barebone phone confirmation fragment, copied from the phone number input	2022-07-01 12:14:02 +01:00
Adam Brown	e326188aa8	Merge pull request #6108 from vector-im/feature/adm/ftue-msisdn-entry ... FTUE - Msisdn (phone number) entry	2022-07-01 12:07:57 +01:00
Adam Brown	bfa50f186a	formatting	2022-07-01 11:14:25 +01:00
Adam Brown	f2db4be479	fixing formatting/unused imports	2022-07-01 11:14:25 +01:00
Adam Brown	0bbc74b193	injects the phonenumberutil and adds testcases around the parsing	2022-07-01 11:14:25 +01:00
Adam Brown	27b1bc9e66	handling msisdn 401 errors as success within the registration wizard delegate	2022-07-01 11:14:25 +01:00
Adam Brown	7617309058	hooking up, styling and applying copy to the phone number fragment	2022-07-01 11:14:24 +01:00
Adam Brown	a8b73f0cf9	applying autofill hints for phonenumber and email entry	2022-07-01 11:13:57 +01:00
Adam Brown	df6ebcacd1	adding msisdn fragment and layout, copied from email input	2022-07-01 11:12:45 +01:00
Valere	a92fae6d25	add change log	2022-07-01 12:00:26 +02:00
Benoit Marty	1297ccd45c	Fix first compilation errors	2022-07-01 11:58:01 +02:00
Valere	28ca03cc67	Simple check to prevent frozen class modificaiton	2022-07-01 11:54:30 +02:00
Benoit Marty	c6a89c738a	Merge pull request #6419 from vector-im/dependabot/gradle/androidx.activity-activity-1.5.0 ... Bump activity from 1.4.0 to 1.5.0	2022-07-01 11:47:49 +02:00
Benoit Marty	529898d9fa	Merge pull request #6420 from vector-im/dependabot/gradle/fragment-1.5.0 ... Bump fragment from 1.4.1 to 1.5.0	2022-07-01 11:47:18 +02:00
Benoit Marty	9a2beb5017	Merge pull request #6416 from vector-im/dependabot/gradle/flipper-0.152.0 ... Bump flipper from 0.151.1 to 0.152.0	2022-07-01 11:43:53 +02:00
Valere	08cb6de83d	Fix migration	2022-07-01 11:08:35 +02:00
Florian Renaud	c25edfada4	Remove unused imports	2022-07-01 10:09:26 +02:00
Florian Renaud	0dad4cb02a	Set current ts for local events age	2022-07-01 09:57:45 +02:00
Florian Renaud	7415623c2f	Update room description style	2022-07-01 09:48:12 +02:00
Florian Renaud	c7db89613c	Split code in MergedRoomCreationItem	2022-07-01 09:48:11 +02:00
Florian Renaud	71320e42d0	Show date separator in local room timeline	2022-07-01 09:48:11 +02:00
Valere	fb5f0cbd00	Fix test compilation	2022-07-01 09:43:17 +02:00
Valere	e7322e8524	outdated configuration	2022-07-01 09:43:17 +02:00
Valere	5a67c39c7f	reuse code for test	2022-07-01 09:43:17 +02:00
Valere	a885ff5e47	Fix test	2022-07-01 09:43:17 +02:00
Valere	b0907de582	Fix migration	2022-07-01 09:43:17 +02:00
Valere	ddd82441bd	kdoc	2022-07-01 09:43:17 +02:00
Valere	8e829c6aad	Add lab flag and more tests	2022-07-01 09:43:17 +02:00
Valere	d9fb58fbcb	Fix tests	2022-07-01 09:42:31 +02:00
Valere	f64adeba7f	fix bad sender key export	2022-07-01 09:42:31 +02:00
Valere	34145f0374	post rebase fix	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	df241dbdb8	Fix broken unit test	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	010cf540b6	Fix broken unit test	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	55fdff4242	Resolve merge conflicts	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	d3a516b05d	Enhance key sharing to respect matrix configuration	2022-07-01 09:42:31 +02:00
ariskotsomitopoulos	a9a7400fef	Add MXCryptoConfig flag for key history sharing ... Add shared_history flag to sessionBackupData	2022-07-01 09:42:31 +02:00
Valere	fb352ffa38	quick format	2022-07-01 09:42:31 +02:00
Valere	d8d808d0b4	removed deprecated annotation, CI don't like	2022-07-01 09:42:31 +02:00
Valere	8c26592d46	cleaning	2022-07-01 09:42:31 +02:00
Valere	9b8e45ebfe	share keys for history take2	2022-07-01 09:42:31 +02:00