3241 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	68400cce03	Merge pull request #1049 from vector-im/feature/fix_invites ... Feature/fix invites	2020-02-25 11:39:35 +01:00
Benoit Marty	17e028178e	Code robustness (avoid using !!)	2020-02-25 11:20:11 +01:00
ganfra	19b9617a09	Invite: fix inviterId being overrided	2020-02-25 10:53:47 +01:00
Benoit Marty	08e4b4473c	Disable manual rules now checked by ktlint	2020-02-25 09:57:12 +01:00
Benoit Marty	b9b921a4df	Code quality	2020-02-25 09:53:17 +01:00
ganfra	483256093a	Invite: fix room member not saved	2020-02-24 18:27:18 +01:00
Benoit Marty	d710a59554	Update change log	2020-02-24 17:44:51 +01:00
Benoit Marty	1023982858	Code readability	2020-02-24 17:40:28 +01:00
Benoit Marty	9c566b19f7	Ensure all eventId start with $, even ids for local echo	2020-02-24 17:35:43 +01:00
ganfra	b694721728	Update CHANGES	2020-02-24 17:33:40 +01:00
ganfra	8b0305c91d	Clean code	2020-02-24 17:33:40 +01:00
ganfra	133d8d7f14	RoomList: fix joining/rejecting state	2020-02-24 17:33:40 +01:00
ganfra	9cdb1da614	Start fixing notif for invites	2020-02-24 17:33:40 +01:00
ganfra	981c9ac4ac	Invite sync: assign eventId and remove the primaryKey constraint	2020-02-24 17:33:40 +01:00
Benoit Marty	3e8a0f7252	Merge pull request #1044 from vector-im/feature/fix_big_image_rotation ... Use exif info of the image for correct rotation.	2020-02-24 17:30:33 +01:00
Benoit Marty	281620b88d	Merge pull request #1048 from vector-im/feature/profile_share_actions ... Share action is added to room profile and room member profile	2020-02-24 17:29:17 +01:00
Benoit Marty	c6b3b1e648	Fix bug on test	2020-02-24 17:27:04 +01:00
Benoit Marty	96af1957f9	Fix bug on progress step, found by integration test testBackupWithPassword()	2020-02-24 16:27:58 +01:00
Benoit Marty	b680e24938	Fix some tests	2020-02-24 16:16:37 +01:00
onurays	dec62a893e	Code review fixes.	2020-02-24 18:06:59 +03:00
onurays	b3d4747d97	Code review fixes.	2020-02-24 17:35:57 +03:00
onurays	1124aa25fd	Code review fixes.	2020-02-24 17:22:07 +03:00
Benoit Marty	b3c8b5526d	Each session now have it's proper crypto store	2020-02-24 15:03:12 +01:00
Benoit Marty	1e44e77503	Make code robust to int received instead of boolean ... https://github.com/matrix-org/synapse/issues/6977	2020-02-24 14:42:47 +01:00
Valere	964b611f4e	Merge pull request #1053 from vector-im/feature/fix_712 ... Fixes #712	2020-02-24 14:07:35 +01:00
Valere	3e587af163	klint	2020-02-24 14:07:15 +01:00
Benoit Marty	b03b6bfc37	Fix crash discovered thanks to integration tests	2020-02-24 12:53:18 +01:00
Benoit Marty	1a6d4d0b03	Try to fix XSigningTest	2020-02-21 19:20:40 +01:00
Valere	c41661ece8	Fixes #712	2020-02-21 19:05:20 +01:00
Benoit Marty	1b763fb4c8	Cleanup XSigningTest	2020-02-21 18:52:36 +01:00
Benoit Marty	9ef267cb07	Cleanup after each test	2020-02-21 18:36:13 +01:00
Benoit Marty	d167ff9496	Make KeysBackup test pass (still work to do)	2020-02-21 17:58:04 +01:00
Benoit Marty	ccfa59ad31	Cleanup var -> val	2020-02-21 15:05:48 +01:00
onurays	f650e29ddd	Share action is added to room profile and room member profile ... Fixes #858	2020-02-21 15:30:01 +03:00
Onuray Sahin	1eefda18e4	Merge branch 'develop' into feature/fix_big_image_rotation	2020-02-21 13:13:02 +03:00
Benoit Marty	d6434654e2	Merge pull request #1043 from vector-im/feature/join_federation ... Fix join room over federation	2020-02-21 10:08:05 +01:00
Benoit Marty	b6372df676	Merge pull request #1037 from vector-im/feature/crosssigning_qr ... Migrate to binary QR code verification (#994)	2020-02-21 10:01:49 +01:00
Benoit Marty	d7de072155	typo	2020-02-21 09:58:56 +01:00
onurays	a11d70f173	Use exif info of the image for correct rotation.	2020-02-21 00:51:22 +03:00
Benoit Marty	a9909b37ba	Update after Valere's review	2020-02-20 19:54:35 +01:00
Benoit Marty	3f9a5a4e54	Leaving a room creates a stuck "leaving room" loading screen. (#1041)	2020-02-20 19:31:33 +01:00
Benoit Marty	198e23c204	Second fix for #808	2020-02-20 19:23:32 +01:00
Benoit Marty	aefffc0c05	RoomPreviewNoPreviewFragment use room alias if there is no name	2020-02-20 19:19:31 +01:00
Benoit Marty	fd05fe36f5	Fix joining rooms from directory via federation isn't working. (#808)	2020-02-20 19:01:36 +01:00
Benoit Marty	b72698d63c	Fix another issue when there is no name and no canonical alias on a public room	2020-02-20 18:47:07 +01:00
Benoit Marty	eec65fb622	Join room by roomId or room alias	2020-02-20 18:17:57 +01:00
Benoit Marty	87021dd6ec	Rename field	2020-02-20 18:16:10 +01:00
Benoit Marty	b85c76b172	Simplify code	2020-02-20 18:05:53 +01:00
Benoit Marty	d867b1345f	Format	2020-02-20 15:15:38 +01:00
Benoit Marty	80ef2192b9	Merge pull request #1036 from vector-im/feature/fix_key_restoring ... Fix threading issues while restoring keys backup.	2020-02-20 15:13:13 +01:00