2936 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	4ae09b8716	Merge pull request #831 from david1hyman/file-decryption-fix ... File decryption path was writing incorrect stream to file	2020-01-16 10:50:15 +01:00
ganfra	f128ed437f	Merge pull request #843 from vector-im/feature/room_profile ... Feature/room profile	2020-01-15 19:17:50 +01:00
ganfra	11c8c8c2bd	Fix fdroid background sync	2020-01-15 19:16:50 +01:00
ganfra	2c331671ee	Fix string	2020-01-15 17:44:38 +01:00
ganfra	b44ddcfd61	Clean code after Benoit's review #2	2020-01-15 14:57:21 +01:00
ganfra	7c0f2d6e32	Test: fix import	2020-01-15 11:48:02 +01:00
ganfra	52de14b1b5	Clean code after Benoit's review	2020-01-15 11:46:33 +01:00
ganfra	d6e6092eea	Profile: add PowerLevelContent for building future actions + fix divider	2020-01-14 19:14:15 +01:00
ganfra	9671a77e5d	Clean code and update CHANGES	2020-01-14 18:48:13 +01:00
ganfra	d3415d345f	Merge branch 'develop' into feature/room_profile	2020-01-14 18:35:01 +01:00
ganfra	df4df81ef3	Profile: handle ignore/unignore action + adjust UI	2020-01-14 17:08:21 +01:00
Valere	a7c948815c	Merge branch 'develop' into cross_signing	2020-01-14 12:31:29 +01:00
Benoit Marty	9d5197b1c8	Show all hidden event in the timeline when the developer settings is ON	2020-01-13 22:47:41 +01:00
ganfra	162f0949fa	Profile: Start fetching profile info from a user	2020-01-13 18:44:01 +01:00
ganfra	ae1a24e948	Room member profile: branch the UI and fix some UI issues	2020-01-13 16:49:14 +01:00
Benoit Marty	b5fead18fe	Merge pull request #833 from vector-im/feature/typing ... Send and render typing events (#564)	2020-01-13 15:17:43 +01:00
Benoit Marty	3c682430d9	Merge pull request #829 from vector-im/feature/stab ... Feature/stab	2020-01-13 15:13:07 +01:00
Benoit Marty	717965bc37	Update comment	2020-01-13 15:12:39 +01:00
Benoit Marty	ecc463e920	Cleanup and fix a bug	2020-01-13 10:13:12 +01:00
Benoit Marty	f3e52b96c0	Cleanup	2020-01-11 22:12:56 +01:00
Benoit Marty	dd81fce8d8	Send and render typing events (#564)	2020-01-11 20:50:09 +01:00
Valere	7354eab061	Post merge fixes	2020-01-11 10:16:09 +01:00
David Hyman	1ae58aa6ad	DefaultFileService - code was passing the inputStream to the decryption method ... but not storing the output of the method anywhere then it was writing inputStream to file and returning that file handle changed inputStream to var and used it to store output of decryption method	2020-01-10 14:53:40 -05:00
Valere	fb9abefe59	Merge branch 'develop' into cross_signing	2020-01-10 18:38:54 +01:00
Benoit Marty	095216349e	Exception -> Throwable	2020-01-10 18:35:29 +01:00
Benoit Marty	550908fa70	Render events m.room.encryption and m.room.guest_access in the timeline	2020-01-10 18:30:10 +01:00
Benoit Marty	0dbca829ea	Fix crash with RoomCreationParams	2020-01-10 18:07:14 +01:00
Benoit Marty	03b5b098c7	Change the way versionCode is computed (#827)	2020-01-10 17:29:34 +01:00
ganfra	171ec4fbdc	Room member list: group by power level	2020-01-10 17:03:11 +01:00
Benoit Marty	32d2daee3c	Exclude current user from autocompletion with room members	2020-01-10 16:28:14 +01:00
Benoit Marty	de84bb7535	Use more developerMode()	2020-01-10 11:03:42 +01:00
ganfra	81712ae736	RoomProfile: fix some rendering + change anim	2020-01-09 19:47:54 +01:00
ganfra	289951ea4a	RoomMemberList : start showing items	2020-01-09 15:54:36 +01:00
Benoit Marty	8c9c65837d	Version++	2020-01-09 15:32:37 +01:00
Benoit Marty	d486e613d8	Merge branch 'release/0.12.0' into develop	2020-01-09 15:31:29 +01:00
Benoit Marty	598d67234c	Prepare release 0.12.0	2020-01-09 15:31:13 +01:00
Benoit Marty	fea4f2e129	Merge pull request #816 from vector-im/feature/integration_tests ... Start porting of integration tests - Fix issue with multiple sessions	2020-01-09 15:28:29 +01:00
Benoit Marty	687ea1b5b3	ktlint	2020-01-09 15:28:16 +01:00
Benoit Marty	47e3b8ec46	Ensure foreground notification is always displayed	2020-01-09 15:09:37 +01:00
Benoit Marty	dd8c908dc7	Code cleanup	2020-01-09 15:02:39 +01:00
Benoit Marty	9775e8c32b	Fix crash in syncService	2020-01-09 15:01:16 +01:00
Benoit Marty	e3205fb493	Fix compilation issue after rebase	2020-01-09 14:26:36 +01:00
Benoit Marty	35f011ba37	Fix ktlint issues	2020-01-09 14:20:17 +01:00
Benoit Marty	ed773dbb96	TI: Introduce doSync method	2020-01-09 14:20:17 +01:00
Benoit Marty	fa821826d2	TI: Import ExportEncryption test (passing)	2020-01-09 14:20:17 +01:00
Benoit Marty	293e3e3ce6	TI: Import AttachmentEncryption test (passing)	2020-01-09 14:20:17 +01:00
Benoit Marty	4244c0e48d	TI: Import SAS Test - WIP	2020-01-09 14:20:17 +01:00
Benoit Marty	76e45431da	TI: Import keys backup tests	2020-01-09 14:20:17 +01:00
Benoit Marty	f3fb07079e	Cleanup tests	2020-01-09 14:20:17 +01:00
Benoit Marty	3ceac70536	Enable encryption on a room, SDK part (#212)	2020-01-09 14:20:17 +01:00