4013 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	7ae52d676d	Use directly java.net.proxy class	2020-05-25 23:50:10 +02:00
Benoit Marty	3d33018ffa	Merge pull request #1147 from unclejay80/http_proxy_init ... added network proxy configuration	2020-05-25 23:43:11 +02:00
Benoit Marty	860595520b	Merge pull request #1401 from vector-im/feature/cleanup ... Small PR with code cleanup	2020-05-25 17:30:31 +02:00
Benoit Marty	ae318a835e	Merge pull request #1387 from vector-im/feature/attachments_list ... Attachments list	2020-05-25 17:29:54 +02:00
Benoit Marty	7a3dbecc08	Fixes #860	2020-05-25 17:05:17 +02:00
Benoit Marty	c52aae7c29	Uploads: Snackbar	2020-05-25 17:05:17 +02:00
Benoit Marty	f0f3e8ddb9	Uploads: auto-review	2020-05-25 17:05:17 +02:00
Benoit Marty	a95102a78f	Uploads: Use StateView for better Loading/Empty rendering	2020-05-25 17:02:57 +02:00
Benoit Marty	2adafbeb03	Uploads: use SenderInfo in TimelineEvent	2020-05-25 17:02:57 +02:00
Benoit Marty	f3a5fb7fe3	Uploads: rework: provide information about the sender	2020-05-25 16:54:08 +02:00
Benoit Marty	907a786b1a	Uploads: load element until loader not displayed anymore	2020-05-25 16:54:08 +02:00
Benoit Marty	e3ed3e5b05	Uploads: cleanup	2020-05-25 16:54:08 +02:00
Benoit Marty	a2b366ebfe	Uploads: add placeholder for images	2020-05-25 16:54:08 +02:00
Benoit Marty	f7de2f0f13	Uploads: create extension	2020-05-25 16:54:08 +02:00
Benoit Marty	919225bdfd	Uploads: create extension	2020-05-25 16:54:08 +02:00
Benoit Marty	88cba74cac	Uploads: add screen - WIP	2020-05-25 16:54:08 +02:00
Benoit Marty	e9ca876444	Uploads: add screen - WIP	2020-05-25 16:54:08 +02:00
Benoit Marty	0992e76800	Uploads: add screen - WIP	2020-05-25 16:54:08 +02:00
Benoit Marty	8a9498bae4	Uploads: add the service and the task	2020-05-25 16:54:08 +02:00
Weblate	d2598480c8	var -> val	2020-05-25 16:54:08 +02:00
Benoit Marty	6e57b06673	Ensure Filter model match the spec and add Javadoc	2020-05-25 16:54:08 +02:00
Benoit Marty	e117fec74f	Kotlin: use orEmpty() for Maps	2020-05-25 14:07:25 +02:00
Benoit Marty	6e01b75b2f	Dagger: use generic name for parameters	2020-05-25 14:04:36 +02:00
Benoit Marty	691e7fe616	Kotlin: use orEmpty()	2020-05-25 14:04:36 +02:00
Benoit Marty	e793a46576	Merge pull request #1390 from vector-im/feature/icon ... Change icon to magnifying-glass to filter room (#1384)	2020-05-25 10:57:30 +02:00
Benoit Marty	fa48e8cffa	Change icon to magnifying-glass to filter room (#1384)	2020-05-25 10:57:14 +02:00
Benoit Marty	69cf437a39	Merge pull request #1291 from vector-im/feature/complete_security ... Add hint to translators	2020-05-25 10:28:20 +02:00
Benoit Marty	ebbc432570	Merge pull request #1398 from vector-im/feature/date_time ... Bugfixes	2020-05-25 10:13:30 +02:00
Benoit Marty	330a33a0e8	Render formatted_body for m.notice and m.emote (Fixes #1196)	2020-05-21 01:47:17 +02:00
Benoit Marty	b75b299847	Create MessageContentWithFormattedBody interface	2020-05-21 01:05:47 +02:00
Benoit Marty	7c59bcc928	Only "org.matrix.custom.html" is supported	2020-05-21 00:41:36 +02:00
Benoit Marty	0e110b0794	Cleanup: use existing TextContent class instead of Pair<>	2020-05-21 00:40:12 +02:00
Benoit Marty	e156a62e19	Enable markdown (if active) when sending emote (Fixes #734)	2020-05-21 00:27:19 +02:00
Benoit Marty	628439aa65	Mardown: sending "**text in bold** was sending extra paragraph and extra new line	2020-05-21 00:25:59 +02:00
Benoit Marty	d49fcb80fc	"Seen by" uses 12h time (Fixes #1378) ... DateUtils.FORMAT_SHOW_TIME has to be used for i18n to be effective on DateUtils.getRelativeDateTimeString(), do not ask me why. Also internal switching of language does not have effect on this method, you'll have to restart the application.	2020-05-20 23:52:41 +02:00
Benoit Marty	ca37895619	Merge pull request #1374 from vector-im/feature/sas_v2 ... support new key agreement method for SAS	2020-05-20 18:32:01 +02:00
Benoit Marty	43497e0da9	Merge pull request #1315 from vector-im/feature/forward_pagination ... Feature/forward pagination	2020-05-20 18:30:09 +02:00
ganfra	e1c6542e03	Merge branch 'develop' into feature/forward_pagination	2020-05-19 15:25:33 +02:00
ganfra	01484978bd	Fix lint	2020-05-19 15:24:36 +02:00
ganfra	cad14c93d0	Timeline: fix tests and add message order check	2020-05-19 14:39:42 +02:00
Valere	861a7f791f	Update change log	2020-05-19 09:57:54 +02:00
Valere	f2fa57224b	Update matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt ... Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>	2020-05-19 09:55:45 +02:00
Valere	e0977dd97b	Add new key agreement protocol	2020-05-19 09:55:45 +02:00
Benoit Marty	f47bef71a4	Merge pull request #1354 from vector-im/feature/identity ... Identity server	2020-05-18 17:28:57 +02:00
Benoit Marty	92985fc8e7	Split long line	2020-05-18 17:25:15 +02:00
Benoit Marty	243b0a7d82	ktlint	2020-05-18 17:23:33 +02:00
Benoit Marty	92c719a803	Set identity server: do not show the error in the EditText when user want to use the default identity server	2020-05-18 17:23:33 +02:00
Benoit Marty	f4108ae0eb	Properly handle Loading state: button were still active... Also finish the work on the controller	2020-05-18 17:23:33 +02:00
Benoit Marty	ecf3fee709	Integrate Valere's remarks - step 3: use viewModelScope in ViewModels	2020-05-18 17:23:33 +02:00
Benoit Marty	e67e472025	Integrate Valere's remarks - step 2: Stop using (or at least reduce usage of) GlobalScope	2020-05-18 17:23:33 +02:00