2736 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	79242c8c16	Merge pull request #892 from vector-im/feature/indonesian_check ... Import Indonesian resource check from TravisCI to Weblate pipeline	2020-02-05 18:02:00 +01:00
Benoit Marty	7d00aabc85	Share the same Copyright header. Disabled for XML files	2020-02-05 17:48:59 +01:00
Benoit Marty	ef72f2246a	Import Indonesian resource check from TravisCI to Weblate pipeline	2020-02-05 17:47:11 +01:00
Benoit Marty	51c2b9e1e9	Import strings from Riot	2020-02-05 17:35:23 +01:00
Benoit Marty	3189c114dc	Merge pull request #945 from vector-im/feature/stabilization_2 ... Feature/stabilization 2	2020-02-05 15:19:16 +01:00
Benoit Marty	50814dafe9	Update wording	2020-02-05 14:19:04 +01:00
Benoit Marty	dcd7d17ffd	Fix compilation issue after merge and update CHANGES.md	2020-02-05 14:13:43 +01:00
Benoit Marty	d9c007d017	Merge branch 'develop' into feature/stabilization_2	2020-02-05 12:57:42 +01:00
Benoit Marty	05dd587fa8	Move FORMAT_MATRIX_HTML to a proper object and so fix a wrong usage issue	2020-02-05 12:44:31 +01:00
Benoit Marty	3384d91adb	Rename MessageContent.type to MessageContent.msgType for code clarity and update a few the Javadoc	2020-02-05 12:39:26 +01:00
Benoit Marty	f72e5c1d94	Explain why and when to use EllipsizingTextView	2020-02-05 12:16:43 +01:00
Benoit Marty	a3ec0e03a0	Use NoOpMatrixCallback when it's possible	2020-02-05 12:05:12 +01:00
Benoit Marty	47ee2a24a7	Move NoOpMatrixCallback to MatrixCallback.kt file	2020-02-05 11:58:08 +01:00
Benoit Marty	b8096f21ea	Restore Copyright and cleanup	2020-02-05 11:56:07 +01:00
Benoit Marty	a17ec14dd7	Cleanup and little change on Throwable logging	2020-02-05 11:39:23 +01:00
Benoit Marty	062c4559a2	Merge pull request #955 from vector-im/feature/room_history_in_e2e ... Feature/room history in e2e	2020-02-04 21:18:26 +01:00
Benoit Marty	f7d511df38	Ganfra's review	2020-02-04 17:48:17 +01:00
Benoit Marty	6bff951c72	Keep MXCryptoConfig, but do a correct usage of it	2020-02-04 15:37:46 +01:00
Benoit Marty	bd033866a8	Encrypt for invited users by default, if the room state allows it (#803)	2020-02-04 14:41:32 +01:00
Benoit Marty	3e9b2e4a06	Use the correct enableEncryption() method	2020-02-04 14:04:48 +01:00
Ganard	ed9c3379bf	Rename file	2020-02-04 13:50:10 +01:00
Ganard	1728d31401	Fix some issues and make test passes	2020-02-04 13:19:02 +01:00
Benoit Marty	225a6e00e6	Add doc and reorder	2020-02-04 12:10:51 +01:00
Benoit Marty	e02430bcd0	Ask for permission before opening the camera (#934)	2020-02-03 20:06:37 +01:00
Benoit Marty	4335fa4f72	ktlint	2020-02-03 16:26:18 +01:00
Benoit Marty	6df5edbad1	Version++	2020-02-03 16:20:55 +01:00
Benoit Marty	362799ac08	Merge branch 'release/0.14.3' into develop	2020-02-03 16:15:52 +01:00
Benoit Marty	0049af7980	Prepare version 0.14.3	2020-02-03 16:15:38 +01:00
Ganard	f454078c6b	Clean code	2020-02-03 16:14:36 +01:00
Ganard	88755a79b4	In memory sending: fix broken filtering	2020-02-03 15:18:19 +01:00
Ganard	e6cd8a3a86	Merge develop into feature/stabilization_2	2020-02-03 13:59:20 +01:00
Valere	ce13e824b6	Merge remote-tracking branch 'origin/develop' into develop	2020-02-02 15:28:05 +01:00
Valere	b182a63ea1	fix concurrent co mofification	2020-02-02 15:28:00 +01:00
Benoit Marty	9ced2048d2	Version++	2020-02-02 14:26:09 +01:00
Benoit Marty	b158729b53	Prepare v0.14.2	2020-02-02 14:05:12 +01:00
Valere	367057cc29	Fix / cold start	2020-02-02 14:01:45 +01:00
Benoit Marty	5fb4f274f9	Version ++	2020-02-02 08:00:57 +01:00
Benoit Marty	6f60f1c6b4	Merge branch 'release/0.14.1' into develop	2020-02-02 07:56:00 +01:00
Benoit Marty	435d8cbc55	Prepare v0.14.1	2020-02-02 07:55:46 +01:00
Benoit Marty	bb0fafcb2f	Merge pull request #929 from vector-im/feature/xsigning_fix_4 ... Feature/xsigning fix 4	2020-02-02 03:13:54 +01:00
Benoit Marty	1d2928b3fb	ktlint	2020-02-02 03:13:15 +01:00
Benoit Marty	40b0f60964	Fix issue in dark theme. Also do not limit subtitles to 2 lines	2020-02-02 03:11:27 +01:00
Valere	96a556f449	Fix / Race causing key requests to be sent to early in xsigning	2020-02-02 01:21:08 +01:00
Valere	d436d3b8d4	Move rx logs to verbose	2020-02-02 00:41:36 +01:00
Valere	845f3f5ad1	FIx / use password textedit	2020-02-02 00:04:15 +01:00
Valere	fb838e5407	Fixes #813	2020-02-01 23:24:05 +01:00
Benoit Marty	40c70f64a8	Merge branch 'feature/to_device_done' into develop	2020-02-01 18:48:34 +01:00
Valere	245b3717b9	Send done in toDevice	2020-02-01 18:25:31 +01:00
Benoit Marty	9e15891053	Version++	2020-02-01 17:21:41 +01:00
Benoit Marty	649ebf4a34	Merge branch 'release/0.14.0' into develop	2020-02-01 17:20:04 +01:00