2846 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	a7274b9df0	Version++	2020-02-10 21:41:59 +01:00
Benoit Marty	a9d6cb7be3	Merge branch 'release/0.15.0' into develop	2020-02-10 21:40:35 +01:00
Benoit Marty	d71797319c	Prepare release 0.15.0	2020-02-10 21:40:27 +01:00
onurays	ba0133a047	Reason input for redacting event is added.	2020-02-10 23:03:37 +03:00
Benoit Marty	01a7ea0bd7	Merge branch 'feature/fix_notif' into develop	2020-02-10 19:16:20 +01:00
Benoit Marty	2e7fa23ce7	Fix #980	2020-02-10 19:13:35 +01:00
Benoit Marty	6750237764	Merge pull request #976 from vector-im/feature/viewEvents ... Use View events	2020-02-10 16:46:21 +01:00
Benoit Marty	588a644e02	Merge pull request #975 from vector-im/feature/cleanup ... Cleanup push rule code	2020-02-10 16:32:24 +01:00
onurays	1bc1c8ec4a	Reorder improvements.	2020-02-10 18:17:22 +03:00
Benoit Marty	7e362be568	Convert to ViewEvents -> Cleanup after review	2020-02-10 16:10:57 +01:00
onurays	83d83e0812	Show confirmation dialog before deleting a message ... Fixes #967	2020-02-10 17:58:48 +03:00
Benoit Marty	c97d298166	Merge pull request #948 from vector-im/feature/artifacts_downloading ... Feature/artifacts downloading	2020-02-10 14:52:25 +01:00
Benoit Marty	81413e49bc	Remove '(yet)'	2020-02-10 14:51:35 +01:00
Benoit Marty	b24f133105	Import strings from Riot	2020-02-10 14:50:21 +01:00
Benoit Marty	5b13be6332	Rename	2020-02-07 19:58:14 +01:00
Benoit Marty	abeb741cad	Convert to ViewEvents -> RoomDetailViewModel part 5	2020-02-07 19:50:15 +01:00
Benoit Marty	84e1169525	Convert to ViewEvents -> RoomDetailViewModel part 4	2020-02-07 19:45:54 +01:00
Benoit Marty	27e217fce5	Convert to ViewEvents -> RoomDetailViewModel part 3	2020-02-07 19:41:23 +01:00
Benoit Marty	bdb1f850b2	Convert to ViewEvents -> RoomDetailViewModel part 2	2020-02-07 19:37:30 +01:00
Benoit Marty	0338535efa	Convert to ViewEvents -> RoomDetailViewModel part 1	2020-02-07 19:27:18 +01:00
Benoit Marty	0dd3894a49	Use handle() pattern	2020-02-07 19:20:02 +01:00
Benoit Marty	c8ff8d3c9e	Convert to ViewEvents -> DeviceListBottomSheetViewModel	2020-02-07 18:59:31 +01:00
Benoit Marty	70973c3302	Convert to ViewEvents -> CrossSigningSettingsViewModel	2020-02-07 18:47:54 +01:00
Benoit Marty	a930313bf3	Convert to ViewEvents -> VerificationBottomSheetViewModel	2020-02-07 18:27:13 +01:00
Benoit Marty	35054dc5e8	Convert to ViewEvents -> CreateDirectRoomViewModel	2020-02-07 18:11:53 +01:00
Benoit Marty	33b123f719	Convert to ViewEvents -> GroupListViewModel	2020-02-07 18:02:42 +01:00
Benoit Marty	24667f38b8	Convert to ViewEvents -> RoomMemberProfileViewModel	2020-02-07 17:47:37 +01:00
Benoit Marty	256a6e4322	Convert to ViewEvents -> RoomDetailViewModel	2020-02-07 17:34:26 +01:00
Benoit Marty	7f5cc77ee0	Convert to ViewEvents -> DevicesViewModel	2020-02-07 17:14:03 +01:00
Benoit Marty	c34307ecf7	Convert to ViewEvents -> RoomDirectoryViewModel	2020-02-07 16:32:01 +01:00
Benoit Marty	dd13b6bd99	Add test for DisplayName condition (passing)	2020-02-07 15:44:46 +01:00
Benoit Marty	9df699db59	Reorder tests	2020-02-07 15:35:09 +01:00
Benoit Marty	8bdb2b88fd	make the test compile	2020-02-07 15:32:36 +01:00
Benoit Marty	2a534b5874	Handle SenderNotificationPermissionCondition	2020-02-07 15:32:20 +01:00
Benoit Marty	f719da96ed	Rename Condition.Kind enum values and add some documentation	2020-02-07 15:02:39 +01:00
Benoit Marty	31e5c0eb1a	Improve algorithm	2020-02-07 14:48:08 +01:00
Benoit Marty	34c5f37bbc	findAll() does not return null value	2020-02-07 14:30:44 +01:00
Benoit Marty	9aadbbc3c7	Rework DefaultConditionResolver, and create RoomGetter	2020-02-07 14:27:24 +01:00
Benoit Marty	57758af2d7	Merge pull request #974 from vector-im/feature/crosssigning_cleanup ... Improve prompt password dialog	2020-02-07 14:02:15 +01:00
Benoit Marty	0a2474ef12	ktlint	2020-02-07 14:01:18 +01:00
Valere	67bc100782	Merge pull request #959 from vector-im/feature/roomshields_perf ... Refactor Room Shield / Profile shield	2020-02-06 16:54:17 +01:00
Benoit Marty	5fedfd9286	Cleanup	2020-02-06 16:00:05 +01:00
Valere	1917fbcc93	eventBus private	2020-02-06 13:56:57 +01:00
Valere	a48bf61ad7	quick dispatch to correct thread (will need more work)	2020-02-06 13:56:57 +01:00
Valere	5c1fcc47a1	Catch all decryption fails in mapping	2020-02-06 13:56:57 +01:00
Valere	d80c15f52f	Dispatch init on crypto thread to avoid blocking cold start	2020-02-06 13:56:57 +01:00
Valere	3e2219cbb5	Ignore interrupted exception in setupRx	2020-02-06 13:56:57 +01:00
Valere	bf2e01b8c3	More Rx startWithcallable	2020-02-06 13:56:57 +01:00
Valere	75131fdf44	Post merge fix	2020-02-06 13:56:57 +01:00
Valere	911ff8cf16	cleaning (klint)	2020-02-06 13:56:57 +01:00