2889 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	31d5578063	Media preview: do not propose to edit Gif	2020-02-17 14:35:57 +01:00
Benoit Marty	b6f5e27155	Fix issue after merge of develop	2020-02-17 13:50:36 +01:00
Benoit Marty	13d3aa9ff1	Merge branch 'develop' into feature/attachment_process	2020-02-17 13:48:21 +01:00
Benoit Marty	629ecf786a	Merge pull request #1024 from vector-im/feature/wording ... Account creation: wrongly hints that an email can be used to create an account (#941)	2020-02-17 13:34:04 +01:00
Benoit Marty	ecf07ff64a	Account creation: wrongly hints that an email can be used to create an account (#941)	2020-02-17 10:30:54 +01:00
Valere	b04ee7153a	Merge pull request #995 from vector-im/feature/4s_msc1946 ... Feature/4s msc1946	2020-02-14 17:49:16 +01:00
Benoit Marty	db19ab0531	Merge branch 'develop' into feature/4s_msc1946	2020-02-14 17:45:44 +01:00
Benoit Marty	cad818c341	ktlint	2020-02-14 17:05:14 +01:00
Benoit Marty	1660a0f846	Version++	2020-02-14 15:16:00 +01:00
Benoit Marty	4987a75039	Merge branch 'release/0.16.0' into develop	2020-02-14 15:14:54 +01:00
Benoit Marty	e20d1724c9	Prepare release 0.16.0	2020-02-14 15:14:48 +01:00
Benoit Marty	f6f9c349ec	Add entry in changelog for the 2 mistakes	2020-02-14 14:52:10 +01:00
Benoit Marty	88b8ceaeb5	Merge pull request #1005 from vector-im/feature/fix_event_redaction_prompt ... Do not ask for a reason if user wants to delete his own message.	2020-02-14 14:36:01 +01:00
Benoit Marty	e4577d8fef	Small cleanup before merge	2020-02-14 14:34:22 +01:00
onurays	030d6824e3	Code review fixes.	2020-02-14 15:04:25 +03:00
Benoit Marty	ab437e249d	Update emoji for API change	2020-02-14 12:43:27 +01:00
Valere	35835be03e	klint	2020-02-14 12:06:07 +01:00
Valere	f99eca8014	Code review	2020-02-14 10:48:18 +01:00
Valere	e0eede1150	cleaning	2020-02-14 10:48:18 +01:00
Valere	64647cb465	Fix / Save account data after update (local echo)	2020-02-14 10:48:18 +01:00
Valere	def01cca8f	Fix test + changes	2020-02-14 10:48:18 +01:00
Valere	61ea4191dc	Update json viewer lib	2020-02-14 10:48:18 +01:00
Valere	108ebea84e	SSSS service + test	2020-02-14 10:48:18 +01:00
Valere	bf06b57bad	Refactor Account Data ... Auto stash before rebase of "develop"	2020-02-14 10:48:18 +01:00
Valere	a250a895fe	Remove redudant calls to eventBus post	2020-02-14 10:47:34 +01:00
Benoit Marty	2c2bf61727	Update Changelog	2020-02-14 09:40:07 +01:00
Benoit Marty	6c0bddc893	Code quality	2020-02-13 23:20:35 +01:00
Benoit Marty	930d62c87b	Restore Breadcrumbs comparator, we can maybe improve this later	2020-02-13 23:00:03 +01:00
Benoit Marty	b66b96899e	Better Kotlin code	2020-02-13 22:56:11 +01:00
Benoit Marty	e6bd09859f	Compress image before sending	2020-02-13 22:50:55 +01:00
Benoit Marty	385fa317c0	Add a green frame around current small preview	2020-02-13 20:45:03 +01:00
Benoit Marty	ecd547b86c	Auto close the room picker and open the first room when data are shared in case of multi selection	2020-02-13 20:10:59 +01:00
Benoit Marty	d87b951403	Improve code	2020-02-13 20:10:59 +01:00
Benoit Marty	06ba478232	Send files to several rooms at a time	2020-02-13 20:10:59 +01:00
Benoit Marty	81de914360	Propose to edit media before sending, when coming form another application	2020-02-13 20:10:59 +01:00
Benoit Marty	b7ec495d6b	Add comment	2020-02-13 19:52:11 +01:00
Benoit Marty	a8953568f3	Set custom colors	2020-02-13 19:52:11 +01:00
Benoit Marty	41b20863fb	Mention uCrop library copyright	2020-02-13 19:52:11 +01:00
Benoit Marty	94340a49d7	Ask for permission	2020-02-13 19:52:11 +01:00
Benoit Marty	c67fd508e7	Cleanup	2020-02-13 19:52:11 +01:00
Ganard	eccc52fe13	Sharing: start extracting from RoomList as it's getting messy	2020-02-13 19:52:11 +01:00
Ganard	b7a7aa2f15	Attachment: continue working on preview screen	2020-02-13 19:52:11 +01:00
ganfra	6471787232	Share: start managing multi selection and warning	2020-02-13 19:52:11 +01:00
ganfra	41f1ec5d88	Attachments: preview with pager mode	2020-02-13 19:51:20 +01:00
Ganard	a26e959430	Attachements: introduce structure for preview, cropping and compressing	2020-02-13 19:51:20 +01:00
Benoit Marty	5808c1de22	TextView displaying emoji should have text color set to black	2020-02-13 19:50:31 +01:00
Benoit Marty	d21604b791	Merge pull request #989 from vector-im/feature/qr_code_mistake ... Fix issue with verification when other client declares it can only show QR code (#988)	2020-02-13 19:41:10 +01:00
onurays	fd135e1eeb	Compute message body for encrypted messages too.	2020-02-13 18:09:26 +03:00
onurays	f28e4cf991	Fix comparison of user ids.	2020-02-13 17:57:38 +03:00
Valere	1941862499	Fix / Remove debug code line	2020-02-13 15:50:08 +01:00