1687 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	d001ab5bef	Merge pull request #640 from Dominaezzz/kotlinify ... The last of the clean up.	2019-10-29 17:01:38 +01:00
Benoit Marty	361427488f	Passphrase does not match (Export room keys) (Fixes #644)	2019-10-29 14:38:04 +01:00
Benoit Marty	7272343e6d	Update comment	2019-10-29 14:32:05 +01:00
Benoit Marty	f0b3151d71	Merge pull request #639 from vector-im/feature/compile_tests ... Build and run test on CI	2019-10-29 14:27:47 +01:00
Valere	a04802b238	CI / upgrade queue to xlarge	2019-10-25 11:14:17 +02:00
Benoit Marty	6cca242f77	Fix Android test compilation issue	2019-10-24 17:49:34 +02:00
Benoit Marty	2929b8f617	Ensure Android tests compile and fix warnings	2019-10-24 17:24:42 +02:00
Benoit Marty	8422c6de17	Remove test sample	2019-10-24 17:21:19 +02:00
Benoit Marty	7c567b04bb	Make test compile and pass	2019-10-24 16:36:12 +02:00
Dominic Fischer	1ac99e92a6	Light refactoring. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-24 14:58:11 +01:00
Dominic Fischer	5ab975cc5c	General kotlinification. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-24 14:53:44 +01:00
Dominic Fischer	2cf63ea92a	Remove import java.util.* from kotlin files. ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2019-10-24 14:53:10 +01:00
Benoit Marty	9e8d8ce878	Build and run test on CI	2019-10-24 15:52:40 +02:00
Benoit Marty	b766bce07d	Version++	2019-10-24 14:40:31 +02:00
Benoit Marty	0a0af221f0	Merge branch 'release/0.7.0' into develop	2019-10-24 14:37:51 +02:00
Benoit Marty	af08759af6	Prepare release 0.7.0	2019-10-24 14:37:28 +02:00
Benoit Marty	e52f0faaa7	Merge pull request #638 from vector-im/feature/filter ... Fix 2 issues with share Activity: filter and room lists	2019-10-24 14:03:08 +02:00
Benoit Marty	8fa676d034	Share Activity: display rooms of all communities	2019-10-24 12:19:25 +02:00
Benoit Marty	b6594599c4	Rename member	2019-10-24 10:53:19 +02:00
Benoit Marty	8be8cc9ef7	Filter rooms when sharing element	2019-10-24 10:45:53 +02:00
ganfra	b17b54d218	Merge pull request #637 from vector-im/feature/fix_room_summary ... Feature/fix some room related stuff	2019-10-23 17:29:14 +02:00
ganfra	187e2a26db	Clean after Benoit's review	2019-10-23 17:26:56 +02:00
ganfra	2f5fdbb7e2	Clean and fix lint	2019-10-23 16:20:38 +02:00
ganfra	8b1411f533	Read marker: test if local echo before hitting the SDK to change read marker id + reduce a bit delay	2019-10-23 16:13:35 +02:00
Benoit Marty	bdee5e0687	Fix warning on Strings	2019-10-23 15:17:21 +02:00
Benoit Marty	ce4e244a3b	Merge pull request #635 from vector-im/feature/strings ... Import Strings from Riot	2019-10-23 15:09:58 +02:00
Benoit Marty	ff81715783	Import Strings from Riot	2019-10-23 14:18:40 +02:00
ganfra	3196dcb57e	MessageActions: disable if not synced atm	2019-10-23 12:20:03 +02:00
ganfra	50bf6df7fe	Room summary: fix some issues with local echo and sending event	2019-10-23 11:55:19 +02:00
Benoit Marty	02914495ce	Merge pull request #632 from vector-im/feature/cleanuo ... More cleanup	2019-10-23 10:26:54 +02:00
Benoit Marty	70a14f6350	Merge pull request #619 from vector-im/feature/attachments ... Feature/attachments	2019-10-23 10:09:57 +02:00
Benoit Marty	cac5fb725a	Code cleanup	2019-10-22 18:35:05 +02:00
Benoit Marty	dbc17ae515	Use AppCompatEditText instead of EditText	2019-10-22 18:23:53 +02:00
Benoit Marty	1de02c2fbb	Ensure android.text.TextUtils will never be used again	2019-10-22 17:41:59 +02:00
ganfra	6d55c15761	Fix lint issue	2019-10-22 17:41:21 +02:00
Benoit Marty	377a228f88	Improve code	2019-10-22 17:31:07 +02:00
ganfra	2974f8b200	Merge branch 'develop' into feature/attachments	2019-10-22 17:27:15 +02:00
ganfra	7388a408b8	Permissions: allow to provide the rationale message as it requires "context" and cannot be generic	2019-10-22 17:13:38 +02:00
Benoit Marty	f43dcb1183	Update room summary when saving local echo from DefaultRelationService	2019-10-22 16:54:48 +02:00
Benoit Marty	492ed3954a	code cleanup	2019-10-22 16:54:48 +02:00
Benoit Marty	7890e83204	Merge pull request #630 from vector-im/feature/crypto_lock ... Fix dead lock on crypto	2019-10-22 16:53:33 +02:00
Benoit Marty	00d1a2c380	Merge pull request #629 from vector-im/feature/fix_malformed_event_bug ... Fix / event mapper persist the clear type in type	2019-10-22 14:47:08 +02:00
Benoit Marty	78dfd6b3e6	Fix potential lock due to nested synchronized(unknownSessionsFailure)	2019-10-22 14:20:43 +02:00
Benoit Marty	3abce34484	Add in existingRequest only if not filtered	2019-10-22 12:45:36 +02:00
Benoit Marty	4204ab262c	Fix compilation issue	2019-10-22 12:42:01 +02:00
ganfra	c7a4d34192	Attachments: handle rich content from keyboard	2019-10-22 12:37:59 +02:00
Benoit Marty	7416fec93e	Do not decrypt event if session is unknown	2019-10-22 12:37:17 +02:00
Benoit Marty	3c40f64fb7	Add a few comments	2019-10-22 12:33:25 +02:00
Benoit Marty	b57c71b1c9	Remove unused import	2019-10-22 12:27:55 +02:00
Benoit Marty	fea54952d3	Code quality	2019-10-22 12:26:56 +02:00